ZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24vYWNjZXNzLWNvbnRyb2wudHh0IGIvRG9jdW1lbnRhdGlvbi9hY2Nlc3MtY29udHJvbC50eHQKaW5kZXggODc5ZDFhYy4uZWZkMWYwMSAxMDA2NDQKLS0tIGEvRG9jdW1lbnRhdGlvbi9hY2Nlc3MtY29udHJvbC50eHQKKysrIGIvRG9jdW1lbnRhdGlvbi9hY2Nlc3MtY29udHJvbC50eHQKQEAgLTU2Miw3ICs1NjIsNyBAQAogT3duZXJzaGlwIG92ZXIgYSBwYXJ0aWN1bGFyIGJyYW5jaCBzdWJzcGFjZSBtYXkgYmUgZGVsZWdhdGVkIGJ5CiBlbnRlcmluZyBhIGJyYW5jaCBwYXR0ZXJuLiAgVG8gZGVsZWdhdGUgY29udHJvbCBvdmVyIGFsbCBicmFuY2hlcwogdGhhdCBiZWdpbiB3aXRoIGBxYS9gIHRvIHRoZSBRQSBncm91cCwgYWRkIGBPd25lcmAgY2F0ZWdvcnkKLWZvciByZWZlcmVuY2UgYHJlZnMvaGVhZHMvcWEvXCpgLiAgTWVtYmVycyBvZiB0aGUgUUEgZ3JvdXAgY2FuCitmb3IgcmVmZXJlbmNlIGByZWZzL2hlYWRzL3FhLypgLiAgTWVtYmVycyBvZiB0aGUgUUEgZ3JvdXAgY2FuCiBmdXJ0aGVyIHJlZmluZSBhY2Nlc3MsIGJ1dCBvbmx5IGZvciByZWZlcmVuY2VzIHRoYXQgYmVnaW4gd2l0aAogYHJlZnMvaGVhZHMvcWEvYC4gU2VlIDw8cHJvamVjdF9vd25lcnMscHJvamVjdCBvd25lcnM+PiB0byBmaW5kCiBvdXQgbW9yZSBhYm91dCB0aGlzIHJvbGUuCkBAIC01ODUsNyArNTg1LDcgQEAKIF5eXl5eXl5eXl5eCiAKIEFueSBleGlzdGluZyBicmFuY2ggY2FuIGJlIGZhc3QtZm9yd2FyZGVkIHRvIGEgbmV3IGNvbW1pdC4KLUNyZWF0aW9uIG9mIG5ldyBicmFuY2hlcyBpcyBjb250cm9sbGVkIGJ5IHRoZSAKK0NyZWF0aW9uIG9mIG5ldyBicmFuY2hlcyBpcyBjb250cm9sbGVkIGJ5IHRoZQogbGluazphY2Nlc3MtY29udHJvbC5odG1sI2NhdGVnb3J5X2NyZWF0ZVsnQ3JlYXRlIFJlZmVyZW5jZSddCiBjYXRlZ29yeS4gIERlbGV0aW9uIG9mIGV4aXN0aW5nIGJyYW5jaGVzIGlzIHJlamVjdGVkLiAgVGhpcyBpcyB0aGUKIHNhZmVzdCBtb2RlIGFzIGNvbW1pdHMgY2Fubm90IGJlIGRpc2NhcmRlZC4KQEAgLTcyOCw2ICs3MjgsMjAgQEAKIGNhbiBzdGlsbCBkbyB0aGUgcmViYXNlIGxvY2FsbHkgYW5kIHVwbG9hZCB0aGUgcmViYXNlZCBjb21taXQgYXMgYSBuZXcKIHBhdGNoIHNldC4KIAorW1tjYXRlZ29yeV9yZW1vdmVfcmV2aWV3ZXJdXQorUmVtb3ZlIFJldmlld2VyCit+fn5+fn5+fn5+fn5+fn4KKworVGhpcyBjYXRlZ29yeSBwZXJtaXRzIHVzZXJzIHRvIHJlbW92ZSBvdGhlciB1c2VycyBmcm9tIHRoZSBsaXN0IG9mCityZXZpZXdlcnMgb24gYSBjaGFuZ2UuCisKK1RoZSBjaGFuZ2Ugb3duZXIsIHByb2plY3Qgb3duZXIgYW5kIHNpdGUgYWRtaW5pc3RyYXRvciBjYW4gYWx3YXlzCityZW1vdmUgcmV2aWV3ZXJzIChldmVuIHdpdGhvdXQgaGF2aW5nIHRoZSBgUmVtb3ZlIFJldmlld2VyYCBhY2Nlc3MKK3JpZ2h0IGFzc2lnbmVkKS4KKworVXNlcnMgd2l0aG91dCB0aGlzIGFjY2VzcyByaWdodCBjYW4gb25seSByZW1vdmUgdGhlbXNlbHZlcyBmcm9tIHRoZQorcmV2aWV3ZXIgbGlzdCBvbiBhIGNoYW5nZS4KKwogCiBbW2NhdGVnb3J5X3N1Ym1pdF1dCiBTdWJtaXQKQEAgLTg0MSw4ICs4NTUsOCBAQAogU3VnZ2VzdGVkIGFjY2VzcyByaWdodHMgdG8gZ3JhbnQ6CiAKICogPDxjYXRlZ29yeV9yZWFkLGBSZWFkYD4+IG9uICdyZWZzL2hlYWRzL1wqJyBhbmQgJ3JlZnMvdGFncy8qJwotKiA8PGNhdGVnb3J5X3B1c2gsYFB1c2hgPj4gdG8gJ3JlZnMvZm9yL3JlZnMvaGVhZHMvXConIGFuZCAncmVmcy9jaGFuZ2VzLyonCi0qIDw8Y2F0ZWdvcnlfbGFiZWwtQ29kZS1SZXZpZXcsYENvZGUgcmV2aWV3YD4+IHdpdGggcmFuZ2UgJy0xJyB0byAnKzEnCisqIDw8Y2F0ZWdvcnlfcHVzaCxgUHVzaGA+PiB0byAncmVmcy9mb3IvcmVmcy9oZWFkcy8qJworKiA8PGNhdGVnb3J5X2xhYmVsLUNvZGUtUmV2aWV3LGBDb2RlIHJldmlld2A+PiB3aXRoIHJhbmdlICctMScgdG8gJysxJyBmb3IgJ3JlZnMvaGVhZHMvKicKIAogCiBbW2V4YW1wbGVzX2RldmVsb3Blcl1dCkBAIC04NjUsMTEgKzg3OSwxMSBAQAogU3VnZ2VzdGVkIGFjY2VzcyByaWdodHMgdG8gZ3JhbnQ6CiAKICogPDxjYXRlZ29yeV9yZWFkLGBSZWFkYD4+IG9uICdyZWZzL2hlYWRzL1wqJyBhbmQgJ3JlZnMvdGFncy8qJwotKiA8PGNhdGVnb3J5X3B1c2gsYFB1c2hgPj4gdG8gJ3JlZnMvZm9yL3JlZnMvaGVhZHMvXConIGFuZCAncmVmcy9jaGFuZ2VzLyonCi0qIDw8Y2F0ZWdvcnlfcHVzaF9tZXJnZSxgUHVzaCBtZXJnZSBjb21taXRgPj4gdG8gJ3JlZnMvZm9yL3JlZnMvaGVhZHMvXConIGFuZCAncmVmcy9jaGFuZ2VzLyonCi0qIDw8Y2F0ZWdvcnlfZm9yZ2VfYXV0aG9yLGBGb3JnZSBBdXRob3IgSWRlbnRpdHlgPj4KLSogPDxjYXRlZ29yeV9sYWJlbC1Db2RlLVJldmlldyxgTGFiZWw6IENvZGUgcmV2aWV3YD4+IHdpdGggcmFuZ2UgJy0yJyB0byAnKzInCi0qIDw8Y2F0ZWdvcnlfbGFiZWwtVmVyaWZpZWQsYExhYmVsOiBWZXJpZnlgPj4gd2l0aCByYW5nZSAnLTEnIHRvICcrMScKKyogPDxjYXRlZ29yeV9wdXNoLGBQdXNoYD4+IHRvICdyZWZzL2Zvci9yZWZzL2hlYWRzLyonCisqIDw8Y2F0ZWdvcnlfcHVzaF9tZXJnZSxgUHVzaCBtZXJnZSBjb21taXRgPj4gdG8gJ3JlZnMvZm9yL3JlZnMvaGVhZHMvKicKKyogPDxjYXRlZ29yeV9mb3JnZV9hdXRob3IsYEZvcmdlIEF1dGhvciBJZGVudGl0eWA+PiB0byAncmVmcy9oZWFkcy8qJworKiA8PGNhdGVnb3J5X2xhYmVsLUNvZGUtUmV2aWV3LGBMYWJlbDogQ29kZSByZXZpZXdgPj4gd2l0aCByYW5nZSAnLTInIHRvICcrMicgZm9yICdyZWZzL2hlYWRzLyonCisqIDw8Y2F0ZWdvcnlfbGFiZWwtVmVyaWZpZWQsYExhYmVsOiBWZXJpZnlgPj4gd2l0aCByYW5nZSAnLTEnIHRvICcrMScgZm9yICdyZWZzL2hlYWRzLyonCiAqIDw8Y2F0ZWdvcnlfc3VibWl0LGBTdWJtaXRgPj4KIAogSWYgdGhlIHByb2plY3QgaXMgc21hbGwgb3IgdGhlIGRldmVsb3BlcnMgYXJlIHNlYXNvbmVkIGl0IG1pZ2h0IG1ha2UKQEAgLTkyMSwxMyArOTM1LDEzIEBACiBTdWdnZXN0ZWQgYWNjZXNzIHJpZ2h0cyB0byBncmFudCwgdGhhdCB3b24ndCBibG9jayBjaGFuZ2VzOgogCiAqIDw8Y2F0ZWdvcnlfcmVhZCxgUmVhZGA+PiBvbiAncmVmcy9oZWFkcy9cKicgYW5kICdyZWZzL3RhZ3MvKicKLSogPDxjYXRlZ29yeV9sYWJlbC1Db2RlLVJldmlldyxgTGFiZWw6IENvZGUgcmV2aWV3YD4+IHdpdGggcmFuZ2UgJy0xJyB0byAnMCcKLSogPDxjYXRlZ29yeV9sYWJlbC1WZXJpZmllZCxgTGFiZWw6IFZlcmlmeWA+PiB3aXRoIHJhbmdlICcwJyB0byAnKzEnCisqIDw8Y2F0ZWdvcnlfbGFiZWwtQ29kZS1SZXZpZXcsYExhYmVsOiBDb2RlIHJldmlld2A+PiB3aXRoIHJhbmdlICctMScgdG8gJzAnIGZvciAncmVmcy9oZWFkcy8qJworKiA8PGNhdGVnb3J5X2xhYmVsLVZlcmlmaWVkLGBMYWJlbDogVmVyaWZ5YD4+IHdpdGggcmFuZ2UgJzAnIHRvICcrMScgZm9yICdyZWZzL2hlYWRzLyonCiAKIE9wdGlvbmFsIGFjY2VzcyByaWdodHMgdG8gZ3JhbnQ6CiAKLSogPDxjYXRlZ29yeV9sYWJlbC1Db2RlLVJldmlldyxgTGFiZWw6IENvZGUgcmV2aWV3YD4+IHdpdGggcmFuZ2UgJy0xJyB0byAnKzEnCi0qIDw8Y2F0ZWdvcnlfcHVzaCxgUHVzaGA+PiB0byAncmVmcy9mb3IvcmVmcy9oZWFkcy9cKicgYW5kICdyZWZzL2NoYW5nZXMvKicKKyogPDxjYXRlZ29yeV9sYWJlbC1Db2RlLVJldmlldyxgTGFiZWw6IENvZGUgcmV2aWV3YD4+IHdpdGggcmFuZ2UgJy0xJyB0byAnKzEnIGZvciAncmVmcy9oZWFkcy8qJworKiA8PGNhdGVnb3J5X3B1c2gsYFB1c2hgPj4gdG8gJ3JlZnMvZm9yL3JlZnMvaGVhZHMvKicKIAogCiBbW2V4YW1wbGVzX2ludGVncmF0b3JdXQpAQCAtOTQ0LDcgKzk1OCw3IEBACiAqIDw8ZXhhbXBsZXNfZGV2ZWxvcGVyLERldmVsb3BlciByaWdodHM+PgogKiA8PGNhdGVnb3J5X3B1c2gsYFB1c2hgPj4gdG8gJ3JlZnMvaGVhZHMvKicKICogPDxjYXRlZ29yeV9wdXNoX21lcmdlLGBQdXNoIG1lcmdlIGNvbW1pdGA+PiB0byAncmVmcy9oZWFkcy8qJwotKiA8PGNhdGVnb3J5X2ZvcmdlX2NvbW1pdHRlcixgRm9yZ2UgQ29tbWl0dGVyIElkZW50aXR5YD4+IHRvICdyZWZzL2Zvci9yZWZzL2hlYWRzL1wqJyBhbmQgJ3JlZnMvY2hhbmdlcy8qJworKiA8PGNhdGVnb3J5X2ZvcmdlX2NvbW1pdHRlcixgRm9yZ2UgQ29tbWl0dGVyIElkZW50aXR5YD4+IHRvICdyZWZzL2Zvci9yZWZzL2hlYWRzLyonCiAqIDw8Y2F0ZWdvcnlfY3JlYXRlLGBDcmVhdGUgUmVmZXJlbmNlYD4+IHRvICdyZWZzL2hlYWRzLyonCiAqIDw8Y2F0ZWdvcnlfcHVzaF9hbm5vdGF0ZWQsYFB1c2ggQW5ub3RhdGVkIFRhZ2A+PiB0byAncmVmcy90YWdzLyonCiAKZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24vY21kLWdzcWwudHh0IGIvRG9jdW1lbnRhdGlvbi9jbWQtZ3NxbC50eHQKaW5kZXggM2M0ZjFiNS4uYjUzNjcwYiAxMDA2NDQKLS0tIGEvRG9jdW1lbnRhdGlvbi9jbWQtZ3NxbC50eHQKKysrIGIvRG9jdW1lbnRhdGlvbi9jbWQtZ3NxbC50eHQKQEAgLTQ5LDcgKzQ5LDcgQEAKIAogCVR5cGUgJ1xoJyBmb3IgaGVscC4gIFR5cGUgJ1xyJyB0byBjbGVhciB0aGUgYnVmZmVyLgogCi0JZ2Vycml0PiB1cGRhdGUgYWNjb3VudHMgc2V0IHNzaF91c2VyX25hbWUgPSAnYWxpY2UnIHdoZXJlIGFjY291bnRfaWQ9MTsgICAgICAgCisJZ2Vycml0PiB1cGRhdGUgYWNjb3VudHMgc2V0IHNzaF91c2VyX25hbWUgPSAnYWxpY2UnIHdoZXJlIGFjY291bnRfaWQ9MTsKIAlVUERBVEUgMTsgMSBtcwogCWdlcnJpdD4gXHEKIAlCeWUKZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24vY21kLWluZGV4LnR4dCBiL0RvY3VtZW50YXRpb24vY21kLWluZGV4LnR4dAppbmRleCBjY2Q5ZmZjLi5lNDQ2ZjcxIDEwMDY0NAotLS0gYS9Eb2N1bWVudGF0aW9uL2NtZC1pbmRleC50eHQKKysrIGIvRG9jdW1lbnRhdGlvbi9jbWQtaW5kZXgudHh0CkBAIC04MSw2ICs4MSw5IEBACiBsaW5rOmNtZC1zdHJlYW0tZXZlbnRzLmh0bWxbZ2Vycml0IHN0cmVhbS1ldmVudHNdOjoKIAlNb25pdG9yIGV2ZW50cyBvY2N1cnJpbmcgaW4gcmVhbCB0aW1lLgogCitsaW5rOmNtZC12ZXJzaW9uLmh0bWxbZ2Vycml0IHZlcnNpb25dOjoKKwlTaG93IHRoZSBjdXJyZW50bHkgZXhlY3V0aW5nIHZlcnNpb24gb2YgR2Vycml0LgorCiBnaXQgdXBsb2FkLXBhY2s6OgogCVN0YW5kYXJkIEdpdCBzZXJ2ZXIgc2lkZSBjb21tYW5kIGZvciBjbGllbnQgc2lkZSBgZ2l0IGZldGNoYC4KIApkaWZmIC0tZ2l0IGEvRG9jdW1lbnRhdGlvbi9jbWQtbHMtcHJvamVjdHMudHh0IGIvRG9jdW1lbnRhdGlvbi9jbWQtbHMtcHJvamVjdHMudHh0CmluZGV4IGQ3ZDVhYTUuLjI2NTMwYmQgMTAwNjQ0Ci0tLSBhL0RvY3VtZW50YXRpb24vY21kLWxzLXByb2plY3RzLnR4dAorKysgYi9Eb2N1bWVudGF0aW9uL2NtZC1scy1wcm9qZWN0cy50eHQKQEAgLTE2LDYgKzE2LDcgQEAKICAgWy0tZm9ybWF0IHt0ZXh0IHwganNvbiB8IGpzb25fY29tcGFjdH1dCiAgIFstLWFsbF0KICAgWy0tbGltaXQgPE4+XQorICBbLS1oYXMtYWNsLWZvciBHUk9VUF0KIAogREVTQ1JJUFRJT04KIC0tLS0tLS0tLS0tCkBAIC05MSw2ICs5MiwxMyBAQAogLS1saW1pdDo6CiAJQ2FwIHRoZSBudW1iZXIgb2YgcmVzdWx0cyB0byB0aGUgZmlyc3QgTiBtYXRjaGVzLgogCistLWhhcy1hY2wtZm9yOjoKKwlEaXNwbGF5IG9ubHkgcHJvamVjdHMgb24gd2hpY2ggYWNjZXNzIHJpZ2h0cyBmb3IgdGhpcyBncm91cCBhcmUKKwlkaXJlY3RseSBhc3NpZ25lZC4gUHJvamVjdHMgd2hpY2ggb25seSBpbmhlcml0IGFjY2VzcyByaWdodHMgZm9yCisJdGhpcyBncm91cCBhcmUgbm90IGxpc3RlZC4KKysKK1dpdGggdGhpcyBvcHRpb24geW91IGNhbiBmaW5kIG91dCBvbiB3aGljaCBwcm9qZWN0cyBhIGdyb3VwIGlzIHVzZWQuCisKIEhUVFAKIC0tLS0KIFRoaXMgY29tbWFuZCBpcyBhbHNvIGF2YWlsYWJsZSBvdmVyIEhUVFAsIGFzIGAvcHJvamVjdHMvYCBmb3IKZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24vY21kLXF1ZXJ5LnR4dCBiL0RvY3VtZW50YXRpb24vY21kLXF1ZXJ5LnR4dAppbmRleCAyZmVlYTExLi45NjNkNzg4IDEwMDY0NAotLS0gYS9Eb2N1bWVudGF0aW9uL2NtZC1xdWVyeS50eHQKKysrIGIvRG9jdW1lbnRhdGlvbi9jbWQtcXVlcnkudHh0CkBAIC02NSw3ICs2NSw4IEBACiAKIC0tZmlsZXM6OgogCVN1cHBvcnQgZm9yIGxpc3RpbmcgZmlsZXMgd2l0aCBwYXRjaCBzZXRzIGFuZCB0aGVpcgotCWF0dHJpYnV0ZXMgKEFEREVELCBNT0RJRklFRCwgREVMRVRFRCwgUkVOQU1FRCwgQ09QSUVEKS4KKwlhdHRyaWJ1dGVzIChBRERFRCwgTU9ESUZJRUQsIERFTEVURUQsIFJFTkFNRUQsIENPUElFRCkKKwlhbmQgc2l6ZSBpbmZvcm1hdGlvbiAobnVtYmVyIG9mIGluc2VydGlvbnMgYW5kIGRlbGV0aW9ucykuCiAJTm90ZSB0aGF0IHRoaXMgb3B0aW9uIHJlcXVpcmVzIGVpdGhlciB0aGUgLS1jdXJyZW50LXBhdGNoLXNldAogCW9yIHRoZSAtLXBhdGNoLXNldHMgb3B0aW9uIGluIG9yZGVyIHRvIGdpdmUgYW55IGZpbGUgaW5mb3JtYXRpb24uCiAKZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24vY21kLXN0cmVhbS1ldmVudHMudHh0IGIvRG9jdW1lbnRhdGlvbi9jbWQtc3RyZWFtLWV2ZW50cy50eHQKaW5kZXggYThjZjNiMC4uY2UyM2RhNiAxMDA2NDQKLS0tIGEvRG9jdW1lbnRhdGlvbi9jbWQtc3RyZWFtLWV2ZW50cy50eHQKKysrIGIvRG9jdW1lbnRhdGlvbi9jbWQtc3RyZWFtLWV2ZW50cy50eHQKQEAgLTQ0LDcgKzQ0LDggQEAKICpwYXRjaFNldCosICphY2NvdW50KiBpbnZvbHZlZCwgYW5kIG90aGVyIGF0dHJpYnV0ZXMgYXMgYXBwcm9wcmlhdGUuCiBUaGUgY3VycmVudGx5IHN1cHBvcnRlZCBtZXNzYWdlIHR5cGVzIGFyZSAqcGF0Y2hzZXQtY3JlYXRlZCosCiAqZHJhZnQtcHVibGlzaGVkKiwgKmNoYW5nZS1hYmFuZG9uZWQqLCAqY2hhbmdlLXJlc3RvcmVkKiwKLSpjaGFuZ2UtbWVyZ2VkKiwgKmNvbW1lbnQtYWRkZWQqIGFuZCAqcmVmLXVwZGF0ZWQqLgorKmNoYW5nZS1tZXJnZWQqLCAqbWVyZ2UtZmFpbGVkKiwgKmNvbW1lbnQtYWRkZWQqLCAqcmVmLXVwZGF0ZWQqIGFuZAorKnJldmlld2VyLWFkZGVkKi4KIAogTm90ZSB0aGF0IGFueSBmaWVsZCBtYXkgYmUgbWlzc2luZyBpbiB0aGUgSlNPTiBtZXNzYWdlcywgc28gY29uc3VtZXJzIG9mCiB0aGlzIEpTT04gc3RyZWFtIHNob3VsZCBkZWFsIHdpdGggdGhhdCBhcHByb3ByaWF0ZWx5LgpAQCAtMTA1LDYgKzEwNiwxOCBAQAogCiBzdWJtaXR0ZXI6OiBsaW5rOmpzb24uaHRtbCNhY2NvdW50W2FjY291bnQgYXR0cmlidXRlXQogCitNZXJnZSBGYWlsZWQKK15eXl5eXl5eXl5eXgordHlwZTo6ICJtZXJnZS1mYWlsZWQiCisKK2NoYW5nZTo6IGxpbms6anNvbi5odG1sI2NoYW5nZVtjaGFuZ2UgYXR0cmlidXRlXQorCitwYXRjaFNldDo6IGxpbms6anNvbi5odG1sI3BhdGNoU2V0W3BhdGNoU2V0IGF0dHJpYnV0ZV0KKworc3VibWl0dGVyOjogbGluazpqc29uLmh0bWwjYWNjb3VudFthY2NvdW50IGF0dHJpYnV0ZV0KKworcmVhc29uOjogUmVhc29uIHRoYXQgdGhlIG1lcmdlIGZhaWxlZC4KKwogQ29tbWVudCBBZGRlZAogXl5eXl5eXl5eXl5eXgogdHlwZTo6ICJjb21tZW50LWFkZGVkIgpAQCAtMTI3LDYgKzE0MCwxNiBAQAogCiByZWZVcGRhdGU6OiBsaW5rOmpzb24uaHRtbCNyZWZVcGRhdGVbcmVmVXBkYXRlIGF0dHJpYnV0ZV0KIAorUmV2aWV3ZXIgQWRkZWQKK15eXl5eXl5eXl5eXl5eCit0eXBlOjogInJldmlld2VyLWFkZGVkIgorCitjaGFuZ2U6OiBsaW5rOmpzb24uaHRtbCNjaGFuZ2VbY2hhbmdlIGF0dHJpYnV0ZV0KKworcGF0Y2hzZXQ6OiBsaW5rOmpzb24uaHRtbCNwYXRjaFNldFtwYXRjaHNldCBhdHRyaWJ1dGVdCisKK3Jldmlld2VyOjogbGluazpqc29uLmh0bWwjYWNjb3VudFthY2NvdW50IGF0dHJpYnV0ZV0KKwogCiBTRUUgQUxTTwogLS0tLS0tLS0KZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24vY21kLXZlcnNpb24udHh0IGIvRG9jdW1lbnRhdGlvbi9jbWQtdmVyc2lvbi50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZDFmOTRlYQotLS0gL2Rldi9udWxsCisrKyBiL0RvY3VtZW50YXRpb24vY21kLXZlcnNpb24udHh0CkBAIC0wLDAgKzEsNDggQEAKK2dlcnJpdCB2ZXJzaW9uCis9PT09PT09PT09PT09PT09CisKK05BTUUKKy0tLS0KK2dlcnJpdCB2ZXJzaW9uIC0gU2hvdyB0aGUgdmVyc2lvbiBvZiB0aGUgY3VycmVudGx5IGV4ZWN1dGluZyBHZXJyaXQgc2VydmVyCisKK1NZTk9QU0lTCistLS0tLS0tLQorW3ZlcnNlXQorJ3NzaCcgLXAgPHBvcnQ+IDxob3N0PiAnZ2Vycml0IHZlcnNpb24nCisKK0RFU0NSSVBUSU9OCistLS0tLS0tLS0tLQorRGlzcGxheXMgYSBvbmUtbGluZSByZXNwb25zZSB3aXRoIHRoZSBzdHJpbmcgYGdlcnJpdCB2ZXJzaW9uYCBmb2xsb3dlZAorYnkgdGhlIGN1cnJlbnRseSBleGVjdXRpbmcgdmVyc2lvbiBvZiBHZXJyaXQuCisKK1RoZSBgZ2l0IGRlc2NyaWJlYCBjb21tYW5kIGlzIHVzZWQgdG8gZ2VuZXJhdGUgdGhlIHZlcnNpb24gc3RyaW5nIGJhc2VkCitvbiB0aGUgR2l0IGNvbW1pdCB1c2VkIHRvIGJ1aWxkIEdlcnJpdC4gRm9yIG9mZmljaWFsIHJlbGVhc2VzIG9mIEdlcnJpdCwKK3RoZSB2ZXJzaW9uIHN0cmluZyB3aWxsIGJlIGVxdWFsIHRvIHRoZSBHaXQgdGFnIHNldCBpbiB0aGUgR2Vycml0IHNvdXJjZQorY29kZSwgd2hpY2ggaW4gdHVybiBpcyBlcXVhbCB0byB0aGUgbmFtZSBvZiB0aGUgcmVsZWFzZSAoZm9yIGV4YW1wbGUKKzIuNC4yKS4gV2hlbiBidWlsZGluZyBHZXJyaXQgZnJvbSBhbm90aGVyIGNvbW1pdCAob25lIHRoYXQgZG9lc24ndCBoYXZlCithbiBvZmZpY2lhbC1sb29raW5nIHRhZyBwb2ludGluZyB0byBpdCksIHRoZSB2ZXJzaW9uIHN0cmluZyBoYXMgdGhlIGZvcm0KK2A8dGFnbmFtZT4tPG4+LWc8c2hhMT5gLCB3aGVyZSBgPG4+YCBpcyBhbiBpbnRlZ2VyIGluZGljYXRpbmcgdGhlIG51bWJlcgorb2YgY29tbWl0cyBhaGVhZCBvZiB0aGUgYDx0YWduYW1lPmAgdGFnIHRoZSBjb21taXQgaXMsIGFuZCBgPHNoYTE+YCBpcwordGhlIHNldmVuLWNoYXJhY3RlciBhYmJyZXZpYXRlZCBTSEEtMSBvZiB0aGUgY29tbWl0LiBTZWUgdGhlIGBnaXQKK2Rlc2NyaWJlYCBkb2N1bWVudGF0aW9uIGZvciBkZXRhaWxzIG9uIGhvdyBgPHRhZ25hbWU+YCBpcyBjaG9zZW4gYW5kIGhvdworYDxuPmAgaXMgY29tcHV0ZWQuCisKK0FDQ0VTUworLS0tLS0tCitBbnkgdXNlciB3aG8gaGFzIGNvbmZpZ3VyZWQgYW4gU1NIIGtleS4KKworU0NSSVBUSU5HCistLS0tLS0tLS0KK1RoaXMgY29tbWFuZCBpcyBpbnRlbmRlZCB0byBiZSB1c2VkIGluIHNjcmlwdHMuCisKK0VYQU1QTEVTCistLS0tLS0tLQorCis9PT09PQorCSQgc3NoIC1wIDI5NDE4IHJldmlldy5leGFtcGxlLmNvbSBnZXJyaXQgdmVyc2lvbgorCWdlcnJpdCB2ZXJzaW9uIDIuNC4yCis9PT09PQorCitHRVJSSVQKKy0tLS0tLQorUGFydCBvZiBsaW5rOmluZGV4Lmh0bWxbR2Vycml0IENvZGUgUmV2aWV3XQpkaWZmIC0tZ2l0IGEvRG9jdW1lbnRhdGlvbi9jb25maWctZ2Vycml0LnR4dCBiL0RvY3VtZW50YXRpb24vY29uZmlnLWdlcnJpdC50eHQKaW5kZXggMTk1OTk5NS4uMDNiZTAwOSAxMDA2NDQKLS0tIGEvRG9jdW1lbnRhdGlvbi9jb25maWctZ2Vycml0LnR4dAorKysgYi9Eb2N1bWVudGF0aW9uL2NvbmZpZy1nZXJyaXQudHh0CkBAIC0xMzMsNyArMTMzLDggQEAKIFRoZSBhY3R1YWwgdXNlcm5hbWUgdXNlZCBpbiB0aGUgTERBUCBzaW1wbGUgYmluZCByZXF1ZXN0IGlzIHRoZQogYWNjb3VudCdzIGZ1bGwgRE4sIHdoaWNoIGlzIGRpc2NvdmVyZWQgYnkgZmlyc3QgcXVlcnlpbmcgdGhlCiBkaXJlY3RvcnkgdXNpbmcgZWl0aGVyIGFuIGFub255bW91cyByZXF1ZXN0LCBvciB0aGUgY29uZmlndXJlZAotPDxsZGFwLnVzZXJuYW1lPj4gaWRlbnRpdHkuCis8PGxkYXAudXNlcm5hbWUsbGRhcC51c2VybmFtZT4+IGlkZW50aXR5LiBHZXJyaXQgY2FuIGFsc28gdXNlIGtlcmJlcm9zIGlmCis8PGxkYXAuYXV0aGVudGljYXRpb24sbGRhcC5hdXRoZW50aWNhdGlvbj4+IGlzIHNldCB0byBgR1NTQVBJYC4KIAogKiBgTERBUF9CSU5EYAogKwpAQCAtMTQ0LDcgKzE0NSw3IEBACiArCiBVbmxpa2UgTERBUCBhYm92ZSwgdGhlIHVzZXJuYW1lIHVzZWQgdG8gcGVyZm9ybSB0aGUgTERBUCBzaW1wbGUgYmluZAogcmVxdWVzdCBpcyB0aGUgZXhhY3Qgc3RyaW5nIHN1cHBsaWVkIGJ5IGluIHRoZSBkaWFsb2cgYnkgdGhlIHVzZXIuCi1UaGUgY29uZmlndXJlZCA8PGxkYXAudXNlcm5hbWU+PiBpZGVudGl0eSBpcyBub3QgdXNlZCB0byBvYnRhaW4KK1RoZSBjb25maWd1cmVkIDw8bGRhcC51c2VybmFtZSxsZGFwLnVzZXJuYW1lPj4gaWRlbnRpdHkgaXMgbm90IHVzZWQgdG8gb2J0YWluCiBhY2NvdW50IGluZm9ybWF0aW9uLgogKwogKiBgREVWRUxPUE1FTlRfQkVDT01FX0FOWV9BQ0NPVU5UYApAQCAtNDc1LDYgKzQ3NiwxNSBAQAogcmVxdWlyZXMgdHdvIEhUVFAgcmVxdWVzdHMsIGFuZCB0aGlzIGNhY2hlIHRyaWVzIHRvIGNhcnJ5IHN0YXRlIGZyb20KIHRoZSBmaXJzdCByZXF1ZXN0IGludG8gdGhlIHNlY29uZCB0byBlbnN1cmUgaXQgY2FuIGNvbXBsZXRlLgogCitjYWNoZSBgImNoYW5nZXMiYDo6CisrCitFYWNoIGl0ZW0gY2FjaGVzIGFsbCBjaGFuZ2VzIHRpZWQgdG8gb25lIHByb2plY3QuIERlZmF1bHQgc2l6ZQoraXMgMTAyNCwgd2hpY2ggbWVhbnMgYWxsIGNoYW5nZXMgZm9yIHVwIHRvIDEwMjQgcHJvamVjdHMgY2FuIGJlIGhlbGQKK2luIHRoZSBjYWNoZS4gVGhpcyBjYWNoZSBzaG91bGQgcHJvYmFibHkgYmUgZGlzYWJsZWQgaW4gYSBtdWx0aS1tYXN0ZXIKK3NldHVwIHdoZXJlIGNoYW5nZSB1cGRhdGVzIGFyZSBub3QgY29tbXVuaWNhdGVkIGJldHdlZW4gc2VydmVycy4gVGhlCitjYWNoZSBzaG91bGQgYmUgZmx1c2hlZCB3aGVuZXZlciB0aGUgZGF0YWJhc2UgY2hhbmdlcyB0YWJsZSBpcyBtb2RpZmllZAorb3V0c2lkZSBvZiBnZXJyaXQuCisKIGNhY2hlIGAiZGlmZiJgOjoKICsKIEVhY2ggaXRlbSBjYWNoZXMgdGhlIGRpZmZlcmVuY2VzIGJldHdlZW4gdHdvIGNvbW1pdHMsIGF0IGJvdGggdGhlCkBAIC02NTIsMTYgKzY2MiwyMyBAQAogW1tjaGFuZ2VNZXJnZV1dU2VjdGlvbiBjaGFuZ2VNZXJnZQogfn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fgogCitjaGFuZ2VNZXJnZS5jaGVja0ZyZXF1ZW5jeTo6CisrCitIb3cgb2Z0ZW4gdGhlIGRhdGFiYXNlIHNob3VsZCBiZSByZXNjYW5uZWQgZm9yIGNoYW5nZXMgdGhhdCBoYXZlIGJlZW4KK3N1Ym1pdHRlZCBidXQgbm90IG1lcmdlZCBkdWUgdG8gdHJhbnNpZW50IGVycm9ycy4gVmFsdWVzIGNhbiBiZQorc3BlY2lmaWVkIHVzaW5nIHN0YW5kYXJkIHRpbWUgdW5pdCBhYmJyZXZpYXRpb25zICgnbXMnLCAnc2VjJywgJ21pbicsCitldGMuKS4gU2V0IHRvIDAgdG8gZGlzYWJsZSBwZXJpb2RpYyByZXNjYW5uaW5nLCBvbmx5IHNjYW5uaW5nIG9uY2Ugb24KK21hc3RlciBub2RlIHN0YXJ0dXAuCisrCitEZWZhdWx0IGlzIDMwMCBzZWNvbmRzICg1IG1pbnV0ZXMpLgorCitjaGFuZ2VNZXJnZS50ZXN0OjoKKysKIENvbnRyb2xzIHdoZXRoZXIgb3Igbm90IHRoZSBtZXJnZWFiaWxpdHkgdGVzdCBvZiBjaGFuZ2VzIGlzCiBlbmFibGVkLiAgSWYgZW5hYmxlZCwgd2hlbiB0aGUgY2hhbmdlIHBhZ2UgaXMgbG9hZGVkLCB0aGUgdGVzdCBpcwogdHJpZ2dlcmVkLiBUaGUgc3VibWl0IGJ1dHRvbiB3aWxsIGJlIGVuYWJsZWQgb3IgZGlzYWJsZWQgYWNjb3JkaW5nIHRvCiB0aGUgcmVzdWx0LgotCi0tLS0tCi1bY2hhbmdlTWVyZ2VdCi0gIHRlc3QgPSB0cnVlCi0tLS0tCi0KKysKIEJ5IGRlZmF1bHQgdGhpcyBpcyBmYWxzZSAodGVzdCBpcyBub3QgZW5hYmxlZCkuCiAKIFtbY29tbWVudGxpbmtdXVNlY3Rpb24gY29tbWVudGxpbmsKQEAgLTEyNzIsNiArMTI4OSwxMSBAQAogT3B0aW9uYWwgZmlsZW5hbWUgZm9yIHRoZSBjaGFuZ2UgbWVyZ2VkIGhvb2ssIGlmIG5vdCBzcGVjaWZpZWQgdGhlbgogYGNoYW5nZS1tZXJnZWRgIHdpbGwgYmUgdXNlZC4KIAorW1tob29rcy5tZXJnZUZhaWxlZEhvb2tdXWhvb2tzLm1lcmdlRmFpbGVkSG9vazo6CisrCitPcHRpb25hbCBmaWxlbmFtZSBmb3IgdGhlIG1lcmdlIGZhaWxlZCBob29rLCBpZiBub3Qgc3BlY2lmaWVkIHRoZW4KK2BtZXJnZS1mYWlsZWRgIHdpbGwgYmUgdXNlZC4KKwogW1tob29rcy5jaGFuZ2VBYmFuZG9uZWRIb29rXV1ob29rcy5jaGFuZ2VBYmFuZG9uZWRIb29rOjoKICsKIE9wdGlvbmFsIGZpbGVuYW1lIGZvciB0aGUgY2hhbmdlIGFiYW5kb25lZCBob29rLCBpZiBub3Qgc3BlY2lmaWVkIHRoZW4KQEAgLTEyODcsNiArMTMwOSwxMSBAQAogT3B0aW9uYWwgZmlsZW5hbWUgZm9yIHRoZSByZWYgdXBkYXRlZCBob29rLCBpZiBub3Qgc3BlY2lmaWVkIHRoZW4KIGByZWYtdXBkYXRlZGAgd2lsbCBiZSB1c2VkLgogCitbW2hvb2tzLnJldmlld2VyQWRkZWRIb29rXV1ob29rcy5yZXZpZXdlckFkZGVkSG9vazo6CisrCitPcHRpb25hbCBmaWxlbmFtZSBmb3IgdGhlIHJldmlld2VyIGFkZGVkIGhvb2ssIGlmIG5vdCBzcGVjaWZpZWQgdGhlbgorYHJldmlld2VyLWFkZGVkYCB3aWxsIGJlIHVzZWQuCisKIFtbaG9va3MuY2xhU2lnbmVkSG9va11daG9va3MuY2xhU2lnbmVkSG9vazo6CiArCiBPcHRpb25hbCBmaWxlbmFtZSBmb3IgdGhlIENMQSBzaWduZWQgaG9vaywgaWYgbm90IHNwZWNpZmllZCB0aGVuCkBAIC0xMzA0LDEzICsxMzMxLDEzIEBACiBbW2h0dHAucHJveHlVc2VybmFtZV1daHR0cC5wcm94eVVzZXJuYW1lOjoKICsKIE9wdGlvbmFsIHVzZXJuYW1lIHRvIGF1dGhlbnRpY2F0ZSB0byB0aGUgSFRUUCBwcm94eSB3aXRoLgotVGhpcyBwcm9wZXJ0eSBpcyBob25vcmVkIG9ubHkgaWYgdGhlIHVzZXJuYW1lIGRvZXMgbm90IAorVGhpcyBwcm9wZXJ0eSBpcyBob25vcmVkIG9ubHkgaWYgdGhlIHVzZXJuYW1lIGRvZXMgbm90CiBhcHBlYXIgaW4gdGhlIGh0dHAucHJveHkgcHJvcGVydHkgYWJvdmUuCiAKIFtbaHR0cC5wcm94eVBhc3N3b3JkXV1odHRwLnByb3h5UGFzc3dvcmQ6OgogKwogT3B0aW9uYWwgcGFzc3dvcmQgdG8gYXV0aGVudGljYXRlIHRvIHRoZSBIVFRQIHByb3h5IHdpdGguCi1UaGlzIHByb3BlcnR5IGlzIGhvbm9yZWQgb25seSBpZiB0aGUgcGFzc3dvcmQgZG9lcyBub3QgCitUaGlzIHByb3BlcnR5IGlzIGhvbm9yZWQgb25seSBpZiB0aGUgcGFzc3dvcmQgZG9lcyBub3QKIGFwcGVhciBpbiB0aGUgaHR0cC5wcm94eSBwcm9wZXJ0eSBhYm92ZS4KIAogCkBAIC0xNzA2LDYgKzE3MzMsMjEgQEAKIERlZmF1bHQgaXMgYChtZW1iZXJVaWQ9JHt1c2VybmFtZX0pYCBmb3IgUkZDIDIzMDcsCiBhbmQgdW5zZXQgKGRpc2FibGVkKSBmb3IgQWN0aXZlIERpcmVjdG9yeS4KIAorW1tsZGFwLmdyb3VwTmFtZV1dbGRhcC5ncm91cE5hbWU6OgorKworXyhPcHRpb25hbClfIE5hbWUgb2YgdGhlIGF0dHJpYnV0ZSBvbiB0aGUgZ3JvdXAgb2JqZWN0IHdoaWNoIGNvbnRhaW5zCit0aGUgdmFsdWUgdG8gdXNlIGFzIHRoZSBncm91cCBuYW1lIGluIEdlcnJpdC4KKysKK1R5cGljYWxseSB0aGUgYXR0cmlidXRlIG5hbWUgaXMgYGNuYCBmb3IgUkZDIDIzMDcgYW5kIEFjdGl2ZSBEaXJlY3RvcnkKK3NlcnZlcnMuICBGb3Igb3RoZXIgc2VydmVycyB0aGUgYXR0cmlidXRlIG5hbWUgbWF5IGRpZmZlciwgZm9yIGV4YW1wbGUKK2BhcHBsZS1ncm91cC1yZWFsbmFtZWAgb24gQXBwbGUgTWFjT1MgWCBTZXJ2ZXIuCisrCitJdCBpcyBhbHNvIHBvc3NpYmxlIHRvIHNwZWNpZnkgYSBsaXRlcmFsIHN0cmluZyBjb250YWluaW5nIGEgcGF0dGVybiBvZgorYXR0cmlidXRlIHZhbHVlcy4gIEZvciBleGFtcGxlIHRvIGNyZWF0ZSBhIEdlcnJpdCBncm91cCBuYW1lIGNvbnNpc3Rpbmcgb2YKK0xEQVAgZ3JvdXAgbmFtZSBhbmQgZ3JvdXAgSUQsIHVzZSB0aGUgcGF0dGVybiBgJHtjbn0gKCR7Z2lkTnVtYmVyfSlgLgorKworRGVmYXVsdCBpcyBgY25gLgorCiBbW2xkYXAubG9jYWxVc2VybmFtZVRvTG93ZXJDYXNlXV1sZGFwLmxvY2FsVXNlcm5hbWVUb0xvd2VyQ2FzZTo6CiArCiBDb252ZXJ0cyB0aGUgbG9jYWwgdXNlcm5hbWUsIHRoYXQgaXMgdXNlZCB0byBsb2dpbiBpbnRvIHRoZSBHZXJyaXQKQEAgLTE3MjUsNiArMTc2NywzOCBAQAogKwogQnkgZGVmYXVsdCwgdW5zZXQvZmFsc2UuCiAKK1tbbGRhcC5hdXRoZW50aWNhdGlvbl1dbGRhcC5hdXRoZW50aWNhdGlvbjo6CisrCitEZWZpbmVzIGhvdyBHZXJyaXQgYXV0aGVudGljYXRlcyB3aXRoIHRoZSBzZXJ2ZXIuIFdoZW4gc2V0IHRvIGBHU1NBUElgCitHZXJyaXQgd2lsbCB1c2UgS2VyYmVyb3MuIFRvIHVzZSBrZXJiZXJvcyB0aGUKK2BqYXZhLnNlY3VyaXR5LmF1dGgubG9naW4uY29uZmlnYCBzeXN0ZW0gcHJvcGVydHkgbXVzdCBwb2ludCB0byBhCitsb2dpbiB0byBhIEpBQVMgY29uZmlndXJhdGlvbiBmaWxlIGFuZCwgaWYgSmF2YSA2IGlzIHVzZWQsIHRoZSBzeXN0ZW0KK3Byb3BlcnR5IGBqYXZhLnNlY3VyaXR5LmtyYjUuY29uZmAgbXVzdCBwb2ludCB0byB0aGUgYXBwcm9wcmlhdGUKK2tyYjUuaW5pIGZpbGUgd2l0aCByZWZlcmVuY2VzIHRvIHRoZSBLREMuCisKK1R5cGljYWwgamFhcy5jb25mLgorCistLS0tCitLZXJiZXJvc0xvZ2luIHsKKyAgICBjb20uc3VuLnNlY3VyaXR5LmF1dGgubW9kdWxlLktyYjVMb2dpbk1vZHVsZQorICAgICAgICAgICAgcmVxdWlyZWQKKyAgICAgICAgICAgIHVzZVRpY2tldENhY2hlPXRydWUKKyAgICAgICAgICAgIGRvTm90UHJvbXB0PXRydWUKKyAgICAgICAgICAgIHJlbmV3VEdUPXRydWU7Cit9OworLS0tLQorCitTZWUgSmF2YSBkb2N1bWVudGF0aW9uIG9uIGhvdyB0byBjcmVhdGUgdGhlIGtyYjUuaW5pIGZpbGUuCisKK05vdGUgdGhlIGByZW5ld1RHVGAgcHJvcGVydHkgdG8gbWFrZSBzdXJlIHRoZSBUR1QgZG9lcyBub3QgZXhwaXJlLAorYW5kIGB1c2VUaWNrZXRDYWNoZWAgdG8gdXNlIHRoZSBUR1Qgc3VwcGxpZWQgYnkgdGhlIG9wZXJhdGluZyBzeXN0ZW0uIEFzCit0aGUgd2hvbGUgcG9pbnQgb2YgdXNpbmcgR1NTQVBJIGlzIHRvIGhhdmUgcGFzc3dvcmRsZXNzIGF1dGhlbnRpY2F0aW9uCit0byB0aGUgTERBUCBzZXJ2aWNlLCB0aGlzIG9wdGlvbiBkb2VzIG5vdCBhcXVpcmUgYSBuZXcgVEdUIG9uIGl0cyBvd24uCisKK09uIFdpbmRvd3Mgc2VydmVycyB0aGUgcmVnaXN0cnkga2V5IGBIS0VZX0xPQ0FMX01BQ0hJTkVcU3lzdGVtXEN1cnJlbnRDb250cm9sU2V0XENvbnRyb2xcTHNhXEtlcmJlcm9zXFBhcmFtZXRlcnNgCittdXN0IGhhdmUgdGhlIERXT1JEIHZhbHVlIGBhbGxvd3RndHNlc3Npb25rZXlgIHNldCB0byAxIGFuZCB0aGUgYWNjb3VudCBtdXN0IG5vdAoraGF2ZSBsb2NhbCBhZG1pbmlzdHJhdG9yIHByaXZpbGVnZXMuCisKIFtbbWltZXR5cGVdXVNlY3Rpb24gbWltZXR5cGUKIH5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn4KIApAQCAtMjI2MCw2ICsyMzM0LDEzIEBACiBOZXcgY29uZmlndXJhdGlvbnMgc2hvdWxkIHByZWZlciB0aGUgYm9vbGVhbiB2YWx1ZSBmb3IgdGhpcyBmaWVsZAogYW5kIGFuIGVudW0gdmFsdWUgZm9yIGBhY2NvdW50cy52aXNpYmlsaXR5YC4KIAorW1tzdWdnZXN0LmZyb21dXXN1Z2dlc3QuZnJvbTo6CisrCitUaGUgbnVtYmVyIG9mIGNoYXJhY3RlcnMgdGhhdCBhIHVzZXIgbXVzdCBoYXZlIHR5cGVkIGJlZm9yZSBzdWdnZXN0aW9ucworYXJlIHByb3ZpZGVkLiBJZiBzZXQgdG8gMCwgc3VnZ2VzdGlvbnMgYXJlIGFsd2F5cyBwcm92aWRlZC4KKysKK0J5IGRlZmF1bHQgMC4KKwogW1t0aGVtZV1dIFNlY3Rpb24gdGhlbWUKIH5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+CiAKZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24vY29uZmlnLWdpdHdlYi50eHQgYi9Eb2N1bWVudGF0aW9uL2NvbmZpZy1naXR3ZWIudHh0CmluZGV4IDM1ZDVjMGQuLmU1ZWRkYTggMTAwNjQ0Ci0tLSBhL0RvY3VtZW50YXRpb24vY29uZmlnLWdpdHdlYi50eHQKKysrIGIvRG9jdW1lbnRhdGlvbi9jb25maWctZ2l0d2ViLnR4dApAQCAtMSwxMyArMSwxMiBAQAotR2Vycml0IENvZGUgUmV2aWV3IC0gR2l0d2ViIEludGVncmF0aW9uCi09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KK0dpdHdlYiBJbnRlZ3JhdGlvbgorLS0tLS0tLS0tLS0tLS0tLS0tCiAKIEdlcnJpdCBDb2RlIFJldmlldyBjYW4gbWFuYWdlIGFuZCBnZW5lcmF0ZSBoeXBlcmxpbmtzIHRvIGdpdHdlYiwKIGFsbG93aW5nIHVzZXJzIHRvIGp1bXAgZnJvbSBHZXJyaXQgY29udGVudCB0byB0aGUgc2FtZSBpbmZvcm1hdGlvbiwKIGJ1dCBzaG93biBieSBnaXR3ZWIuCiAKLQogSW50ZXJuYWwvTWFuYWdlZCBnaXR3ZWIKLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCit+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fgogCiBJbiB0aGUgaW50ZXJuYWwgY29uZmlndXJhdGlvbiwgR2Vycml0IGluc3BlY3RzIHRoZSByZXF1ZXN0LCBlbmZvcmNlcwogaXRzIHByb2plY3QgbGV2ZWwgYWNjZXNzIGNvbnRyb2xzLCBhbmQgZGlyZWN0bHkgZXhlY3V0ZXMgYGdpdHdlYi5jZ2lgCkBAIC0zOSw3ICszOCw3IEBACiBiZSByZXN0YXJ0ZWQgYW5kIGNsaWVudHMgbXVzdCByZWxvYWQgdGhlIGhvc3QgcGFnZSB0byBzZWUgdGhlIGNoYW5nZS4KIAogQ29uZmlndXJhdGlvbgotfn5+fn5+fn5+fn5+fgorXl5eXl5eXl5eXl5eXgogCiBNb3N0IG9mIHRoZSBnaXR3ZWIgY29uZmlndXJhdGlvbiBmaWxlIGlzIGhhbmRsZWQgYXV0b21hdGljYWxseQogYnkgR2Vycml0IENvZGUgUmV2aWV3LiAgU2l0ZSBzcGVjaWZpYyBvdmVycmlkZXMgY2FuIGJlIHBsYWNlZCBpbgpAQCAtNDcsNyArNDYsNyBAQAogcGFydCBvZiB0aGUgZ2VuZXJhdGVkIGNvbmZpZ3VyYXRpb24gZmlsZS4KIAogTG9nbyBhbmQgQ1NTCi1+fn5+fn5+fn5+fn4KK15eXl5eXl5eXl5eXgogCiBJZiB0aGUgcGFja2FnZS1tYW5hZ2VyIGluc3RhbGxlZCBDR0kgKGAvdXNyL2xpYi9jZ2ktYmluL2dpdHdlYi5jZ2lgKQogaXMgYmVpbmcgdXNlZCwgdGhlIHN0b2NrIENTUyBhbmQgbG9nbyBmaWxlcyB3aWxsIGJlIHNlcnZlZCBmcm9tCkBAIC01OCwxNyArNTcsMTY1IEBACiB0aGUgZGVmYXVsdCBzb3VyY2UgY29kZSBkaXN0cmlidXRpb24sIGFuZCBtb3N0IGN1c3RvbSBpbnN0YWxsYXRpb25zLgogCiBBY2Nlc3MgQ29udHJvbAotfn5+fn5+fn5+fn5+fn4KK15eXl5eXl5eXl5eXl5eCiAKIEFjY2VzcyBjb250cm9scyBmb3IgaW50ZXJuYWxseSBtYW5hZ2VkIGdpdHdlYiBwYWdlIHZpZXdzIGFyZSBlbmZvcmNlZAogdXNpbmcgdGhlIHN0YW5kYXJkIHByb2plY3QgUkVBRCArMSBwZXJtaXNzaW9uLgogCi0KIEV4dGVybmFsL1VubWFuYWdlZCBnaXR3ZWIKLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KK35+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn4KIAotSW4gdGhlIGV4dGVybmFsIGNvbmZpZ3VyYXRpb24sIGdpdHdlYiBydW5zIHVuZGVyIHRoZSBjb250cm9sIG9mIGFuCi1leHRlcm5hbCB3ZWIgc2VydmVyLCBhbmQgR2Vycml0IGFjY2VzcyBjb250cm9scyBhcmUgbm90IGVuZm9yY2VkLgorRm9yIHRoZSBleHRlcm5hbCBjb25maWd1cmF0aW9uLCBnaXR3ZWIgcnVucyB1bmRlciB0aGUgY29udHJvbCBvZiBhbgorZXh0ZXJuYWwgd2ViIHNlcnZlciwgYW5kIEdlcnJpdCBhY2Nlc3MgY29udHJvbHMgYXJlIG5vdCBlbmZvcmNlZC4gR2Vycml0Citwcm92aWRlcyBjb25maWd1cmF0aW9uIHBhcmFtZXRlcnMgZm9yIGludGVncmF0aW9uIHdpdGggR2l0V2ViLgorCitbW2xpbnV4R2l0V2ViXV0KK0xpbnV4IEluc3RhbGxhdGlvbgorXl5eXl5eXl5eXl5eXl5eXl5eCisKK0luc3RhbGwgR2l0V2ViCisrKysrKysrKysrKysrKworCitPbiBVYnVudHU6CisKKz09PT0KKyAgc3VkbyBhcHQtZ2V0IGluc3RhbGwgZ2l0d2ViCis9PT09CisKK1dpdGggWXVtOgorCis9PT09CisgICQgeXVtIGluc3RhbGwgZ2l0d2ViCis9PT09CisKK0NvbmZpZ3VyZSBHaXRXZWIKKysrKysrKysrKysrKysrKysKKworCitVcGRhdGUgYC9ldGMvZ2l0d2ViLmNvbmZgLCBhZGQgdGhlIHB1YmxpYyBHSVQgcmVwb3NpdG9yaWVzOgorCistLS0tCiskcHJvamVjdHJvb3QgPSAiL3Zhci93d3cvcmVwby8iOworCisjIGRpcmVjdG9yeSB0byB1c2UgZm9yIHRlbXAgZmlsZXMKKyRnaXRfdGVtcCA9ICIvdG1wIjsKKworIyB0YXJnZXQgb2YgdGhlIGhvbWUgbGluayBvbiB0b3Agb2YgYWxsIHBhZ2VzCisjJGhvbWVfbGluayA9ICRteV91cmkgfHwgIi8iOworCisjIGh0bWwgdGV4dCB0byBpbmNsdWRlIGF0IGhvbWUgcGFnZQorJGhvbWVfdGV4dCA9ICJpbmRleHRleHQuaHRtbCI7CisKKyMgZmlsZSB3aXRoIHByb2plY3QgbGlzdDsgYnkgZGVmYXVsdCwgc2ltcGx5IHNjYW4gdGhlIHByb2plY3Ryb290IGRpci4KKyRwcm9qZWN0c19saXN0ID0gJHByb2plY3Ryb290OworCisjIHN0eWxlc2hlZXQgdG8gdXNlCisjIEkgdG9vayBvZmYgdGhlIHByZWZpeCAvIG9mIHRoZSBmb2xsb3dpbmcgcGF0aCB0byBwdXQgdGhlc2UgZmlsZXMgaW5zaWRlIGdpdHdlYiBkaXJlY3RvcnkgZGlyZWN0bHkKKyRzdHlsZXNoZWV0ID0gImdpdHdlYi5jc3MiOworCisjIGxvZ28gdG8gdXNlCiskbG9nbyA9ICJnaXQtbG9nby5wbmciOworCisjIHRoZSCRZmF2aWNvbpIKKyRmYXZpY29uID0gImdpdC1mYXZpY29uLnBuZyI7CistLS0tCisKK0NvbmZpZ3VyZSAmIFJlc3RhcnQgQXBhY2hlIFdlYiBTZXJ2ZXIKK15eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl4KKworQ29uZmlndXJlIEFwYWNoZQorKysrKysrKysrKysrKysrKworCisKK0xpbmsgZ2l0d2ViIHRvIGAvdmFyL3d3dy9naXR3ZWJgLCBjaGVjayBgL2V0Yy9naXR3ZWIuY29uZmAgaWYgdW5zdXJlIG9mIHBhdGhzOgorCis9PT09CisgICQgc3VkbyBsbiAtcyAvdXNyL3NoYXJlL2dpdHdlYiAvdmFyL3d3dy9naXR3ZWIKKz09PT0KKworQWRkIHRoZSBnaXR3ZWIgZGlyZWN0b3J5IHRvIHRoZSBBcGFjaGUgY29uZmlndXJhdGlvbiBieSBjcmVhdGluZyBhICJnaXR3ZWIiCitmaWxlIGluc2lkZSB0aGUgQXBhY2hlIGNvbmYuZCBkaXJlY3Rvcnk6CisKKz09PT0KKyAgJCB0b3VjaCAvZXRjL2FwYWNoZS9jb25mLmQvZ2l0d2ViCis9PT09CisKK0FkZCB0aGUgZm9sbG93aW5nIHRvIC9ldGMvYXBhY2hlL2NvbmYuZC9naXR3ZWI6CisKKy0tLS0KK0FsaWFzIC9naXR3ZWIgL3Zhci93d3cvZ2l0d2ViCisKK09wdGlvbnMgSW5kZXhlcyBGb2xsb3dTeW1saW5rcyBFeGVjQ0dJCitEaXJlY3RvcnlJbmRleCAvY2dpLWJpbi9naXR3ZWIuY2dpCitBbGxvd092ZXJyaWRlIE5vbmUKKy0tLS0KKworKk5PVEUqIFRoaXMgbWF5IGhhdmUgYWxyZWFkeSBiZWVuIGFkZGVkIGJ5IHl1bS9hcHQtZ2V0LiBJZiB0aGF0J3MgdGhlIGNhc2UsIGxlYXZlIGFzCitpcy4KKworUmVzdGFydCB0aGUgQXBhY2hlIFdlYiBTZXJ2ZXIKKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrCisKKz09PT0KKyQgc3VkbyAvZXRjL2luaXQuZC9hcGFjaGUyIHJlc3RhcnQKKz09PT0KKworTm93IHlvdSBzaG91bGQgYmUgYWJsZSB0byB2aWV3IHlvdXIgcmVwb3NpdG9yeSBwcm9qZWN0cyBvbmxpbmU6CisKK2xpbms6aHR0cDovL2xvY2FsaG9zdC9naXR3ZWJbaHR0cDovL2xvY2FsaG9zdC9naXR3ZWJdCisKK1tbV2luZG93c0dpdFdlYl1dCitXaW5kb3dzIEluc3RhbGxhdGlvbgorXl5eXl5eXl5eXl5eXl5eXl5eXl4KKworSW5zdHJ1Y3Rpb25zIGFyZSBhdmFpbGFibGUgZm9yIGluc3RhbGxpbmcgdGhlIEdpdFdlYiBtb2R1bGUgZGlzdHJpYnV0ZWQgd2l0aAorTXN5c0dpdDoKKworbGluazpodHRwczovL2dpdGh1Yi5jb20vbXN5c2dpdC9tc3lzZ2l0L3dpa2kvR2l0V2ViW0dpdFdlYl0KKworSWYgeW91IGRvbid0IGhhdmUgQXBhY2hlIGluc3RhbGxlZCwgeW91IGNhbiBkb3dubG9hZCB0aGUgYXBwcm9wcmlhdGUgYnVpbGQgZm9yCitXaW5kb3dzIGZyb20gbGluazpodHRwOi8vd3d3LmFwYWNoZWxvdW5nZS5jb20vZG93bmxvYWRbYXBhY2hlbG91bmdlLm9yZ10uCisKK0FmdGVyIHlvdSBoYXZlIGluc3RhbGxlZCBBcGFjaGUsIHlvdSB3aWxsIHdhbnQgdG8gY3JlYXRlIGEgbGluazpodHRwOi8vaHR0cGQuYXBhY2hlLm9yZy9kb2NzLzIuMC9wbGF0Zm9ybS93aW5kb3dzLmh0bWwjd2luc3ZjW25ldyBzZXJ2aWNlIHVzZXIKK2FjY291bnRdIHRvIHVzZSB3aXRoIEFwYWNoZS4KKworSWYgeW91J3JlIHN0aWxsIGhhdmluZyBkaWZmaWN1bHR5IHNldHRpbmcgdXAgcGVybWlzc2lvbnMsIHlvdSBtYXkgZmluZCB0aGlzCit0ZWNoIG5vdGUgdXNlZnVsIGZvciBjb25maWd1cmluZyBBcGFjaGUgU2VydmljZSB0byBydW4gdW5kZXIgYW5vdGhlciBhY2NvdW50LgorWW91IG11c3QgZ3JhbnQgdGhlIG5ldyBhY2NvdW50IGxpbms6aHR0cDovL3RlY2huZXQubWljcm9zb2Z0LmNvbS9lbi11cy9saWJyYXJ5L2NjNzk0OTQ0KFdTLjEwKS5hc3B4WyJydW4gYXMgc2VydmljZSJdIHBlcm1pc3Npb246CisKK1RoZSBHaXRXZWIgdmVyc2lvbiBpbiBtc3lzZ2l0IGlzIG1pc3Npbmcgc2V2ZXJhbCBpbXBvcnRhbnQgYW5kIHJlcXVpcmVkCitwZXJsIG1vZHVsZXMsIGluY2x1ZGluZyBDR0kucG0uIFRoZSBwZXJsIGluY2x1ZGVkIHdpdGggdGhlIG1zeXNnaXQgZGlzdHJvIDEuNy44CitpcyBicm9rZW4uLiBUaGUgbGluazpodHRwOi8vZ3JvdXBzLmdvb2dsZS5jb20vZ3JvdXAvbXN5c2dpdC9icm93c2VfdGhyZWFkL3RocmVhZC9iYTM1MDFmMWYwZWQ5NWFmW3VuaWNvcmUgZm9sZGVyIGlzIG1pc3NpbmcgYWxvbmcgd2l0aCB1dGY4X2hlYXZ5LnBsIGFuZCBDR0kucG1dLiBZb3UgY2FuCit2ZXJpZnkgYnkgY2hlY2tpbmcgZm9yIHBlcmwgbW9kdWxlcy4gRnJvbSBhbiBtc3lzIGNvbnNvbGUsIGV4ZWN1dGUgdGhlCitmb2xsb3dpbmcgdG8gY2hlY2s6CisKKz09PT0KKyQgcGVybCAtbUNHSSAtbUVuY29kZSAtbUZjbnRsIC1tRmlsZTo6RmluZCAtbUZpbGU6OkJhc2VuYW1lIC1lICIiCis9PT09CisKK1lvdSBtYXkgZW5jb3VudGVyIHRoZSBmb2xsb3dpbmcgZXhjZXB0aW9uOgorCistLS0tCiskIHBlcmwgLW1DR0kgLW1FbmNvZGUgLW1GY250bCAtbUZpbGU6OkZpbmQgLW1GaWxlOjpCYXNlbmFtZSAtZSAiIgorQ2FuJ3QgbG9jYXRlIENHSS5wbSBpbiBASU5DIChASU5DIGNvbnRhaW5zOiAvdXNyL2xpYi9wZXJsNS81LjguOC9tc3lzCisvdXNyL2xpYi9wIGVybDUvNS44LjggL3Vzci9saWIvcGVybDUvc2l0ZV9wZXJsLzUuOC44L21zeXMKKy91c3IvbGliL3Blcmw1L3NpdGVfcGVybC81LjguOCAvdSBzci9saWIvcGVybDUvc2l0ZV9wZXJsIC4pLiBCRUdJTgorZmFpbGVkLS1jb21waWxhdGlvbiBhYm9ydGVkLgorLS0tLQorCitJZiB5b3UncmUgbWlzc2luZyBDR0kucG0sIHlvdSdsbCBoYXZlIHRvIGRlcGxveSB0aGUgbW9kdWxlIHRvIHRoZSBtc3lzCitlbnZpcm9ubWVudDogWW91IHdpbGwgaGF2ZSB0byByZXRyaWV2ZSB0aGVtIGZyb20gdGhlIDUuOC44IGRpc3RybyBvbiA6CisKK2h0dHA6Ly9zdHJhd2JlcnJ5cGVybC5jb20vcmVsZWFzZXMuaHRtbAorCitGaWxlOiBzdHJhd2JlcnJ5LXBlcmwtNS44LjguMy56aXAKKworY29udGVudHM6IGBiaW4vYCBgbGliL2AgYHNpdGUvYAorCitjb3B5IHRoZSBjb250ZW50cyBvZiBsaWIgaW50byBgbXN5c2dpdC9saWIvcGVybDUvNS44LjhgIGFuZCBvdmVyd3JpdGUgZXhpc3RpbmcgZmlsZXMuCisKK0VuYWJsZSBHaXRXZWIgSW50ZWdyYXRpb24KK15eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl4KIAogVG8gZW5hYmxlIHRoZSBleHRlcm5hbCBnaXR3ZWIgaW50ZWdyYXRpb24sIHNldAogbGluazpjb25maWctZ2Vycml0Lmh0bWwjZ2l0d2ViLnVybFtnaXR3ZWIudXJsXSB3aXRoIHRoZSBVUkwgb2YgeW91cgpAQCAtNzksMTYgKzIyNiwyNyBAQAogYmVpbmcgdXNlZCwgZW5zdXJlIGl0IHVzZXMgYSBmdWxsIG1pcnJvciwgc28gdGhlIGByZWZzL2NoYW5nZXMvKmAKIG5hbWVzcGFjZSBpcyBhdmFpbGFibGUuCiAKLT09PT0KLSAgZ2l0IGNvbmZpZyAtLWZpbGUgJHNpdGVfcGF0aC9ldGMvZ2Vycml0LmNvbmZpZyBnaXR3ZWIudXJsIGh0dHA6Ly9leGFtcGxlLmNvbS9naXR3ZWIuY2dpCi0gIGdpdCBjb25maWcgLS1maWxlICRzaXRlX3BhdGgvZXRjL2dlcnJpdC5jb25maWcgLS11bnNldCBnaXR3ZWIuY2dpCi09PT09CistLS0tCiskIGdpdCBjb25maWcgLWYgJHNpdGVfcGF0aC9ldGMvZ2Vycml0LmNvbmZpZyBnaXR3ZWIuY2dpICRQQVRIX1RPX0dJVFdFQi9naXR3ZWIuY2dpCiskIGdpdCBjb25maWcgLWYgJHNpdGVfcGF0aC9ldGMvZ2Vycml0LmNvbmZpZyBnaXR3ZWIudXJsIGh0dHBzOi8vZ2l0d2ViLmNvcnBvcmF0aW9uLmNvbQorLS0tLQorCitJZiB5b3UncmUgbm90IGZvbGxvd2luZyB0aGUgdHJhZGl0aW9uYWwgXHtwcm9qZWN0TmFtZVx9LmdpdCBwcm9qZWN0IG5hbWluZyBjb252ZW50aW9ucywKK3lvdSB3aWxsIHdhbnQgdG8gY3VzdG9taXplIEdlcnJpdCB0byByZWFkIHRoZW0uIEFkZCB0aGUgZm9sbG93aW5nOgorCistLS0tCiskIGdpdCBjb25maWcgLWYgJHNpdGVfcGF0aC9ldGMvZ2Vycml0LmNvbmZpZyBnaXR3ZWIudHlwZSBjdXN0b20KKyQgZ2l0IGNvbmZpZyAtZiAkc2l0ZV9wYXRoL2V0Yy9nZXJyaXQuY29uZmlnIGdpdHdlYi5wcm9qZWN0ID9wPVwke3Byb2plY3R9XDthPXN1bW1hcnkKKyQgZ2l0IGNvbmZpZyAtZiAkc2l0ZV9wYXRoL2V0Yy9nZXJyaXQuY29uZmlnIGdpdHdlYi5yZXZpc2lvbiA/cD1cJHtwcm9qZWN0fVw7YT1jb21taXRcO2g9XCR7Y29tbWl0fQorJCBnaXQgY29uZmlnIC1mICRzaXRlX3BhdGgvZXRjL2dlcnJpdC5jb25maWcgZ2l0d2ViLmJyYW5jaCA/cD1cJHtwcm9qZWN0fVw7YT1zaG9ydGxvZ1w7aD1cJHticmFuY2h9CiskIGdpdCBjb25maWcgLWYgJHNpdGVfcGF0aC9ldGMvZ2Vycml0LmNvbmZpZyBnaXR3ZWIuZmlsZWhpc3RvcnkgP3A9XCR7cHJvamVjdH1cO2E9aGlzdG9yeVw7aGI9XCR7YnJhbmNofVw7Zj1cJHtmaWxlfQorLS0tLQogCiBBZnRlciB1cGRhdGluZyBgJyRzaXRlX3BhdGgnL2V0Yy9nZXJyaXQuY29uZmlnYCwgdGhlIEdlcnJpdCBzZXJ2ZXIgbXVzdAogYmUgcmVzdGFydGVkIGFuZCBjbGllbnRzIG11c3QgcmVsb2FkIHRoZSBob3N0IHBhZ2UgdG8gc2VlIHRoZSBjaGFuZ2UuCiAKIEFjY2VzcyBDb250cm9sCi1+fn5+fn5+fn5+fn5+fgorKysrKysrKysrKysrKysKIAogR2l0d2ViIGFjY2VzcyBjb250cm9scyBjYW4gYmUgaW1wbGVtZW50ZWQgdXNpbmcgc3RhbmRhcmQgd2ViIHNlcnZlcgogYWNjZXNzIGNvbnRyb2xzLiAgVGhpcyBpc24ndCB0eXBpY2FsbHkgaW50ZWdyYXRlZCB3aXRoIEdlcnJpdCdzIG93bgpAQCAtOTYsNyArMjU0LDcgQEAKIGNvbnNpc3RlbnQgaWYgYWNjZXNzIG5lZWRzIHRvIGJlIHJlc3RyaWN0ZWQuCiAKIENhY2hpbmcgR2l0d2ViCi1+fn5+fn5+fn5+fn5+fgorKysrKysrKysrKysrKysKIAogSWYgeW91ciByZXBvc2l0b3J5IHNldCBpcyBsYXJnZSBhbmQgeW91IGFyZSBleHBlY3RpbmcgYSBsb3QKIG9mIHVzZXJzLCB5b3UgbWF5IHdhbnQgdG8gbG9vayBhdCB0aGUgY2FjaGluZyBmb3JrcyB1c2VkIGJ5CkBAIC0xMTIsNyArMjcwLDcgQEAKIEl0IGlzIGFsc28gcG9zc2libGUgdG8gZGVmaW5lIGN1c3RvbSBwYXR0ZXJucy4KIAogU2VlIEFsc28KLS0tLS0tLS0tCit+fn5+fn5+fgogCiAqIGxpbms6Y29uZmlnLWdlcnJpdC5odG1sI2dpdHdlYltTZWN0aW9uIGdpdHdlYl0KICogbGluazpodHRwOi8vaGplbWxpLm5ldC9naXQvY2dpdC9bY2dpdF0KZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24vY29uZmlnLWhvb2tzLnR4dCBiL0RvY3VtZW50YXRpb24vY29uZmlnLWhvb2tzLnR4dAppbmRleCBkZmRiYTUyLi5kZmFjNmQxIDEwMDY0NAotLS0gYS9Eb2N1bWVudGF0aW9uL2NvbmZpZy1ob29rcy50eHQKKysrIGIvRG9jdW1lbnRhdGlvbi9jb25maWctaG9va3MudHh0CkBAIC01Nyw2ICs1NywxNSBAQAogICBjaGFuZ2UtbWVyZ2VkIC0tY2hhbmdlIDxjaGFuZ2UgaWQ+IC0tY2hhbmdlLXVybCA8Y2hhbmdlIHVybD4gLS1wcm9qZWN0IDxwcm9qZWN0IG5hbWU+IC0tYnJhbmNoIDxicmFuY2g+IC0tdG9waWMgPHRvcGljPiAtLXN1Ym1pdHRlciA8c3VibWl0dGVyPiAtLWNvbW1pdCA8c2hhMT4KID09PT0KIAorbWVyZ2UtZmFpbGVkCit+fn5+fn5+fn5+fn4KKworQ2FsbGVkIHdoZW5ldmVyIGEgY2hhbmdlIGhhcyBmYWlsZWQgdG8gbWVyZ2UuCisKKz09PT0KKyAgbWVyZ2UtZmFpbGVkIC0tY2hhbmdlIDxjaGFuZ2UgaWQ+IC0tY2hhbmdlLXVybCA8Y2hhbmdlIHVybD4gLS1wcm9qZWN0IDxwcm9qZWN0IG5hbWU+IC0tYnJhbmNoIDxicmFuY2g+IC0tdG9waWMgPHRvcGljPiAtLXN1Ym1pdHRlciA8c3VibWl0dGVyPiAtLWNvbW1pdCA8c2hhMT4gLS1yZWFzb24gPHJlYXNvbj4KKz09PT0KKwogY2hhbmdlLWFiYW5kb25lZAogfn5+fn5+fn5+fn5+fn5+fgogCkBAIC04NCw2ICs5MywxNSBAQAogICByZWYtdXBkYXRlZCAtLW9sZHJldiA8b2xkIHJldj4gLS1uZXdyZXYgPG5ldyByZXY+IC0tcmVmbmFtZSA8cmVmIG5hbWU+IC0tcHJvamVjdCA8cHJvamVjdCBuYW1lPiAtLXN1Ym1pdHRlciA8c3VibWl0dGVyPgogPT09PQogCityZXZpZXdlci1hZGRlZAorfn5+fn5+fn5+fn5+fn4KKworQ2FsbGVkIHdoZW5ldmVyIGEgcmV2aWV3ZXIgaXMgYWRkZWQgdG8gYSBjaGFuZ2UuCisKKz09PT0KKyAgcmV2aWV3ZXItYWRkZWQgLS1jaGFuZ2UgPGNoYW5nZSBpZD4gLS1jaGFuZ2UtdXJsIDxjaGFuZ2UgdXJsPiAtLXByb2plY3QgPHByb2plY3QgbmFtZT4gLS1icmFuY2ggPGJyYW5jaD4gLS1yZXZpZXdlciA8cmV2aWV3ZXI+Cis9PT09CisKIGNsYS1zaWduZWQKIH5+fn5+fn5+fn4KIApAQCAtMTA0LDggKzEyMiw4IEBACiAKIEZvciB0aGUgaG9vayBmaWxlbmFtZXMsIEdlcnJpdCB3aWxsIHVzZSB0aGUgdmFsdWVzIG9mIGhvb2tzLnBhdGNoc2V0Q3JlYXRlZEhvb2ssCiBob29rcy5kcmFmdFB1Ymxpc2hlZEhvb2ssIGhvb2tzLmNvbW1lbnRBZGRlZEhvb2ssIGhvb2tzLmNoYW5nZU1lcmdlZEhvb2ssCi1ob29rcy5jaGFuZ2VBYmFuZG9uZWRIb29rLCBob29rcy5jaGFuZ2VSZXN0b3JlZEhvb2ssIGhvb2tzLnJlZlVwZGF0ZWRIb29rIGFuZAotaG9va3MuY2xhU2lnbmVkSG9vay4KK2hvb2tzLmNoYW5nZUFiYW5kb25lZEhvb2ssIGhvb2tzLmNoYW5nZVJlc3RvcmVkSG9vaywgaG9va3MucmVmVXBkYXRlZEhvb2ssCitob29rcy5yZXZpZXdlckFkZGVkSG9vayBhbmQgaG9va3MuY2xhU2lnbmVkSG9vay4KIAogTWlzc2luZyBDaGFuZ2UgVVJMcwogLS0tLS0tLS0tLS0tLS0tLS0tLQpkaWZmIC0tZ2l0IGEvRG9jdW1lbnRhdGlvbi9jb25maWctbWFpbC50eHQgYi9Eb2N1bWVudGF0aW9uL2NvbmZpZy1tYWlsLnR4dAppbmRleCBhZDA3MDRmLi5mYzcwNjBkIDEwMDY0NAotLS0gYS9Eb2N1bWVudGF0aW9uL2NvbmZpZy1tYWlsLnR4dAorKysgYi9Eb2N1bWVudGF0aW9uL2NvbmZpZy1tYWlsLnR4dApAQCAtNDksNyArNDksMTQgQEAKIAogVGhlIGBDb21tZW50LnZtYCB0ZW1wbGF0ZSB3aWxsIGRldGVybWluZSB0aGUgY29udGVudHMgb2YgdGhlIGVtYWlsIHJlbGF0ZWQgdG8KIGEgdXNlciBzdWJtaXR0aW5nIGNvbW1lbnRzIG9uIGNoYW5nZXMuICBJdCBpcyBhIGBDaGFuZ2VFbWFpbGA6IHNlZQotYENoYW5nZVN1YmplY3Qudm1gIGFuZCBgQ2hhbmdlRm9vdGVyLnZtYC4KK2BDaGFuZ2VTdWJqZWN0LnZtYCwgYENoYW5nZUZvb3Rlci52bWAgYW5kIGBDb21tZW50Rm9vdGVyLnZtYC4KKworQ29tbWVudEZvb3Rlci52bQorfn5+fn5+fn5+fn5+fn5+fgorCitUaGUgYENvbW1lbnRGb290ZXIudm1gIHRlbXBsYXRlIHdpbGwgZGV0ZXJtaW5lIHRoZSBjb250ZW50cyBvZiB0aGUgZm9vdGVyCit0ZXh0IHRoYXQgd2lsbCBiZSBhcHBlbmRlZCB0byBlbWFpbHMgcmVsYXRlZCB0byBhIHVzZXIgc3VibWl0dGluZyBjb21tZW50cyBvbgorY2hhbmdlcy4gIFNlZSBgQ2hhbmdlU3ViamVjdC52bWAsIGBDb21tZW50LnZtYCBhbmQgYENoYW5nZUZvb3Rlci52bWAuCiAKIE1lcmdlZC52bQogfn5+fn5+fn5+CmRpZmYgLS1naXQgYS9Eb2N1bWVudGF0aW9uL2Rldi1wbHVnaW5zLnR4dCBiL0RvY3VtZW50YXRpb24vZGV2LXBsdWdpbnMudHh0CmluZGV4IGRkMGM0NGMuLjVhZjlkMWMgMTAwNjQ0Ci0tLSBhL0RvY3VtZW50YXRpb24vZGV2LXBsdWdpbnMudHh0CisrKyBiL0RvY3VtZW50YXRpb24vZGV2LXBsdWdpbnMudHh0CkBAIC0xNzYsNiArMTc2LDY5IEBACiBUbyByZWxvYWQvcmVzdGFydCBhIHBsdWdpbiB0aGUgbGluazpjbWQtcGx1Z2luLXJlbG9hZC5odG1sW3BsdWdpbiByZWxvYWRdCiBjb21tYW5kIGNhbiBiZSB1c2VkLgogCitbW2luaXRfc3RlcF1dCitJbml0IHN0ZXAKK35+fn5+fn5+fgorCitQbHVnaW5zIGNhbiBjb250cmlidXRlIHRoZWlyIG93biAiaW5pdCBzdGVwIiBkdXJpbmcgdGhlIEdlcnJpdCBpbml0Cit3aXphcmQuIFRoaXMgaXMgdXNlZnVsIGZvciBndWlkaW5nIHRoZSBHZXJyaXQgYWRtaW5pc3RyYXRvciB0aHJvdWdoCit0aGUgc2V0dGluZ3MgbmVlZGVkIGJ5IHRoZSBwbHVnaW4gdG8gd29yayBwcm9wZXJ0bHkuCisKK0ZvciBpbnN0YW5jZSBwbHVnaW5zIHRvIGludGVncmF0ZSBKaXJhIGlzc3VlcyB0byBHZXJyaXQgY2hhbmdlcyBtYXkKK2NvbnRyaWJ1dGUgdGhlaXIgb3duICJpbml0IHN0ZXAiIHRvIGFsbG93IGNvbmZpZ3VyaW5nIHRoZSBKaXJhIFVSTCwKK2NyZWRlbnRpYWxzIGFuZCBwb3NzaWJseSB2ZXJpZnkgY29ubmVjdGl2aXR5IHRvIHZhbGlkYXRlIHRoZW0uCisKKz09PT0KKyAgR2Vycml0LUluaXRTdGVwOiB0bGQuZXhhbXBsZS5wcm9qZWN0Lk15SW5pdFN0ZXAKKz09PT0KKworTXlJbml0U3RlcCBuZWVkcyB0byBmb2xsb3cgdGhlIHN0YW5kYXJkIEdlcnJpdCBJbml0U3RlcCBzeW50YXgKK2FuZCBiZWhhdmlvdXI6IHdyaXRpbmcgdG8gdGhlIGNvbnNvbGUgdXNpbmcgdGhlIGluamVjdGVkIENvbnNvbGVVSQorYW5kIGFjY2Vzc2luZyAvIGNoYW5naW5nIGNvbmZpZ3VyYXRpb24gc2V0dGluZ3MgdXNpbmcgU2VjdGlvbi5GYWN0b3J5LgorCitJbiBhZGRpdGlvbiB0byB0aGUgc3RhbmRhcmQgR2Vycml0IGluaXQgaW5qZWN0aW9ucywgcGx1Z2lucyByZWNlaXZlCit0aGUgQFBsdWdpbk5hbWUgU3RyaW5nIGluamVjdGlvbiBjb250YWluaW5nIHRoZWlyIG93biBwbHVnaW4gbmFtZS4KKworQmVhciBpbiBtaW5kIHRoYXQgdGhlIFBsdWdpbidzIEluaXRTdGVwIGNsYXNzIHdpbGwgYmUgbG9hZGVkIGJ1dAordGhlIHN0YW5kYXJkIEdlcnJpdCBydW50aW1lIGVudmlyb25tZW50IGlzIG5vdCBhdmFpbGFibGUgYW5kIHRoZSBwbHVnaW4ncworb3duIEd1aWNlIG1vZHVsZXMgd2VyZSBub3QgaW5pdGlhbGl6ZWQuCitUaGlzIG1lYW5zIHRoZSBJbml0U3RlcCBmb3IgYSBwbHVnaW4gaXMgbm90IGV4ZWN1dGVkIGluIHRoZSBzYW1lIHdheSB0aGF0Cit0aGUgcGx1Z2luIGV4ZWN1dGVzIHdpdGhpbiB0aGUgc2VydmVyLCBhbmQgbWF5IG1lYW4gYSBwbHVnaW4gYXV0aG9yIGNhbm5vdAordHJpdmlhbGx5IHJldXNlIHJ1bnRpbWUgY29kZSBkdXJpbmcgaW5pdC4KKworRm9yIGluc3RhbmNlIGEgcGx1Z2luIHRoYXQgd2FudHMgdG8gdmVyaWZ5IGNvbm5lY3Rpdml0eSBtYXkgbmVlZCB0byBzdGF0aWNhbGx5CitjYWxsIHRoZSBjb25zdHJ1Y3RvciBvZiB0aGVpciBjb25uZWN0aW9uIGNsYXNzLCBwYXNzaW5nIGluIHZhbHVlcyBvYnRhaW5lZAorZnJvbSB0aGUgU2VjdGlvbi5GYWN0b3J5IHJhdGhlciB0aGFuIGZyb20gYW4gaW5qZWN0ZWQgQ29uZmlnIG9iamVjdC4KKworUGx1Z2lucyBJbml0U3RlcCBhcmUgZXhlY3V0aW5nIGR1cmluZyB0aGUgIkdlcnJpdCBQbHVnaW4gaW5pdCIgcGhhc2UsIGFmdGVyCit0aGUgZXh0cmFjdGlvbiBvZiB0aGUgcGx1Z2lucyBlbWJlZGRlZCBpbiBHZXJyaXQud2FyIGludG8gJEdFUlJJVF9TSVRFL3BsdWdpbnMKK2FuZCBiZWZvcmUgdGhlIERCIFNjaGVtYSBpbml0aWFsaXphdGlvbiBvciB1cGdyYWRlLgorUGx1Z2lucyBJbml0U3RlcCBjYW5ub3QgcmVmZXIgdG8gR2Vycml0IERCIFNjaGVtYSBvciBhbnkgb3RoZXIgR2Vycml0IHJ1bnRpbWUKK29iamVjdHMgaW5qZWN0ZWQgYXQgc3RhcnR1cC4KKworPT09PQorcHVibGljIGNsYXNzIE15SW5pdFN0ZXAgaW1wbGVtZW50cyBJbml0U3RlcCB7CisgIHByaXZhdGUgZmluYWwgQ29uc29sZVVJIHVpOworICBwcml2YXRlIGZpbmFsIFNlY3Rpb24uRmFjdG9yeSBzZWN0aW9uczsKKyAgcHJpdmF0ZSBmaW5hbCBTdHJpbmcgcGx1Z2luTmFtZTsKKworICBASW5qZWN0CisgIHB1YmxpYyBHaXRCbGl0SW5pdFN0ZXAoZmluYWwgQ29uc29sZVVJIHVpLCBTZWN0aW9uLkZhY3Rvcnkgc2VjdGlvbnMsIEBQbHVnaW5OYW1lIFN0cmluZyBwbHVnaW5OYW1lKSB7CisgICAgdGhpcy51aSA9IHVpOworICAgIHRoaXMuc2VjdGlvbnMgPSBzZWN0aW9uczsKKyAgICB0aGlzLnBsdWdpbk5hbWUgPSBwbHVnaW5OYW1lOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyB2b2lkIHJ1bigpIHRocm93cyBFeGNlcHRpb24geworICAgIHVpLmhlYWRlcigiXG5NeSBwbHVnaW4iKTsKKworICAgIFNlY3Rpb24gbXlTZWN0aW9uID0gZ2V0U2VjdGlvbigibXlwbHVnaW4iLCBudWxsKTsKKyAgICBteVNlY3Rpb24uc3RyaW5nKCJMaW5rIG5hbWUiLCAibGlua25hbWUiLCAiTXlMaW5rIik7CisgIH0KK30KKz09PT0KKwogW1tjbGFzc3BhdGhdXQogQ2xhc3NwYXRoCiAtLS0tLS0tLS0KZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24vZGV2LXJlbGVhc2UtZGVwbG95LWNvbmZpZy50eHQgYi9Eb2N1bWVudGF0aW9uL2Rldi1yZWxlYXNlLWRlcGxveS1jb25maWcudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmJjNTJkNTAKLS0tIC9kZXYvbnVsbAorKysgYi9Eb2N1bWVudGF0aW9uL2Rldi1yZWxlYXNlLWRlcGxveS1jb25maWcudHh0CkBAIC0wLDAgKzEsMTM1IEBACitEZXBsb3kgR2Vycml0IEFydGlmYWN0cworPT09PT09PT09PT09PT09PT09PT09PT0KKworR2Vycml0IEFydGlmYWN0cyBhcmUgc3RvcmVkIG9uCitsaW5rOmh0dHBzOi8vZGV2ZWxvcGVycy5nb29nbGUuY29tL3N0b3JhZ2UvW0dvb2dsZSBDbG91ZCBTdG9yYWdlXS4KK1ZpYSB0aGUgbGluazpodHRwczovL2NvZGUuZ29vZ2xlLmNvbS9hcGlzL2NvbnNvbGUvW0FQSSBDb25zb2xlXSB0aGUKK0dlcnJpdCBtYWludGFpbmVycyBoYXZlIGFjY2VzcyB0byB0aGUgYEdlcnJpdCBDb2RlIFJldmlld2AgcHJvamVjdC4KK1RoaXMgcHJvamVjdHMgaG9zdCBzZXZlcmFsIGJ1Y2tldHMgZm9yIHN0b3JpbmcgR2Vycml0IGFydGlmYWN0czoKKworKiBgZ2Vycml0LWFwaWA6CisrCitCdWNrZXQgdG8gc3RvcmUgdGhlIEdlcnJpdCBFeHRlbnNpb24gQVBJIEphciBhbmQgdGhlIEdlcnJpdCBQbHVnaW4gQVBJCitKYXIuCisKKyogYGdlcnJpdC1tYXZlbmA6CisrCitCdWNrZXQgdG8gc3RvcmUgR2Vycml0IFN1YnByb2plY3QgQXJ0aWZhY3RzIChlLmcuIGBnd3RleHB1aWAsCitgZ3d0anNvbnJwY2AgZXRjLikuCisKKyogYGdlcnJpdC1wbHVnaW5zYDoKKysKK0J1Y2tldCB0byBzdG9yZSBHZXJyaXQgQ29yZSBQbHVnaW4gQXJ0aWZhY3RzLgorCitbW2RlcGxveS1jb25maWd1cmF0aW9uLXNldHRpbmdzLXhtbF1dCitEZXBsb3kgQ29uZmlndXJhdGlvbiBpbiBNYXZlbiBgc2V0dGluZ3MueG1sYAorLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KKworVG8gdXBsb2FkIGFydGlmYWN0cyB0byBhIGJ1Y2tldCB0aGUgdXNlciBtdXN0IGF1dGhlbnRpY2F0ZSB3aXRoIGEKK3VzZXJuYW1lIGFuZCBwYXNzd29yZC4gVGhlIHVzZXJuYW1lIGFuZCBwYXNzd29yZCBuZWVkIHRvIGJlIHJldHJpZXZlZAorZnJvbSB0aGUgbGluazpodHRwczovL2NvZGUuZ29vZ2xlLmNvbS9hcGlzL2NvbnNvbGUvW0FQSSBDb25zb2xlXToKKworKiBHbyB0byB0aGUgYEdlcnJpdCBDb2RlIFJldmlld2AgcHJvamVjdAorKiBJbiB0aGUgbWVudSBvbiB0aGUgbGVmdCBzZWxlY3QgYEdvb2dsZSBDbG91ZCBTdG9yYWdlYCA+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+IGBHZXJyaXQtQXBpVmVyc2lvbmAgdG8gdGhlIHZlcnNpb24gb2YgdGhlIG5ldyBHZXJyaXQKLXJlbGVhc2UKLSogRmlyc3QgYnVpbGQgYW5kIGRlcGxveSB0aGUgbGF0ZXN0IHNuYXBzaG90IGFuZCBlbnN1cmUgdGhhdCBHZXJyaXQKLWJ1aWxkcy9ydW5zIHdpdGggdGhpcyBzbmFwc2hvdAotCi0qIERlcGxveSB0aGUgc25hcHNob3Q6Ci0KKyogRGVwbG95IHRoZSBuZXcgc25hcHNob3Q6CisrCiA9PT09CiAgIG12biBkZXBsb3kKID09PT0KIAorKiBDaGFuZ2UgdGhlIHZlcnNpb24gaW4gdGhlIEdlcnJpdCBwYXJlbnQgYHBvbS54bWxgIGZvciB0aGUgU3VicHJvamVjdAordG8gdGhlIGBTTkFQU0hPVGAgdmVyc2lvbgorKworV2hlbiBHZXJyaXQgZ2V0cyByZWxlYXNlZCwgYSByZWxlYXNlIG9mIHRoZSBTdWJwcm9qZWN0IGhhcyB0byBiZSBkb25lCithbmQgR2Vycml0IGhhcyB0byByZWZlcmVuY2UgdGhlIHJlbGVhc2VkIFN1YnByb2plY3QgdmVyc2lvbi4KIAotTWFraW5nIGEgUmVsZWFzZQotLS0tLS0tLS0tLS0tLS0tLQogCi0qIEZpcnN0IGRlcGxveSAoYW5kIHRlc3QpIHRoZSBsYXRlc3Qgc25hcHNob3QgZm9yIHRoZSBzdWJwcm9qZWN0L3BsdWdpbgorW1twcmVwYXJlLXJlbGVhc2VdXQorUHJlcGFyZSB0aGUgUmVsZWFzZQorLS0tLS0tLS0tLS0tLS0tLS0tLQorCisqIGxpbms6I21ha2Utc25hcHNob3RbRmlyc3QgY3JlYXRlIChhbmQgdGVzdCkgdGhlIGxhdGVzdCBzbmFwc2hvdCBmb3IKK3RoZSBzdWJwcm9qZWN0L3BsdWdpbl0KIAogKiBVcGRhdGUgdGhlIHRvcCBsZXZlbCBgcG9tLnhtbGAgaW4gdGhlIHN1YnByb2plY3QvcGx1Z2luIHRvIHJlZmxlY3QKIHRoZSBuZXcgcHJvamVjdCB2ZXJzaW9uICh0aGUgZXhhY3QgdmFsdWUgb2YgdGhlIHRhZyB5b3Ugd2lsbCBjcmVhdGUKIGJlbG93KQogCi0qIENvbW1pdCB0aGUgcG9tIGNoYW5nZSBhbmQgcHVzaCB0byB0aGUgcHJvamVjdCdzIHJlcG8KLWByZWZzL2Zvci88bWFzdGVyL3N0YWJsZT5gCi0KLSogVGFnIHRoZSB2ZXJzaW9uIHlvdSBqdXN0IHB1c2hlZCAoYW5kIHB1c2ggdGhlIHRhZykKLQorKiBDcmVhdGUgdGhlIFJlbGVhc2UgVGFnCisrCiA9PT09CiAgZ2l0IHRhZyAtYSAtbSAicHJvbG9nLWNhZmUgMS4zIiB2MS4zCi0gZ2l0IHB1c2ggZ2Vycml0LXJldmlldyByZWZzL3RhZ3MvdjEuMzpyZWZzL3RhZ3MvdjEuMwogPT09PQogCisqIEJ1aWxkIGFuZCBpbnN0YWxsIGludG8gbG9jYWwgTWF2ZW4gcmVwb3NpdG9yeToKKysKKz09PT0KKyAgbXZuIGNsZWFuIGluc3RhbGwKKz09PT0KKworCitbW3B1Ymxpc2gtcmVsZWFzZV1dCitQdWJsaXNoIHRoZSBSZWxlYXNlCistLS0tLS0tLS0tLS0tLS0tLS0tCisKKyogTWFrZSBzdXJlIHlvdSBoYXZlIGRvbmUgdGhlIGNvbmZpZ3VyYXRpb24gbmVlZGVkIGZvciBkZXBsb3ltZW50OgorKiogbGluazpkZXYtcmVsZWFzZS1kZXBsb3ktY29uZmlnLmh0bWwjZGVwbG95LWNvbmZpZ3VyYXRpb24tc2V0dGluZ3MteG1sWworQ29uZmlndXJhdGlvbiBpbiBNYXZlbiBgc2V0dGluZ3MueG1sYF0KKyoqIENvbmZpZ3VyYXRpb24gaW4gYHBvbS54bWxgIGZvcgorbGluazpkZXYtcmVsZWFzZS1kZXBsb3ktY29uZmlnLmh0bWwjZGVwbG95LWNvbmZpZ3VyYXRpb24tc3VicHJvamVjdHNbU3VicHJvamVjdHNdIG9yCitsaW5rOmRldi1yZWxlYXNlLWRlcGxveS1jb25maWcuaHRtbCNkZXBsb3ktY29uZmlndXJhdGlvbi1jb3JlLXBsdWdpbnNbQ29yZSBQbHVnaW5zXQorCiAqIERlcGxveSB0aGUgbmV3IHJlbGVhc2U6Ci0KKysKID09PT0KLSBtdm4gZGVwbG95CisgIG12biBkZXBsb3kKKz09PT0KKworKiBQdXNoIHRoZSBwb20gY2hhbmdlKHMpIHRvIHRoZSBwcm9qZWN0J3MgcmVwb3NpdG9yeQorYHJlZnMvZm9yLzxtYXN0ZXJ8c3RhYmxlPmAKKworKiBQdXNoIHRoZSBSZWxlYXNlIFRhZworKworPT09PQorICBnaXQgcHVzaCBnZXJyaXQtcmV2aWV3IHJlZnMvdGFncy92MS4zOnJlZnMvdGFncy92MS4zCiA9PT09CiAKIApkaWZmIC0tZ2l0IGEvRG9jdW1lbnRhdGlvbi9kZXYtcmVsZWFzZS50eHQgYi9Eb2N1bWVudGF0aW9uL2Rldi1yZWxlYXNlLnR4dAppbmRleCA1ZWEzMDQyLi43YTk2M2ZjIDEwMDY0NAotLS0gYS9Eb2N1bWVudGF0aW9uL2Rldi1yZWxlYXNlLnR4dAorKysgYi9Eb2N1bWVudGF0aW9uL2Rldi1yZWxlYXNlLnR4dApAQCAtMTEsNyArMTEsNyBAQAogCiBUbyBtYWtlIGEgR2Vycml0IHJlbGVhc2UgaW52b2x2ZXMgYSBncmVhdCBkZWFsIG9mIGNvbXBsZXgKIHRhc2tzIGFuZCBpdCBpcyBlYXN5IHRvIG1pc3MgYSBzdGVwIHNvIHRoaXMgZG9jdW1lbnQgc2hvdWxkCi1ob3BlZnVseSBzZXJ2ZSBhcyBib3RoIGEgaG93IHRvIGZvciB0aG9zZSBuZXcgdG8gdGhlIHByb2Nlc3MKK2hvcGVmdWxseSBzZXJ2ZSBhcyBib3RoIGEgaG93IHRvIGZvciB0aG9zZSBuZXcgdG8gdGhlIHByb2Nlc3MKIGFuZCBhcyBhIGNoZWNrbGlzdCBmb3IgdGhvc2UgYWxyZWFkeSBmYW1pbGlhciB3aXRoIHRoZXNlCiB0YXNrcy4KIApAQCAtMjAsMTA2ICsyMCwxODEgQEAKIC0tLS0tLS0tLS0tLS0tLS0tLS0KIAogSGVyZSBhcmUgc29tZSBndWlkZWxpbmVzIG9uIHJlbGVhc2UgYXBwcm9hY2hlcyBkZXBlbmRpbmcgb24gdGhlCi10eXBlIG9mIHJlbGVhc2UgeW91IHdhbnQgdG8gbWFrZSAoc3RhYmxlLWZpeCwgc3RhYmxlLCBSQzAsIFJDMS4uLikuCit0eXBlIG9mIHJlbGVhc2UgeW91IHdhbnQgdG8gbWFrZSAoYHN0YWJsZS1maXhgLCBgc3RhYmxlYCwgYFJDMGAsCitgUkMxYC4uLikuCiAKIFN0YWJsZQogfn5+fn5+CiAKLUEgc3RhYmxlIHJlbGVhc2UgaXMgZ2VuZXJhbGx5IGJ1aWx0IGZyb20gdGhlIG1hc3RlciBicmFuY2ggYW5kIG1heSBuZWVkIHRvCi11bmRlcmdvIHNvbWUgc3RhYmlsaXphdGlvbiBiZWZvcmUgcmVsZWFzaW5nIHRoZSBmaW5hbCByZWxlYXNlLgorQSBgc3RhYmxlYCByZWxlYXNlIGlzIGdlbmVyYWxseSBidWlsdCBmcm9tIHRoZSBgbWFzdGVyYCBicmFuY2ggYW5kIG1heQorbmVlZCB0byB1bmRlcmdvIHNvbWUgc3RhYmlsaXphdGlvbiBiZWZvcmUgcmVsZWFzaW5nIHRoZSBmaW5hbCByZWxlYXNlLgogCiAqIFByb3Bvc2UgdGhlIHJlbGVhc2Ugd2l0aCBhbnkgcGxhbnMvb2JqZWN0aXZlcyB0byB0aGUgbWFpbGluZyBsaXN0CiAKLSogQ3JlYXRlIGEgR2Vycml0IFJDMAorKiBDcmVhdGUgYSBHZXJyaXQgYFJDMGAKIAotKiBJZiBuZWVkZWQgY3JlYXRlIGEgR2Vycml0IFJDMQorKiBJZiBuZWVkZWQgY3JlYXRlIGEgR2Vycml0IGBSQzFgCiAKIFtOT1RFXQogPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09CiBZb3UgbWF5IGxldCBpbiBhIGZldyBmZWF0dXJlcyB0byB0aGlzIHJlbGVhc2UKID09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQogCi0qIElmIG5lZWRlZCBjcmVhdGUgYSBHZXJyaXQgUkMyCisqIElmIG5lZWRlZCBjcmVhdGUgYSBHZXJyaXQgYFJDMmAKIAogW05PVEVdCiA9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KIFRoZXJlIHNob3VsZCBiZSBubyBuZXcgZmVhdHVyZXMgaW4gdGhpcyByZWxlYXNlLCBvbmx5IGJ1ZyBmaXhlcwogPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09CiAKLSogRmluYWxseSBjcmVhdGUgdGhlIHN0YWJsZSByZWxlYXNlIChubyBSQykKKyogRmluYWxseSBjcmVhdGUgdGhlIGBzdGFibGVgIHJlbGVhc2UgKG5vIGBSQ2ApCiAKIAogU3RhYmxlLUZpeAogfn5+fn5+fn5+fgogCi1TdGFibGUtZml4IHJlbGVhc2VzIHNob3VsZCBsaWtlbHkgb25seSBjb250YWluIGJ1ZyBmaXhlcyBhbmQgZG9jIHVwZGF0ZXMuCitgc3RhYmxlLWZpeGAgcmVsZWFzZXMgc2hvdWxkIGxpa2VseSBvbmx5IGNvbnRhaW4gYnVnIGZpeGVzIGFuZCBkb2MKK3VwZGF0ZXMuCiAKLSogUHJvcG9zZSB0aGUgcmVsZWFzZSB3aXRoIGFueSBwbGFucy9vYmplY3RpdmVzIHRvIHRoZSBtYWlsaW5nIGxpc3QKLQotKiBUaGlzIHR5cGUgb2YgcmVsZWFzZSBkb2VzIG5vdCBuZWVkIGFueSBSQ3MsIHJlbGVhc2Ugd2hlbiB0aGUgb2JqZWN0aXZlcwotICBhcmUgbWV0Ci0KKyogVGhpcyB0eXBlIG9mIHJlbGVhc2UgZG9lcyBub3QgbmVlZCBhbnkgUkNzLCByZWxlYXNlIHdoZW4gdGhlCitvYmplY3RpdmVzIGFyZSBtZXQKIAogCiBDcmVhdGUgdGhlIEFjdHVhbCBSZWxlYXNlCiAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIAotSW4gdGhlIGV4YW1wbGUgY29tbWFuZHMgYmVsb3cgd2UgYXNzdW1lIHRoYXQgdGhlIGxhc3QgcmVsZWFzZSB3YXMgJzIuNCcgYW5kIHRoYXQKLXdlIGFyZSBwcmVwYXJpbmcgJzIuNScgcmVsZWFzZS4KK1RvIGNyZWF0ZSBhIEdlcnJpdCByZWxlYXNlIHRoZSBmb2xsb3dpbmcgc3RlcHMgaGF2ZSB0byBiZSBkb25lOgogCi1QcmVwYXJlIHRoZSBTdWJwcm9qZWN0cwotfn5+fn5+fn5+fn5+fn5+fn5+fn5+fn4KLQotKiBQdWJsaXNoIHRoZSBsYXRlc3Qgc25hcHNob3QgZm9yIGFsbCBzdWJwcm9qZWN0cwotKiBGcmVlemUgYWxsIHN1YnByb2plY3RzIGFuZCBsaW5rOmRldi1yZWxlYXNlLXN1YnByb2plY3QuaHRtbFtwdWJsaXNoXQotICB0aGVtIQorLiBsaW5rOiNzdWJwcm9qZWN0W1JlbGVhc2UgU3VicHJvamVjdHNdCisuIGxpbms6I3ByZXBhcmUtZ2Vycml0W1ByZXBhcmUgdGhlIEdlcnJpdCBSZWxlYXNlXQorLi4gbGluazojcHJlcGFyZS13YXItYW5kLXBsdWdpbi1hcGlbUHJlcGFyZSB0aGUgR2Vycml0IFdBUiBhbmQgdGhlIFBsdWdpbiBBUEkgSmFyXQorLi4gbGluazojcHJlcGFyZS1jb3JlLXBsdWdpbnNbUHJlcGFyZSB0aGUgQ29yZSBQbHVnaW5zXQorLi4gbGluazojcHJlcGFyZS13YXItd2l0aC1wbHVnaW5zW1ByZXBhcmUgR2Vycml0IFdBUiB3aXRoIENvcmUgUGx1Z2luc10KKy4gbGluazojcHVibGlzaC1nZXJyaXRbUHVibGlzaCB0aGUgR2Vycml0IFJlbGVhc2VdCisuLiBsaW5rOiNleHRlbnNpb24tYW5kLXBsdWdpbi1hcGlbUHVibGlzaCB0aGUgRXh0ZW5zaW9uIGFuZCBQbHVnaW4gQVBJIEphcnNdCisuLiBsaW5rOiNwdWJsaXNoLWNvcmUtcGx1Z2luc1tQdWJsaXNoIHRoZSBDb3JlIFBsdWdpbnNdCisuLiBsaW5rOiNwdWJsaXNoLWdlcnJpdC13YXJbUHVibGlzaCB0aGUgR2Vycml0IFdBUiAod2l0aCBDb3JlIFBsdWdpbnMpXQorLi4gbGluazojcHVzaC1zdGFibGVbUHVzaCB0aGUgU3RhYmxlIEJyYW5jaF0KKy4uIGxpbms6I3B1c2gtdGFnW1B1c2ggdGhlIFJlbGVhc2UgVGFnXQorLi4gbGluazojdXBsb2FkLWRvY3VtZW50YXRpb25bVXBsb2FkIHRoZSBEb2N1bWVudGF0aW9uXQorLi4gbGluazojdXBkYXRlLWlzc3Vlc1tVcGRhdGUgdGhlIElzc3Vlc10KKy4uIGxpbms6I2Fubm91bmNlW0Fubm91bmNlIG9uIE1haWxpbmcgTGlzdF0KKy4gbGluazojaW5jcmVhc2UtdmVyc2lvbltJbmNyZWFzZSBHZXJyaXQgVmVyc2lvbiBmb3IgQ3VycmVudCBEZXZlbG9wbWVudF0KKy4gbGluazojbWVyZ2Utc3RhYmxlW01lcmdlIGBzdGFibGVgIGludG8gYG1hc3RlcmBdCiAKIAorW1tzdWJwcm9qZWN0XV0KK1JlbGVhc2UgU3VicHJvamVjdHMKK35+fn5+fn5+fn5+fn5+fn5+fn4KKworVGhlIHN1YnByb2plY3RzIHRvIGJlIHJlbGVhc2VkIGFyZToKKworKiBgZ3d0ZXhwdWlgCisqIGBnd3Rqc29ucnBjYAorKiBgZ3d0b3JtYAorKiBgcHJvbG9nLWNhZmVgCisKK0ZvciBlYWNoIHN1YnByb2plY3QgZG86CisKKyogQ2hlY2sgdGhlIGRlcGVuZGVuY3kgdG8gdGhlIFN1YnByb2plY3QgaW4gdGhlIEdlcnJpdCBwYXJlbnQgYHBvbS54bWxgOgorKworSWYgYSBgU05BUFNIT1RgIHZlcnNpb24gb2YgdGhlIHN1YnByb2plY3QgaXMgcmVmZXJlbmNlZCB0aGUgc3VicHJvamVjdAorbmVlZHMgdG8gYmUgcmVsZWFzZWQgc28gdGhhdCBHZXJyaXQgY2FuIHJlZmVyZW5jZSBhIHJlbGVhc2VkIHZlcnNpb24gb2YKK3RoZSBzdWJwcm9qZWN0LgorCisqIGxpbms6ZGV2LXJlbGVhc2Utc3VicHJvamVjdC5odG1sI21ha2Utc25hcHNob3RbTWFrZSBhIHNuYXBzaG90IGFuZCB0ZXN0IGl0XQorKiBsaW5rOmRldi1yZWxlYXNlLXN1YnByb2plY3QuaHRtbCNwcmVwYXJlLXJlbGVhc2VbUHJlcGFyZSB0aGUgUmVsZWFzZV0KKyogbGluazpkZXYtcmVsZWFzZS1zdWJwcm9qZWN0Lmh0bWwjcHVibGlzaC1yZWxlYXNlW1B1Ymxpc2ggdGhlIFJlbGVhc2VdCisKKyogVXBkYXRlIHRoZSB2ZXJzaW9uIG9mIHRoZSBTdWJwcm9qZWN0IGluIHRoZSBHZXJyaXQgcGFyZW50IGBwb20ueG1sYAordG8gdGhlIHJlbGVhc2VkIHZlcnNpb24KKworCitbW3ByZXBhcmUtZ2Vycml0XV0KIFByZXBhcmUgR2Vycml0CiB+fn5+fn5+fn5+fn5+fgogCi0qIENyZWF0ZSBhIGBzdGFibGUtMi41YCBicmFuY2ggZm9yIG1ha2luZyB0aGUgbmV3IHJlbGVhc2UKK0luIGFsbCBleGFtcGxlIGNvbW1hbmRzIGl0IGlzIGFzc3VtZWQgdGhhdCB0aGUgbGFzdCByZWxlYXNlIHdhcyBgMi40YAorYW5kIHRoYXQgbm93IHRoZSBgMi41YCByZWxlYXNlIGlzIHByZXBhcmVkLgogCi0qIEluIHRoZSBgbWFzdGVyYCBicmFuY2g6IFVwZGF0ZSB0aGUgcG9tcyBmb3IgdGhlIEdlcnJpdCB2ZXJzaW9uLCBwdXNoIGZvcgotcmV2aWV3LCBnZXQgbWVyZ2VkCiAKLT09PT0KLSB0b29scy92ZXJzaW9uLnNoIC0tc25hcHNob3Q9Mi41Ci09PT09CitbW3ByZXBhcmUtd2FyLWFuZC1wbHVnaW4tYXBpXV0KK1ByZXBhcmUgdGhlIEdlcnJpdCBXQVIgYW5kIHRoZSBQbHVnaW4gQVBJIEphcgorXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eCiAKLSogQ2hlY2tvdXQgdGhlIGBzdGFibGUtMi41YCBicmFuY2gKLSogVXBkYXRlIHRoZSB0b3AgbGV2ZWwgYHBvbS54bWxgIGluIEdlcnJpdCB0byBlbnN1cmUgdGhhdCBub25lIG9mIHRoZQotU3VicHJvamVjdHMgcG9pbnQgdG8gc25hcHNob3QgcmVsZWFzZXMKKyogQ3JlYXRlIGxvY2FsbHkgYSBgc3RhYmxlLTIuNWAgYnJhbmNoIGZvciBtYWtpbmcgdGhlIG5ldyByZWxlYXNlCiAKLSogVGFnCisqIENoZWNrIGluIHRoZSBHZXJyaXQgcGFyZW50IGBwb20ueG1sYCB0aGF0IG5vIGBTTkFQU0hPVGAgdmVyc2lvbiBvZiBhCitTdWJwcm9qZWN0IGlzIHJlZmVyZW5jZWQKKysKK0lmIHRoZXJlIGlzIGEgZGVwZW5kZW5jeSB0byBhIGBTTkFQU0hPVGAgdmVyc2lvbiwKK2xpbms6I3N1YnByb2plY3RbcmVsZWFzZSB0aGUgc3VicHJvamVjdF0gZmlyc3QuCiAKKyogQ3JlYXRlIGEgdGFnIGZvciB0aGUgR2Vycml0IHJlbGVhc2UKKysKK0ZvciBhbiBgUkNgIHJlbGVhc2U6CisrCiA9PT09CiAgZ2l0IHRhZyAtYSAtbSAiZ2Vycml0IDIuNS1yYzAiIHYyLjUtcmMwCis9PT09CisrCitGb3IgYSBmaW5hbCBgc3RhYmxlYCByZWxlYXNlOgorKworPT09PQogIGdpdCB0YWcgLWEgLW0gImdlcnJpdCAyLjUiIHYyLjUKID09PT0KIAotKiBCdWlsZCAod2l0aG91dCBwbHVnaW5zKQotCisqIEJ1aWxkIHRoZSBHZXJyaXQgV0FSICh3aXRob3V0IHBsdWdpbnMpIGFuZCB0aGUgUGx1Z2luIEFQSSBKYXIKKysKID09PT0KICAuL3Rvb2xzL3JlbGVhc2Uuc2gKID09PT0KKysKK1tXQVJOSU5HXQorPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09CitNYWtlIHN1cmUgeW91IGFyZSBjb21waWxpbmcgdGhlIHJlbGVhc2UgZm9yIGFsbCBicm93c2Vycy4gQ2hlY2sgaW4geW91cgorTWF2ZW4gYH4vLm0yL3NldHRpbmdzLnhtbGAgZmlsZSB0aGF0IG5vIE1hdmVuIHByb2ZpbGUgaXMgYWN0aXZlIHRoYXQKK2xpbWl0cyB0aGUgY29tcGlsYXRpb24gdG8gYSBjZXJ0YWluIGJyb3dzZXIuCis9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KIAotW1twbHVnaW4tYXBpXV0KLVB1Ymxpc2ggdGhlIFBsdWdpbiBBUEkgSkFSIEZpbGUKLX5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn4KKyogU2FuaXR5IGNoZWNrIFdBUgogCi0qIFB1c2ggSkFSIHRvIGBjb21tb25kYXRhc3RvcmFnZS5nb29nbGVhcGlzLmNvbWAKLSoqIFJ1biBgdG9vbHMvZGVwbG95X2FwaS5zaGAKIAotUHJlcGFyZSB0aGUgQ29yZSBQbHVnaW5zCi1+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn4KLSogbGluazpkZXYtcmVsZWFzZS1zdWJwcm9qZWN0Lmh0bWxbUmVsZWFzZSBhbmQgcHVibGlzaF0gdGhlIGNvcmUgcGx1Z2lucworW1twcmVwYXJlLWNvcmUtcGx1Z2luc11dCitQcmVwYXJlIENvcmUgUGx1Z2lucworXl5eXl5eXl5eXl5eXl5eXl5eXl4KK1RoZSBjb3JlIHBsdWdpbnMgdG8gYmUgcHJlcGFyZWQgYXJlOgogCi1QYWNrYWdlIEdlcnJpdCB3aXRoIFBsdWdpbnMKLX5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fgotKiBFbnN1cmUgdGhhdCB0aGUgY29yZSBwbHVnaW5zIGxpc3RlZCBpbiBgZ2Vycml0LXBhY2thZ2UtcGx1Z2lucy9wb20ueG1sYAotcG9pbnQgdG8gdGhlIGxhdGVzdCByZWxlYXNlIHZlcnNpb24gKG5vIGRlcGVuZGVuY3kgdG8gc25hcHNob3QgdmVyc2lvbnMpCisqIGBwbHVnaW5zL3JlcGxpY2F0aW9uYAorCitGb3IgZWFjaCBjb3JlIHBsdWdpbiBkbzoKKworKiBsaW5rOmRldi1yZWxlYXNlLXN1YnByb2plY3QuaHRtbCNtYWtlLXNuYXBzaG90W01ha2UgYSBzbmFwc2hvdCBhbmQgdGVzdCBpdF0KKyogbGluazpkZXYtcmVsZWFzZS1zdWJwcm9qZWN0Lmh0bWwjcHJlcGFyZS1yZWxlYXNlW1ByZXBhcmUgdGhlIFJlbGVhc2VdCisKKyogVXBkYXRlIHRoZSB2ZXJzaW9uIG9mIHRoZSBDb3JlIFBsdWdpbiBpbgorYGdlcnJpdC1wYWNrYWdlLXBsdWdpbnMvcG9tLnhtbGAgdG8gdGhlIHJlbGVhc2VkIHZlcnNpb24KKworW1dBUk5JTkddCis9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KK1VwZGF0aW5nIHRoZSBwbHVnaW4gdmVyc2lvbnMgaW4gYGdlcnJpdC1wYWNrYWdlLXBsdWdpbnMvcG9tLnhtbGAKK2ludmFsaWRhdGVzIHRoZSBHZXJyaXQgUmVsZWFzZSBUYWcgd2hpY2ggd2FzIGNyZWF0ZWQgYmVmb3JlLgorCitJZiBuZWVkZWQgZGVsZXRlIHRoZSB0YWcgYW5kIHJlY3JlYXRlIGl0IQorPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09CisKKworW1twcmVwYXJlLXdhci13aXRoLXBsdWdpbnNdXQorUHJlcGFyZSBHZXJyaXQgV0FSIHdpdGggQ29yZSBQbHVnaW5zCiteXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl4KKworKiBFbnN1cmUgdGhhdCB0aGUgQ29yZSBQbHVnaW5zIGxpc3RlZCBpbiBgZ2Vycml0LXBhY2thZ2UtcGx1Z2lucy9wb20ueG1sYAorcG9pbnQgdG8gdGhlIGxhdGVzdCByZWxlYXNlIHZlcnNpb24gKG5vIGRlcGVuZGVuY3kgdG8gYFNOQVBTSE9UYCB2ZXJzaW9ucykKKworKiBFbnN1cmUgdGhhdCB0aGUgcmVsZWFzZSB0YWcgcG9pbnRzIHRvIHRoZSBgSEVBRGAgY29tbWl0CisKICogSW5jbHVkZSBjb3JlIHBsdWdpbnMgaW50byBXQVIKKysKID09PT0KICAkIC4vdG9vbHMvdmVyc2lvbi5zaCAtLXJlbGVhc2UgJiYgbXZuIGNsZWFuIHBhY2thZ2UgLWYgZ2Vycml0LXBhY2thZ2UtcGx1Z2lucy9wb20ueG1sCiAgJCAuL3Rvb2xzL3ZlcnNpb24uc2ggLS1yZXNldApAQCAtMTI3LDM1ICsyMDIsOTEgQEAKIAogKiBGaW5kIFdBUiB0aGF0IGluY2x1ZGVzIHRoZSBjb3JlIHBsdWdpbnMgYXQKIGBnZXJyaXQtcGFja2FnZS1wbHVnaW5zXHRhcmdldFxnZXJyaXQtZnVsbC12Mi41LndhcmAKLSogU2FuaXR5IGNoZWNrIFdBUgogCi1QdWJsaXNoIHRvIHRoZSBQcm9qZWN0IExvY2F0aW9ucwotLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KKyogQ29tcGFyZSBgZ2Vycml0LXBhY2thZ2UtcGx1Z2luc1x0YXJnZXRcZ2Vycml0LWZ1bGwtdjIuNS53YXJgIHdpdGgKKyAgYGdlcnJpdC13YXJcdGFyZ2V0XGdlcnJpdC12Mi41LndhcmAKKysKK1RoZSBvbmx5IGRpZmZlcmVuY2Ugc2hvdWxkIGJlIHRoZSBjb3JlIHBsdWdpbnMgamFycyB1bmRlcgorYFdFQi1JTkZccGx1Z2luc2AuCiAKLVdBUiBGaWxlCi1+fn5+fn5+fgorKiBUZXN0IHRoZSBuZXcgR2Vycml0IHZlcnNpb24KIAotKiBVcGxvYWQgV0FSIHRvIGNvZGUuZ29vZ2xlLmNvbS9wL2dlcnJpdCAobWFudWFsIHdlYiBicm93c2VyKQorW1twdWJsaXNoLWdlcnJpdF1dCitQdWJsaXNoIHRoZSBHZXJyaXQgUmVsZWFzZQorfn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn4KKworCitbW2V4dGVuc2lvbi1hbmQtcGx1Z2luLWFwaV1dCitQdWJsaXNoIHRoZSBFeHRlbnNpb24gYW5kIFBsdWdpbiBBUEkgSmFycworXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl4KKworKiBNYWtlIHN1cmUgeW91IGhhdmUgZG9uZSB0aGUKK2xpbms6ZGV2LXJlbGVhc2UtZGVwbG95LWNvbmZpZy5odG1sI2RlcGxveS1jb25maWd1cmF0aW9uLXNldHRpbmdzLXhtbFsKK2NvbmZpZ3VyYXRpb24gbmVlZGVkIGZvciBkZXBsb3ltZW50XQorCisqIFB1c2ggdGhlIEphcnMgdG8gYGNvbW1vbmRhdGFzdG9yYWdlLmdvb2dsZWFwaXMuY29tYDoKKysKKy0tLS0KKyAgLi90b29scy9kZXBsb3lfYXBpLnNoCistLS0tCisKKworW1twdWJsaXNoLWNvcmUtcGx1Z2luc11dCitQdWJsaXNoIHRoZSBDb3JlIFBsdWdpbnMKK15eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXgorCisqIGxpbms6ZGV2LXJlbGVhc2Utc3VicHJvamVjdC5odG1sI3B1Ymxpc2gtcmVsZWFzZVtQdWJsaXNoIHRoZSBSZWxlYXNlXQorCisKK1tbcHVibGlzaC1nZXJyaXQtd2FyXV0KK1B1Ymxpc2ggdGhlIEdlcnJpdCBXQVIgKHdpdGggQ29yZSBQbHVnaW5zKQorXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eCisKKyogVGhlIFdBUiBmaWxlIHRvIHVwbG9hZCBpcyBgZ2Vycml0LXBhY2thZ2UtcGx1Z2luc1x0YXJnZXRcZ2Vycml0LWZ1bGwtdjIuNS53YXJgCisqIFVwbG9hZCBXQVIgdG8gYGNvZGUuZ29vZ2xlLmNvbS9wL2dlcnJpdGAgKG1hbnVhbCB2aWEgd2ViIGJyb3dzZXIpCiAqKiBHbyB0byBodHRwOi8vY29kZS5nb29nbGUuY29tL3AvZ2Vycml0L2Rvd25sb2Fkcy9saXN0Ci0qKiBVc2UgdGhlICJOZXcgRG93bmxvYWQiIGJ1dHRvbgorKiogVXNlIHRoZSBgTmV3IERvd25sb2FkYCBidXR0b24KIAogKiBVcGRhdGUgbGFiZWxzOgotKiogbmV3IHdhcjogW3JlbGVhc2UtY2FuZGlkYXRlXSwgZmVhdHVyZWQuLi4KLSoqIG9sZCB3YXI6IGRlcHJlY2F0ZWQKKyoqIG5ldyB3YXI6IFtgcmVsZWFzZS1jYW5kaWRhdGVgXSwgYGZlYXR1cmVkYC4uLgorKiogb2xkIHdhcjogYGRlcHJlY2F0ZWRgCiAKLVRhZwotfn5+CiAKLSogUHVzaCB0aGUgTmV3IFRhZworW1twdXNoLXN0YWJsZV1dCitQdXNoIHRoZSBTdGFibGUgQnJhbmNoCiteXl5eXl5eXl5eXl5eXl5eXl5eXl5eCiAKKyogY3JlYXRlIHRoZSBzdGFibGUgYnJhbmNoIGBzdGFibGUtMi41YCBpbiB0aGUgYGdlcnJpdGAgcHJvamVjdAorKworVmlhIHRoZSBsaW5rOmh0dHBzOi8vZ2Vycml0LXJldmlldy5nb29nbGVzb3VyY2UuY29tLyMvYWRtaW4vcHJvamVjdHMvZ2Vycml0LGJyYW5jaGVzWworR2Vycml0IFdlYlVJXSBvciBieSBwdXNoLgorCisqIFB1c2ggdGhlIGNvbW1pdHMgZG9uZSBvbiBgc3RhYmxlLTIuNWAgdG8gYHJlZnMvZm9yL3N0YWJsZS0yLjVgIGFuZAorZ2V0IHRoZW0gbWVyZ2VkCisKKworW1twdXNoLXRhZ11dCitQdXNoIHRoZSBSZWxlYXNlIFRhZworXl5eXl5eXl5eXl5eXl5eXl5eXl4KKworKiBQdXNoIHRoZSBuZXcgUmVsZWFzZSBUYWcKKysKK0ZvciBhbiBgUkNgOgorKwogPT09PQogIGdpdCBwdXNoIGdlcnJpdC1yZXZpZXcgcmVmcy90YWdzL3YyLjUtcmMwOnJlZnMvdGFncy92Mi41LXJjMAorPT09PQorKworRm9yIGEgZmluYWwgYHN0YWJsZWAgcmVsZWFzZToKKysKKz09PT0KICBnaXQgcHVzaCBnZXJyaXQtcmV2aWV3IHJlZnMvdGFncy92Mi41OnJlZnMvdGFncy92Mi41CiA9PT09CiAKIAotRG9jcwotfn5+fgorW1t1cGxvYWQtZG9jdW1lbnRhdGlvbl1dCitVcGxvYWQgdGhlIERvY3VtZW50YXRpb24KK15eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXgogCiA9PT09CiAgbWFrZSAtQyBEb2N1bWVudGF0aW9uIFBSSU9SPTIuNCB1cGRhdGUKQEAgLTE2NywxNCArMjk4LDE0IEBACiAqIFVwZGF0ZSBHb29nbGUgQ29kZSBwcm9qZWN0IGxpbmtzCiAqKiBHbyB0byBodHRwOi8vY29kZS5nb29nbGUuY29tL3AvZ2Vycml0L2FkbWluCiAqKiBQb2ludCB0aGUgbWFpbiBwYWdlIHRvIHRoZSBuZXcgZG9jcy4gVGhlIGxpbmsgdG8gdGhlIGRvY3VtZW50YXRpb24gaGFzIHRvIGJlCi11cGRhdGVkIGF0IHR3byBwbGFjZXM6IGluIHRoZSBwcm9qZWN0IGRlc2NyaXB0aW9uIGFuZCBhbHNvIGluIHRoZSBMaW5rcwordXBkYXRlZCBhdCB0d28gcGxhY2VzOiBpbiB0aGUgcHJvamVjdCBkZXNjcmlwdGlvbiBhbmQgYWxzbyBpbiB0aGUgYExpbmtzYAogc2VjdGlvbi4KICoqIFBvaW50IHRoZSBtYWluIHBhZ2UgdG8gdGhlIG5ldyByZWxlYXNlIG5vdGVzCiAKIFtOT1RFXQogPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci1UaGUgZG9jcyBtYWtlZmlsZSBkb2VzIGFuIHN2biBjcCBvZiB0aGUgcHJpb3IgcmV2aXNpb24gb2YgdGhlIGRvY3MgdG8gYnJhbmNoCi10aGUgZG9jcyBzbyB5b3UgaGF2ZSBsZXNzIHRvIHVwbG9hZCBvbiB0aGUgbmV3IGRvY3MuCitUaGUgZG9jcyBtYWtlZmlsZSBkb2VzIGFuIGBzdm4gY3BgIG9mIHRoZSBwcmlvciByZXZpc2lvbiBvZiB0aGUgZG9jcyB0bworYnJhbmNoIHRoZSBkb2NzIHNvIHlvdSBoYXZlIGxlc3MgdG8gdXBsb2FkIG9uIHRoZSBuZXcgZG9jcy4KIAogVXNlciBhbmQgcGFzc3dvcmQgZnJvbSBoZXJlOgogCkBAIC0xODgsMzAgKzMxOSwzMyBAQAogPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09CiAKIAotSXNzdWVzCi1+fn5+fn4KK1tbdXBkYXRlLWlzc3Vlc11dCitVcGRhdGUgdGhlIElzc3VlcworXl5eXl5eXl5eXl5eXl5eXl4KIAogPT09PQogIEhvdyBkbyB0aGUgaXNzdWVzIGdldCB1cGRhdGVkPyAgRG8geW91IHJ1biBhIHNjcmlwdCB0byBkbwotIHRoaXM/ICBXaGVuIGRvIHlvdSBkbyBpdCwgYWZ0ZXIgdGhlIGZpbmFsIDIuMi4yIGlzIHJlbGVhc2VkPworIHRoaXM/ICBXaGVuIGRvIHlvdSBkbyBpdCwgYWZ0ZXIgdGhlIGZpbmFsIDIuNSBpcyByZWxlYXNlZD8KID09PT0KIAogQnkgaGFuZC4KIAotT3VyIGN1cnJlbnQgcHJvY2VzcyBpcyBhbiBpc3N1ZSBzaG91bGQgYmUgdXBkYXRlZCB0byBzYXkgU3RhdHVzID0KLVN1Ym1pdHRlZCwgRml4ZWRJbi0yLjIuMiBvbmNlIHRoZSBjaGFuZ2UgaXMgc3VibWl0dGVkLCBidXQgYmVmb3JlIHRoZQorT3VyIGN1cnJlbnQgcHJvY2VzcyBpcyBhbiBpc3N1ZSBzaG91bGQgYmUgdXBkYXRlZCB0byBzYXkgYFN0YXR1cyA9CitTdWJtaXR0ZWQsIEZpeGVkSW4tMi41YCBvbmNlIHRoZSBjaGFuZ2UgaXMgc3VibWl0dGVkLCBidXQgYmVmb3JlIHRoZQogcmVsZWFzZS4KIAogQWZ0ZXIgdGhlIHJlbGVhc2UgaXMgYWN0dWFsbHkgbWFkZSwgeW91IGNhbiBzZWFyY2ggaW4gR29vZ2xlIENvZGUgZm9yCi1gYFN0YXR1cz1TdWJtaXR0ZWQgRml4ZWRJbj0yLjIuMicnIGFuZCB0aGVuIGJhdGNoIHVwZGF0ZSB0aGVzZSBjaGFuZ2VzCi10byBzYXkgU3RhdHVzPVJlbGVhc2VkLiBNYWtlIHN1cmUgdGhlIHB1bGxkb3duIHNheXMgYGBBbGwgSXNzdWVzJycKLWJlY2F1c2UgU3RhdHVzPVN1Ym1pdHRlZCBpcyBjb25zaWRlcmVkIGEgY2xvc2VkIGlzc3VlLgorYGBTdGF0dXM9U3VibWl0dGVkIEZpeGVkSW49Mi41JycgYW5kIHRoZW4gYmF0Y2ggdXBkYXRlIHRoZXNlIGNoYW5nZXMKK3RvIHNheSBgU3RhdHVzPVJlbGVhc2VkYC4gTWFrZSBzdXJlIHRoZSBwdWxsZG93biBzYXlzIGBgQWxsIElzc3VlcycnCitiZWNhdXNlIGBTdGF0dXM9U3VibWl0dGVkYCBpcyBjb25zaWRlcmVkIGEgY2xvc2VkIGlzc3VlLgogCiAKLU1haWxpbmcgTGlzdAotfn5+fn5+fn5+fn5+CitbW2Fubm91bmNlXV0KK0Fubm91bmNlIG9uIE1haWxpbmcgTGlzdAorXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eCiAKLSogU2VuZCBhbiBlbWFpbCB0byB0aGUgbWFpbGluZyBsaXN0IHRvIGFubm91bmNlIHRoZSByZWxlYXNlLCBjb25zaWRlciBpbmNsdWRpbmcgc29tZSBvciBhbGwgb2YgdGhlIGZvbGxvd2luZyBpbiB0aGUgZW1haWw6CisqIFNlbmQgYW4gZW1haWwgdG8gdGhlIG1haWxpbmcgbGlzdCB0byBhbm5vdW5jZSB0aGUgcmVsZWFzZSwgY29uc2lkZXIKK2luY2x1ZGluZyBzb21lIG9yIGFsbCBvZiB0aGUgZm9sbG93aW5nIGluIHRoZSBlbWFpbDoKICoqIEEgbGluayB0byB0aGUgcmVsZWFzZSBhbmQgdGhlIHJlbGVhc2Ugbm90ZXMgKGlmIGEgZmluYWwgcmVsZWFzZSkKICoqIEEgbGluayB0byB0aGUgZG9jcwogKiogRGVzY3JpYmUgdGhlIHR5cGUgb2YgcmVsZWFzZSAoc3RhYmxlLCBidWcgZml4LCBSQykKQEAgLTI0MSw3ICszNzUsNyBAQAogLU1hcnRpbgogLS0tLQogCi0qIEFkZCBhbiBlbnRyeSB0byB0aGUgTkVXUyBzZWN0aW9uIG9mIHRoZSBtYWluIEdlcnJpdCBwcm9qZWN0IHdlYiBwYWdlCisqIEFkZCBhbiBlbnRyeSB0byB0aGUgYE5FV1NgIHNlY3Rpb24gb2YgdGhlIG1haW4gR2Vycml0IHByb2plY3Qgd2ViIHBhZ2UKICoqIEdvIHRvOiBodHRwOi8vY29kZS5nb29nbGUuY29tL3AvZ2Vycml0L2FkbWluCiAqKiBBZGQgZW50cnkgbGlrZToKIC0tLS0KQEAgLTI1MiwxOCArMzg2LDMzIEBACiAqKiBHbyB0bzogaHR0cDovL2dyb3Vwcy5nb29nbGUuY29tL2dyb3VwL3JlcG8tZGlzY3Vzcy90b3BpY3MKICoqIENsaWNrIG9uIHRoZSBhbm5vdW5jZW1lbnQgdGhyZWFkCiAqKiBOZWFyIHRoZSB0b3AgcmlnaHQsIGNsaWNrIG9uIG9wdGlvbnMKLSoqIFVuZGVyIG9wdGlvbnMsIGNpY2sgdGhlICJEaXNwbGF5IHRoaXMgdG9wIGZpcnN0IiBjaGVja2JveAorKiogVW5kZXIgb3B0aW9ucywgY2xpY2sgdGhlICJEaXNwbGF5IHRoaXMgdG9wIGZpcnN0IiBjaGVja2JveAogKiogYW5kIFNhdmUKIAogKiBVcGRhdGUgdGhlIHByZXZpb3VzIGRpc2N1c3Npb24gZ3JvdXAgYW5ub3VuY2VtZW50IHRvIG5vIGxvbmdlciBiZSBzdGlja3kKICoqIFNlZSBhYm92ZSAodW5jbGljayBjaGVja2JveCkKIAogCi1NZXJnaW5nIFN0YWJsZSBGaXhlcyB0byBtYXN0ZXIKLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQorW1tpbmNyZWFzZS12ZXJzaW9uXV0KK0luY3JlYXNlIEdlcnJpdCBWZXJzaW9uIGZvciBDdXJyZW50IERldmVsb3BtZW50Cit+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fgogCi1BZnRlciBldmVyeSBzdGFibGUtZml4IHJlbGVhc2UsIHN0YWJsZSBzaG91bGQgYmUgbWVyZ2VkIHRvIG1hc3RlciB0bwotZW5zdXJlIHRoYXQgbm9uZSBvZiB0aGUgZml4ZXMgZXZlciBnZXQgbG9zdC4KK0FsbCBuZXcgZGV2ZWxvcG1lbnQgdGhhdCBpcyBkb25lIGluIHRoZSBgbWFzdGVyYCBicmFuY2ggd2lsbCBiZQoraW5jbHVkZWQgaW4gdGhlIG5leHQgR2Vycml0IHJlbGVhc2UuIFVwZGF0ZSB0aGUgR2Vycml0IHZlcnNpb24gaW4gZWFjaAorYHBvbS54bWxgIGZpbGUgdG8gdGhlIG5leHQgYFNOQVBTSE9UYHZlcnNpb24uIFB1c2ggdGhlIGNoYW5nZSBmb3IKK3JldmlldyBhbmQgZ2V0IGl0IG1lcmdlZC4KKworPT09PQorIHRvb2xzL3ZlcnNpb24uc2ggLS1zbmFwc2hvdD0yLjYKKz09PT0KKworCitbW21lcmdlLXN0YWJsZV1dCitNZXJnZSBgc3RhYmxlYCBpbnRvIGBtYXN0ZXJgCit+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+CisKK0FmdGVyIGV2ZXJ5IHJlbGVhc2UsIHN0YWJsZSBzaG91bGQgYmUgbWVyZ2VkIHRvIG1hc3RlciB0byBlbnN1cmUgdGhhdAorbm9uZSBvZiB0aGUgY2hhbmdlcy9maXhlcyBldmVyIGdldCBsb3N0LgogCiA9PT09CiAgZ2l0IGNvbmZpZyBtZXJnZS5zdW1tYXJ5IHRydWUKZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24vaW50cm8tcXVpY2sudHh0IGIvRG9jdW1lbnRhdGlvbi9pbnRyby1xdWljay50eHQKaW5kZXggMjVmNWQ1ZS4uODI1M2M5MSAxMDA2NDQKLS0tIGEvRG9jdW1lbnRhdGlvbi9pbnRyby1xdWljay50eHQKKysrIGIvRG9jdW1lbnRhdGlvbi9pbnRyby1xdWljay50eHQKQEAgLTEzOCwxMCArMTM4LDEwIEBACiBDb21wcmVzc2luZyBvYmplY3RzOiAxMDAlICgyLzIpLCBkb25lLgogV3JpdGluZyBvYmplY3RzOiAxMDAlICgzLzMpLCA1NDIgYnl0ZXMsIGRvbmUuCiBUb3RhbCAzIChkZWx0YSAwKSwgcmV1c2VkIDAgKGRlbHRhIDApCi1yZW1vdGU6IAorcmVtb3RlOgogcmVtb3RlOiBOZXcgQ2hhbmdlczoKIHJlbW90ZTogICBodHRwOi8vZ2Vycml0aG9zdDo4MDgwLzY4Ci1yZW1vdGU6IAorcmVtb3RlOgogVG8gc3NoOi8vZ2Vycml0aG9zdDoyOTQxOC9SZWNpcGVCb29rLmdpdAogICogW25ldyBicmFuY2hdICAgICAgSEVBRCAtPiByZWZzL2Zvci9tYXN0ZXIKIC0tLS0KZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24vanNvbi50eHQgYi9Eb2N1bWVudGF0aW9uL2pzb24udHh0CmluZGV4IGYwNTg4Y2UuLmI0NjAyYTkgMTAwNjQ0Ci0tLSBhL0RvY3VtZW50YXRpb24vanNvbi50eHQKKysrIGIvRG9jdW1lbnRhdGlvbi9qc29uLnR4dApAQCAtMzAsNiArMzAsOSBAQAogCiBjb21taXRNZXNzYWdlOjogVGhlIGZ1bGwgY29tbWl0IG1lc3NhZ2UgZm9yIHRoZSBjaGFuZ2UuCiAKK2NyZWF0ZWRPbjo6IFRpbWUgaW4gc2Vjb25kcyBzaW5jZSB0aGUgVU5JWCBlcG9jaCB3aGVuIHRoaXMgY2hhbmdlCit3YXMgY3JlYXRlZC4KKwogbGFzdFVwZGF0ZWQ6OiBUaW1lIGluIHNlY29uZHMgc2luY2UgdGhlIFVOSVggZXBvY2ggd2hlbiB0aGlzIGNoYW5nZQogd2FzIGxhc3QgdXBkYXRlZC4KIApAQCAtNDgsMTQgKzUxLDIzIEBACiAKICAgQUJBTkRPTkVEOzsgQ2hhbmdlIHdhcyBhYmFuZG9uZWQgYnkgaXRzIG93bmVyIG9yIGFkbWluaXN0cmF0b3IuCiAKK2NvbW1lbnRzOjogQWxsIGNvbW1lbnRzIGZvciB0aGlzIGNoYW5nZSBpbiA8PG1lc3NhZ2UsbWVzc2FnZSBhdHRyaWJ1dGVzPj4uCisKIHRyYWNraW5nSWRzOjogSXNzdWUgdHJhY2tpbmcgc3lzdGVtIGxpbmtzIGluCi08PHRyYWNraW5naWQsdHJhY2tpbmdpZCBhdHRyaWJ1dGU+Piwgc2NyYXBlZCBvdXQgb2YgdGhlIGNvbW1pdAorPDx0cmFja2luZ2lkLHRyYWNraW5naWQgYXR0cmlidXRlcz4+LCBzY3JhcGVkIG91dCBvZiB0aGUgY29tbWl0CiBtZXNzYWdlIGJhc2VkIG9uIHRoZSBzZXJ2ZXIncwogbGluazpjb25maWctZ2Vycml0Lmh0bWwjdHJhY2tpbmdpZFt0cmFja2luZ2lkXSBzZWN0aW9ucy4KIAogY3VycmVudFBhdGNoU2V0OjogQ3VycmVudCA8PHBhdGNoU2V0LHBhdGNoU2V0IGF0dHJpYnV0ZT4+LgogCi1wYXRjaFNldHM6OiBBbGwgPDxwYXRjaFNldCxwYXRjaFNldCBhdHRyaWJ1dGU+PiBmb3IgdGhpcyBjaGFuZ2UuCitwYXRjaFNldHM6OiBBbGwgPDxwYXRjaFNldCxwYXRjaFNldCBhdHRyaWJ1dGVzPj4gZm9yIHRoaXMgY2hhbmdlLgorCitkZXBlbmRzT246OiBMaXN0IG9mIGNoYW5nZXMgdGhhdCB0aGlzIGNoYW5nZSBkZXBlbmRzIG9uIGluIDw8ZGVwZW5kZW5jeSxkZXBlbmRlbmN5IGF0dHJpYnV0ZXM+Pi4KKworbmVlZGVkQnk6OiBMaXN0IG9mIGNoYW5nZXMgdGhhdCBkZXBlbmQgb24gdGhpcyBjaGFuZ2UgaW4gPDxkZXBlbmRlbmN5LGRlcGVuZGVuY3kgYXR0cmlidXRlcz4+LgorCitzdWJtaXRSZWNvcmRzOjogVGhlIDw8c3VibWl0UmVjb3JkLHN1Ym1pdFJlY29yZCBhdHRyaWJ1dGU+PiBjb250YWlucworaW5mb3JtYXRpb24gYWJvdXQgd2hldGhlciB0aGlzIGNoYW5nZSBoYXMgYmVlbiBvciBjYW4gYmUgc3VibWl0dGVkLgogCiBzdWJtaXRSZWNvcmRzOjogVGhlIDw8c3VibWl0UmVjb3JkLHN1Ym1pdFJlY29yZCBhdHRyaWJ1dGU+PiBjb250YWlucwogaW5mb3JtYXRpb24gYWJvdXQgd2hldGhlciB0aGlzIGNoYW5nZSBoYXMgYmVlbiBvciBjYW4gYmUgc3VibWl0dGVkLgpAQCAtOTAsMTQgKzEwMiwyOSBAQAogCiByZXZpc2lvbjo6IEdpdCBjb21taXQgZm9yIHRoaXMgcGF0Y2hzZXQuCiAKK3BhcmVudHM6OiBMaXN0IG9mIHBhcmVudCByZXZpc2lvbnMuCisKIHJlZjo6IEdpdCByZWZlcmVuY2UgcG9pbnRpbmcgYXQgdGhlIHJldmlzaW9uLiAgVGhpcyByZWZlcmVuY2UgaXMKIGF2YWlsYWJsZSB0aHJvdWdoIHRoZSBHZXJyaXQgQ29kZSBSZXZpZXcgc2VydmVyJ3MgR2l0IGludGVyZmFjZQogZm9yIHRoZSBjb250YWluaW5nIGNoYW5nZS4KIAogdXBsb2FkZXI6OiBVcGxvYWRlciBvZiB0aGUgcGF0Y2ggc2V0IGluIDw8YWNjb3VudCxhY2NvdW50IGF0dHJpYnV0ZT4+LgogCithdXRob3I6OiBBdXRob3Igb2YgdGhpcyBwYXRjaHNldCBpbiA8PGFjY291bnQsYWNjb3VudCBhdHRyaWJ1dGU+Pi4KKworY3JlYXRlZE9uOjogVGltZSBpbiBzZWNvbmRzIHNpbmNlIHRoZSBVTklYIGVwb2NoIHdoZW4gdGhpcyBwYXRjaHNldAord2FzIGNyZWF0ZWQuCisKIGFwcHJvdmFsczo6IFRoZSA8PGFwcHJvdmFsLGFwcHJvdmFsIGF0dHJpYnV0ZT4+IGdyYW50ZWQuCiAKK2NvbW1lbnRzOjogQWxsIGlubGluZSBjb21tZW50cyBmb3IgdGhpcyBwYXRjaHNldCBpbiA8PHBhdGNoc2V0Y29tbWVudCxwYXRjaHNldENvbW1lbnQgYXR0cmlidXRlcz4+LgorCitmaWxlczo6IEFsbCBjaGFuZ2VkIGZpbGVzIGluIHRoaXMgcGF0Y2hzZXQgaW4gPDxwYXRjaCxwYXRjaCBhdHRyaWJ1dGVzPj4uCisKK3NpemVJbnNlcnRpb25zOjogU2l6ZSBpbmZvcm1hdGlvbiBvZiBpbnNlcnRpb25zIG9mIHRoaXMgcGF0Y2hzZXQuCisKK3NpemVEZWxldGlvbnM6OiBTaXplIGluZm9ybWF0aW9uIG9mIGRlbGV0aW9ucyBvZiB0aGlzIHBhdGNoc2V0LgorCiBbW2FwcHJvdmFsXV0KIGFwcHJvdmFsCiAtLS0tLS0tLQpAQCAtMTIzLDEwICsxNTAsMTAgQEAKIAogbmV3UmV2OjogVGhlIG5ldyB2YWx1ZSB0aGUgcmVmIHdhcyB1cGRhdGVkIHRvLgogCi1wcm9qZWN0OjogUHJvamVjdCBwYXRoIGluIEdlcnJpdC4KLQogcmVmTmFtZTo6IFJlZiBuYW1lIHdpdGhpbiBwcm9qZWN0LgogCitwcm9qZWN0OjogUHJvamVjdCBwYXRoIGluIEdlcnJpdC4KKwogW1txdWVyeUxpbWl0XV0KIHF1ZXJ5TGltaXQKIC0tLS0tLS0tLS0KQEAgLTE3OCw2ICsyMDUsNzEgQEAKIAogYnk6OiBUaGUgPDxhY2NvdW50LGFjY291bnQ+PiB0aGF0IGFwcGxpZWQgdGhlIGxhYmVsLgogCitbW2RlcGVuZGVuY3ldXQorZGVwZW5kZW5jeQorLS0tLS0tLS0tLQorSW5mb3JtYXRpb24gYWJvdXQgYSBjaGFuZ2Ugb3IgcGF0Y2hzZXQgZGVwZW5kZW5jeS4KKworaWQ6OiBDaGFuZ2UgaWRlbnRpZmllci4KKworbnVtYmVyOjogQ2hhbmdlIG51bWJlci4KKworcmV2aXNpb246OiBQYXRjaHNldCByZXZpc2lvbi4KKworcmVmOjogUmVmIG5hbWUuCisKK2lzQ3VycmVudFBhdGNoU2V0OjogSWYgdGhlIHJldmlzaW9uIGlzIHRoZSBjdXJyZW50IHBhdGNoc2V0IG9mIHRoZSBjaGFuZ2UuCisKK1tbbWVzc2FnZV1dCittZXNzYWdlCistLS0tLS0tCitDb21tZW50IGFkZGVkIG9uIGEgY2hhbmdlIGJ5IGEgcmV2aWV3ZXIuCisKK3RpbWVzdGFtcDo6IFRpbWUgaW4gc2Vjb25kcyBzaW5jZSB0aGUgVU5JWCBlcG9jaCB3aGVuIHRoaXMgY29tbWVudAord2FzIGFkZGVkLgorCityZXZpZXdlcjo6IFRoZSA8PGFjY291bnQsYWNjb3VudD4+IHRoYXQgYWRkZWQgdGhlIGNvbW1lbnQuCisKK21lc3NhZ2U6OiBUaGUgY29tbWVudCB0ZXh0LgorCitbW3BhdGNoc2V0Y29tbWVudF1dCitwYXRjaHNldENvbW1lbnQKKy0tLS0tLS0tLS0tLS0tLQorQ29tbWVudCBhZGRlZCBpbmxpbmUgb24gYSBwYXRjaHNldCBieSBhIHJldmlld2VyLgorCitmaWxlOjogVGhlIG5hbWUgb2YgdGhlIGZpbGUgb24gd2hpY2ggdGhlIGNvbW1lbnQgd2FzIGFkZGVkLgorCitsaW5lOjogVGhlIGxpbmUgbnVtYmVyIGF0IHdoaWNoIHRoZSBjb21tZW50IHdhcyBhZGRlZC4KKworcmV2aWV3ZXI6OiBUaGUgPDxhY2NvdW50LGFjY291bnQ+PiB0aGF0IGFkZGVkIHRoZSBjb21tZW50LgorCittZXNzYWdlOjogVGhlIGNvbW1lbnQgdGV4dC4KKworW1twYXRjaF1dCitwYXRjaAorLS0tLS0KK0luZm9ybWF0aW9uIGFib3V0IGEgcGF0Y2ggb24gYSBmaWxlLgorCitmaWxlOjogVGhlIG5hbWUgb2YgdGhlIGZpbGUuCisKK3R5cGU6OiBUaGUgdHlwZSBvZiBjaGFuZ2UuCisKKyAgQURERUQ7OyBUaGUgZmlsZSBpcyBiZWluZyBjcmVhdGVkL2ludHJvZHVjZWQgYnkgdGhpcyBwYXRjaC4KKworICBNT0RJRklFRDs7IFRoZSBmaWxlIGFscmVhZHkgZXhpc3RzLCBhbmQgaGFzIHVwZGF0ZWQgY29udGVudC4KKworICBERUxFVEVEOzsgVGhlIGZpbGUgZXhpc3RlZCwgYnV0IGlzIGJlaW5nIHJlbW92ZWQgYnkgdGhpcyBwYXRjaC4KKworICBSRU5BTUVEOzsgVGhlIGZpbGUgaXMgcmVuYW1lZC4KKworICBDT1BJRUQ7OyBUaGUgZmlsZSBpcyBjb3BpZWQgZnJvbSBhbm90aGVyIGZpbGUuCisKKyAgUkVXUklURTs7IFN1ZmZpY2llbnQgYW1vdW50IG9mIGNvbnRlbnQgY2hhbmdlZCB0byBjbGFpbSB0aGUgZmlsZSB3YXMgcmV3cml0dGVuLgorCitpbnNlcnRpb25zOjogbnVtYmVyIG9mIGluc2VydGlvbnMgb2YgdGhpcyBwYXRjaC4KKworZGVsZXRpb25zOjogIG51bWJlciBvZiBkZWxldGlvbnMgb2YgdGhpcyBwYXRjaC4KKwogU0VFIEFMU08KIC0tLS0tLS0tCiAKZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24vbGljZW5zZXMudHh0IGIvRG9jdW1lbnRhdGlvbi9saWNlbnNlcy50eHQKaW5kZXggNzc4N2ZlOC4uNWQ2MmMxNiAxMDA2NDQKLS0tIGEvRG9jdW1lbnRhdGlvbi9saWNlbnNlcy50eHQKKysrIGIvRG9jdW1lbnRhdGlvbi9saWNlbnNlcy50eHQKQEAgLTY0MywxMCArNjQzLDEwIEBACiAgZGlzdHJpYnV0ZSwgIHN1YmxpY2Vuc2UsIGFuZC9vciBzZWxsICBjb3BpZXMgb2YgIHRoZSBTb2Z0d2FyZSwgIGFuZCB0bwogIHBlcm1pdCBwZXJzb25zIHRvIHdob20gdGhlIFNvZnR3YXJlICBpcyBmdXJuaXNoZWQgdG8gZG8gc28sIHN1YmplY3QgdG8KICB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnM6Ci0gCisKICBUaGUgIGFib3ZlICBjb3B5cmlnaHQgIG5vdGljZSAgYW5kICB0aGlzIHBlcm1pc3Npb24gIG5vdGljZSAgc2hhbGwgIGJlCiAgaW5jbHVkZWQgaW4gYWxsIGNvcGllcyBvciBzdWJzdGFudGlhbCBwb3J0aW9ucyBvZiB0aGUgU29mdHdhcmUuCi0gCisKICBUSEUgIFNPRlRXQVJFIElTICBQUk9WSURFRCAgIkFTICBJUyIsIFdJVEhPVVQgIFdBUlJBTlRZICBPRiBBTlkgIEtJTkQsCiAgRVhQUkVTUyBPUiAgSU1QTElFRCwgSU5DTFVESU5HICBCVVQgTk9UIExJTUlURUQgIFRPIFRIRSAgV0FSUkFOVElFUyBPRgogIE1FUkNIQU5UQUJJTElUWSwgICAgRklUTkVTUyAgICBGT1IgICAgQSAgIFBBUlRJQ1VMQVIgICAgUFVSUE9TRSAgICBBTkQKQEAgLTY2NCw5ICs2NjQsOSBAQAogCiAtLS0tCiAoVGhlIE1JVCBMaWNlbnNlKQotIAorCiBDb3B5cmlnaHQgKGMpIDIwMDggVG9tIFByZXN0b24tV2VybmVyCi0gCisKIFBlcm1pc3Npb24gaXMgaGVyZWJ5IGdyYW50ZWQsIGZyZWUgb2YgY2hhcmdlLCB0byBhbnkgcGVyc29uIG9idGFpbmluZwogYSBjb3B5IG9mIHRoaXMgc29mdHdhcmUgYW5kIGFzc29jaWF0ZWQgZG9jdW1lbnRhdGlvbiBmaWxlcyAodGhlCiAnU29mdHdhcmUnKSwgdG8gZGVhbCBpbiB0aGUgU29mdHdhcmUgd2l0aG91dCByZXN0cmljdGlvbiwgaW5jbHVkaW5nCmRpZmYgLS1naXQgYS9Eb2N1bWVudGF0aW9uL3BnbS1nc3FsLnR4dCBiL0RvY3VtZW50YXRpb24vcGdtLWdzcWwudHh0CmluZGV4IGMzYTQ5MmEuLjM3ZmJiNzQgMTAwNjQ0Ci0tLSBhL0RvY3VtZW50YXRpb24vcGdtLWdzcWwudHh0CisrKyBiL0RvY3VtZW50YXRpb24vcGdtLWdzcWwudHh0CkBAIC00NSw3ICs0NSw3IEBACiAKIAlUeXBlICdcaCcgZm9yIGhlbHAuICBUeXBlICdccicgdG8gY2xlYXIgdGhlIGJ1ZmZlci4KIAotCWdlcnJpdD4gdXBkYXRlIGFjY291bnRzIHNldCBzc2hfdXNlcl9uYW1lID0gJ2FsaWNlJyB3aGVyZSBhY2NvdW50X2lkPTE7ICAgICAgIAorCWdlcnJpdD4gdXBkYXRlIGFjY291bnRzIHNldCBzc2hfdXNlcl9uYW1lID0gJ2FsaWNlJyB3aGVyZSBhY2NvdW50X2lkPTE7CiAJVVBEQVRFIDE7IDEgbXMKIAlnZXJyaXQ+IFxxCiAJQnllCmRpZmYgLS1naXQgYS9Eb2N1bWVudGF0aW9uL3Byb2plY3Qtc2V0dXAudHh0IGIvRG9jdW1lbnRhdGlvbi9wcm9qZWN0LXNldHVwLnR4dAppbmRleCAzZDk3OWQzLi5mZWI0MDgxIDEwMDY0NAotLS0gYS9Eb2N1bWVudGF0aW9uL3Byb2plY3Qtc2V0dXAudHh0CisrKyBiL0RvY3VtZW50YXRpb24vcHJvamVjdC1zZXR1cC50eHQKQEAgLTk5LDYgKzk5LDEzIEBACiB0aGUgcmlnaHQgb3JkZXIgc2luY2UgaW50ZXItY2hhbmdlIGRlcGVuZGVuY2llcyB3aWxsIG5vdCBiZQogZW5mb3JjZWQgZm9yIHRoZW0uCiAKKyogUmViYXNlIElmIE5lY2Vzc2FyeQorKworSWYgdGhlIGNoYW5nZSBiZWluZyBzdWJtaXR0ZWQgaXMgYSBzdHJpY3Qgc3VwZXJzZXQgb2YgdGhlIGRlc3RpbmF0aW9uCiticmFuY2gsIHRoZW4gdGhlIGJyYW5jaCBpcyBmYXN0LWZvcndhcmRlZCB0byB0aGUgY2hhbmdlLiAgSWYgbm90LAordGhlbiB0aGUgY2hhbmdlIGlzIGF1dG9tYXRpY2FsbHkgcmViYXNlZCBhbmQgdGhlbiB0aGUgYnJhbmNoIGlzCitmYXN0LWZvcndhcmRlZCB0byB0aGUgY2hhbmdlLgorCiBXaGVuIEdlcnJpdCB0cmllcyB0byBkbyBhIG1lcmdlLCBieSBkZWZhdWx0IHRoZSBtZXJnZSB3aWxsIG9ubHkKIHN1Y2NlZWQgaWYgdGhlcmUgaXMgbm8gcGF0aCBjb25mbGljdC4gQnkgc2VsZWN0aW5nIHRoZSBjaGVja2JveAogYEF1dG9tYXRpY2FsbHkgcmVzb2x2ZSBjb25mbGljdHNgIEdlcnJpdCB3aWxsIHRyeSBkbyBhIGNvbnRlbnQgbWVyZ2UKZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24vcmVzdC1hcGkudHh0IGIvRG9jdW1lbnRhdGlvbi9yZXN0LWFwaS50eHQKaW5kZXggMmY5ZDAzZi4uNjVkOGNkNyAxMDA2NDQKLS0tIGEvRG9jdW1lbnRhdGlvbi9yZXN0LWFwaS50eHQKKysrIGIvRG9jdW1lbnRhdGlvbi9yZXN0LWFwaS50eHQKQEAgLTEzMyw3ICsxMzMsNyBAQAogICBIVFRQLzEuMSAyMDAgT0sKICAgQ29udGVudC1EaXNwb3NpdGlvbjogYXR0YWNobWVudAogICBDb250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL2pzb247Y2hhcnNldD1VVEYtOAotICAgCisKICAgKV19JwogICB7CiAgICAgImV4dGVybmFsL2Jpc29uIjogewpkaWZmIC0tZ2l0IGEvRG9jdW1lbnRhdGlvbi91c2VyLWNoYW5nZWlkLnR4dCBiL0RvY3VtZW50YXRpb24vdXNlci1jaGFuZ2VpZC50eHQKaW5kZXggYTMwMTVlMS4uNGU4NzI3MCAxMDA2NDQKLS0tIGEvRG9jdW1lbnRhdGlvbi91c2VyLWNoYW5nZWlkLnR4dAorKysgYi9Eb2N1bWVudGF0aW9uL3VzZXItY2hhbmdlaWQudHh0CkBAIC01NCw2ICs1NCwxMCBAQAogCiAgICQgY3VybCAtbyAuZ2l0L2hvb2tzL2NvbW1pdC1tc2cgaHR0cDovL3Jldmlldy5leGFtcGxlLmNvbS90b29scy9ob29rcy9jb21taXQtbXNnCiAKK1RoZW4gZW5zdXJlIHRoYXQgdGhlIGV4ZWN1dGUgYml0IGlzIHNldCBvbiB0aGUgaG9vayBzY3JpcHQ6CisKKyAgJCBjaG1vZCB1K3ggLmdpdC9ob29rcy9jb21taXQtbXNnCisKIEZvciBtb3JlIGRldGFpbHMsIHNlZSBsaW5rOmNtZC1ob29rLWNvbW1pdC1tc2cuaHRtbFtjb21taXQtbXNnXS4KIAogQ2hhbmdlIFVwbG9hZApkaWZmIC0tZ2l0IGEvRG9jdW1lbnRhdGlvbi91c2VyLXNlYXJjaC50eHQgYi9Eb2N1bWVudGF0aW9uL3VzZXItc2VhcmNoLnR4dAppbmRleCA4YTIzMWZlLi40MzhiNGU3IDEwMDY0NAotLS0gYS9Eb2N1bWVudGF0aW9uL3VzZXItc2VhcmNoLnR4dAorKysgYi9Eb2N1bWVudGF0aW9uL3VzZXItc2VhcmNoLnR4dApAQCAtMSw3ICsxLDcgQEAKIEdlcnJpdCBDb2RlIFJldmlldyAtIFNlYXJjaGluZyBDaGFuZ2VzCiA9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQogCi1EZWZhdWx0IFNlYXJjaGVzIAorRGVmYXVsdCBTZWFyY2hlcwogLS0tLS0tLS0tLS0tLS0tLQogCiBNb3N0IGJhc2ljIHNlYXJjaGVzIGNhbiBiZSB2aWV3ZWQgYnkgY2xpY2tpbmcgb24gYSBsaW5rIGFsb25nIHRoZSB0b3AKZGlmZiAtLWdpdCBhL1JlbGVhc2VOb3Rlcy9SZWxlYXNlTm90ZXMtMi4wLjIxLnR4dCBiL1JlbGVhc2VOb3Rlcy9SZWxlYXNlTm90ZXMtMi4wLjIxLnR4dAppbmRleCA3ZGQ5ZWY0Li40N2JhNjU0IDEwMDY0NAotLS0gYS9SZWxlYXNlTm90ZXMvUmVsZWFzZU5vdGVzLTIuMC4yMS50eHQKKysrIGIvUmVsZWFzZU5vdGVzL1JlbGVhc2VOb3Rlcy0yLjAuMjEudHh0CkBAIC0yMDEsNyArMjAxLDcgQEAKIEdlcnJpdCBubyBsb25nZXIgZm9yZ2VzIHRoZSBGcm9tIGhlYWRlciBpbiBub3RpZmljYXRpb24gZW1haWxzLgogVG8gZW5hYmxlIHRoZSBwcmlvciBmb3JnaW5nIGJlaGF2aW9yLCBzZXQgYHNlbmRlbWFpbC5mcm9tYAogdG8gYFVTRVJgIGluIGdlcnJpdC5jb25maWcuICBGb3IgbW9yZSBkZXRhaWxzIHNlZQotW2h0dHA6Ly9nZXJyaXQuZ29vZ2xlY29kZS5jb20vc3ZuL2RvY3VtZW50YXRpb24vMi4wL2NvbmZpZy1nZXJyaXQuaHRtbCNzZW5kZW1haWwuZnJvbSBzZW5kZW1haWwuZnJvbV0KK2xpbms6aHR0cDovL2dlcnJpdC5nb29nbGVjb2RlLmNvbS9zdm4vZG9jdW1lbnRhdGlvbi8yLjAvY29uZmlnLWdlcnJpdC5odG1sI3NlbmRlbWFpbC5mcm9tW3NlbmRlbWFpbC5mcm9tXQogCiBCdWcgRml4ZXMKIC0tLS0tLS0tLQpkaWZmIC0tZ2l0IGEvUmVsZWFzZU5vdGVzL1JlbGVhc2VOb3Rlcy0yLjAuMjQudHh0IGIvUmVsZWFzZU5vdGVzL1JlbGVhc2VOb3Rlcy0yLjAuMjQudHh0CmluZGV4IDk0ODFhM2EuLjdlMGE2MTcgMTAwNjQ0Ci0tLSBhL1JlbGVhc2VOb3Rlcy9SZWxlYXNlTm90ZXMtMi4wLjI0LnR4dAorKysgYi9SZWxlYXNlTm90ZXMvUmVsZWFzZU5vdGVzLTIuMC4yNC50eHQKQEAgLTY3LDcgKzY3LDcgQEAKICogaXNzdWUgMzAwICAgIFN1cHBvcnQgU01UUCBvdmVyIFNTTC9UTFMKICsKIEVuY3J5cHRlZCBTTVRQIGlzIG5vdyBzdXBwb3J0ZWQgbmF0aXZlbHkgd2l0aGluIEdlcnJpdCwgc2VlCi1baHR0cDovL2dlcnJpdC5nb29nbGVjb2RlLmNvbS9zdm4vZG9jdW1lbnRhdGlvbi8yLjAvY29uZmlnLWdlcnJpdC5odG1sI3NlbmRlbWFpbC5zbXRwRW5jcnlwdGlvbiBzZW5kZW1haWwuc210cEVuY3J5cHRpb25dCitsaW5rOmh0dHA6Ly9nZXJyaXQuZ29vZ2xlY29kZS5jb20vc3ZuL2RvY3VtZW50YXRpb24vMi4wL2NvbmZpZy1nZXJyaXQuaHRtbCNzZW5kZW1haWwuc210cEVuY3J5cHRpb25bc2VuZGVtYWlsLnNtdHBFbmNyeXB0aW9uXQogCiBCdWcgRml4ZXMKIC0tLS0tLS0tLQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWFudGxyL3BvbS54bWwgYi9nZXJyaXQtYW50bHIvcG9tLnhtbAppbmRleCAzNGNiNDZmLi4zMTRkOGQyIDEwMDY0NAotLS0gYS9nZXJyaXQtYW50bHIvcG9tLnhtbAorKysgYi9nZXJyaXQtYW50bHIvcG9tLnhtbApAQCAtMjIsNyArMjIsNyBAQAogICA8cGFyZW50PgogICAgIDxncm91cElkPmNvbS5nb29nbGUuZ2Vycml0PC9ncm91cElkPgogICAgIDxhcnRpZmFjdElkPmdlcnJpdC1wYXJlbnQ8L2FydGlmYWN0SWQ+Ci0gICAgPHZlcnNpb24+Mi41LVNOQVBTSE9UPC92ZXJzaW9uPgorICAgIDx2ZXJzaW9uPjIuNi1TTkFQU0hPVDwvdmVyc2lvbj4KICAgPC9wYXJlbnQ+CiAKICAgPGFydGlmYWN0SWQ+Z2Vycml0LWFudGxyPC9hcnRpZmFjdElkPgpkaWZmIC0tZ2l0IGEvZ2Vycml0LWNhY2hlLWgyL3BvbS54bWwgYi9nZXJyaXQtY2FjaGUtaDIvcG9tLnhtbAppbmRleCA0ZDQzMDNjLi4xYTI2YjIxIDEwMDY0NAotLS0gYS9nZXJyaXQtY2FjaGUtaDIvcG9tLnhtbAorKysgYi9nZXJyaXQtY2FjaGUtaDIvcG9tLnhtbApAQCAtMjIsNyArMjIsNyBAQAogICA8cGFyZW50PgogICAgIDxncm91cElkPmNvbS5nb29nbGUuZ2Vycml0PC9ncm91cElkPgogICAgIDxhcnRpZmFjdElkPmdlcnJpdC1wYXJlbnQ8L2FydGlmYWN0SWQ+Ci0gICAgPHZlcnNpb24+Mi41LVNOQVBTSE9UPC92ZXJzaW9uPgorICAgIDx2ZXJzaW9uPjIuNi1TTkFQU0hPVDwvdmVyc2lvbj4KICAgPC9wYXJlbnQ+CiAKICAgPGFydGlmYWN0SWQ+Z2Vycml0LWNhY2hlLWgyPC9hcnRpZmFjdElkPgpkaWZmIC0tZ2l0IGEvZ2Vycml0LWNhY2hlLWgyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NhY2hlL2gyL0gyQ2FjaGVGYWN0b3J5LmphdmEgYi9nZXJyaXQtY2FjaGUtaDIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY2FjaGUvaDIvSDJDYWNoZUZhY3RvcnkuamF2YQppbmRleCAyN2RhMjBmLi44NWEwNTFiIDEwMDY0NAotLS0gYS9nZXJyaXQtY2FjaGUtaDIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY2FjaGUvaDIvSDJDYWNoZUZhY3RvcnkuamF2YQorKysgYi9nZXJyaXQtY2FjaGUtaDIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY2FjaGUvaDIvSDJDYWNoZUZhY3RvcnkuamF2YQpAQCAtMTQ2LDcgKzE0Niw3IEBACiAgICAgfQogICB9CiAKLSAgQFN1cHByZXNzV2FybmluZ3MoeyJ1bmNoZWNrZWQiLCAicmF3dHlwZXMiLCAiY2FzdCJ9KQorICBAU3VwcHJlc3NXYXJuaW5ncyh7InVuY2hlY2tlZCIsICJjYXN0In0pCiAgIEBPdmVycmlkZQogICBwdWJsaWMgPEssIFY+IENhY2hlPEssIFY+IGJ1aWxkKENhY2hlQmluZGluZzxLLCBWPiBkZWYpIHsKICAgICBQcmVjb25kaXRpb25zLmNoZWNrU3RhdGUoIXN0YXJ0ZWQsICJjYWNoZSBtdXN0IGJlIGJ1aWx0IGJlZm9yZSBzdGFydCIpOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LWNvbW1vbi9wb20ueG1sIGIvZ2Vycml0LWNvbW1vbi9wb20ueG1sCmluZGV4IDliM2ZlNWYuLjFkYjM1NDkgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1jb21tb24vcG9tLnhtbAorKysgYi9nZXJyaXQtY29tbW9uL3BvbS54bWwKQEAgLTIyLDcgKzIyLDcgQEAKICAgPHBhcmVudD4KICAgICA8Z3JvdXBJZD5jb20uZ29vZ2xlLmdlcnJpdDwvZ3JvdXBJZD4KICAgICA8YXJ0aWZhY3RJZD5nZXJyaXQtcGFyZW50PC9hcnRpZmFjdElkPgotICAgIDx2ZXJzaW9uPjIuNS1TTkFQU0hPVDwvdmVyc2lvbj4KKyAgICA8dmVyc2lvbj4yLjYtU05BUFNIT1Q8L3ZlcnNpb24+CiAgIDwvcGFyZW50PgogCiAgIDxhcnRpZmFjdElkPmdlcnJpdC1jb21tb248L2FydGlmYWN0SWQ+CkBAIC02MSw2ICs2MSwxMSBAQAogICAgICAgPGFydGlmYWN0SWQ+Z2Vycml0LXBhdGNoLWpnaXQ8L2FydGlmYWN0SWQ+CiAgICAgICA8dmVyc2lvbj4ke3Byb2plY3QudmVyc2lvbn08L3ZlcnNpb24+CiAgICAgPC9kZXBlbmRlbmN5PgorCisgICAgPGRlcGVuZGVuY3k+CisgICAgICA8Z3JvdXBJZD5jb20uZ29vZ2xlLmNvZGUuZmluZGJ1Z3M8L2dyb3VwSWQ+CisgICAgICA8YXJ0aWZhY3RJZD5qc3IzMDU8L2FydGlmYWN0SWQ+CisgICAgPC9kZXBlbmRlbmN5PgogICA8L2RlcGVuZGVuY2llcz4KIAogICA8YnVpbGQ+CmRpZmYgLS1naXQgYS9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvQWRkQnJhbmNoUmVzdWx0LmphdmEgYi9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvQWRkQnJhbmNoUmVzdWx0LmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMjRlNTI3ZGMKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvQWRkQnJhbmNoUmVzdWx0LmphdmEKQEAgLTAsMCArMSw5NiBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhOworCitwdWJsaWMgY2xhc3MgQWRkQnJhbmNoUmVzdWx0IHsKKyAgcHJvdGVjdGVkIExpc3RCcmFuY2hlc1Jlc3VsdCBsaXN0QnJhbmNoZXNSZXN1bHQ7CisgIHByb3RlY3RlZCBFcnJvciBlcnJvcjsKKworICBwcm90ZWN0ZWQgQWRkQnJhbmNoUmVzdWx0KCkgeworICB9CisKKyAgcHVibGljIEFkZEJyYW5jaFJlc3VsdChmaW5hbCBFcnJvciBlcnJvcikgeworICAgIHRoaXMuZXJyb3IgPSBlcnJvcjsKKyAgfQorCisgIHB1YmxpYyBBZGRCcmFuY2hSZXN1bHQoZmluYWwgTGlzdEJyYW5jaGVzUmVzdWx0IGxpc3RCcmFuY2hlc1Jlc3VsdCkgeworICAgIHRoaXMubGlzdEJyYW5jaGVzUmVzdWx0ID0gbGlzdEJyYW5jaGVzUmVzdWx0OworICB9CisKKyAgcHVibGljIExpc3RCcmFuY2hlc1Jlc3VsdCBnZXRMaXN0QnJhbmNoZXNSZXN1bHQoKSB7CisgICAgcmV0dXJuIGxpc3RCcmFuY2hlc1Jlc3VsdDsKKyAgfQorCisgIHB1YmxpYyBib29sZWFuIGhhc0Vycm9yKCkgeworICAgIHJldHVybiBlcnJvciAhPSBudWxsOworICB9CisKKyAgcHVibGljIEVycm9yIGdldEVycm9yKCkgeworICAgIHJldHVybiBlcnJvcjsKKyAgfQorCisgIHB1YmxpYyBzdGF0aWMgY2xhc3MgRXJyb3IgeworICAgIHB1YmxpYyBzdGF0aWMgZW51bSBUeXBlIHsKKyAgICAgIC8qKiBUaGUgYnJhbmNoIGNhbm5vdCBiZSBjcmVhdGVkIGJlY2F1c2UgdGhlIGdpdmVuIGJyYW5jaCBuYW1lIGlzIGludmFsaWQuICovCisgICAgICBJTlZBTElEX05BTUUsCisKKyAgICAgIC8qKiBUaGUgYnJhbmNoIGNhbm5vdCBiZSBjcmVhdGVkIGJlY2F1c2UgdGhlIGdpdmVuIHJldmlzaW9uIGlzIGludmFsaWQuICovCisgICAgICBJTlZBTElEX1JFVklTSU9OLAorCisgICAgICAvKioKKyAgICAgICAqIFRoZSBicmFuY2ggY2Fubm90IGJlIGNyZWF0ZWQgdW5kZXIgdGhlIGdpdmVuIHJlZm5hbWUgcHJlZml4IChlLmcKKyAgICAgICAqIGJyYW5jaGVzIGNhbm5vdCBiZSBjcmVhdGVkIHVuZGVyIG1hZ2ljIHJlZm5hbWUgcHJlZml4ZXMpLgorICAgICAgICovCisgICAgICBCUkFOQ0hfQ1JFQVRJT05fTk9UX0FMTE9XRURfVU5ERVJfUkVGTkFNRV9QUkVGSVgsCisKKyAgICAgIC8qKiBUaGUgYnJhbmNoIHRoYXQgc2hvdWxkIGJlIGNyZWF0ZWQgZXhpc3RzIGFscmVhZHkuICovCisgICAgICBCUkFOQ0hfQUxSRUFEWV9FWElTVFMsCisKKyAgICAgIC8qKgorICAgICAgICogVGhlIGJyYW5jaCBjYW5ub3QgYmUgY3JlYXRlZCBiZWNhdXNlIGl0IGNvbmZsaWN0cyB3aXRoIGFuIGV4aXN0aW5nCisgICAgICAgKiBicmFuY2ggKGJyYW5jaGVzIGNhbm5vdCBiZSBuZXN0ZWQpLgorICAgICAgICovCisgICAgICBCUkFOQ0hfQ1JFQVRJT05fQ09ORkxJQ1QKKyAgICB9CisKKyAgICBwcm90ZWN0ZWQgVHlwZSB0eXBlOworICAgIHByb3RlY3RlZCBTdHJpbmcgcmVmbmFtZTsKKworICAgIHByb3RlY3RlZCBFcnJvcigpIHsKKyAgICB9CisKKyAgICBwdWJsaWMgRXJyb3IoZmluYWwgVHlwZSB0eXBlKSB7CisgICAgICB0aGlzKHR5cGUsIG51bGwpOworICAgIH0KKworICAgIHB1YmxpYyBFcnJvcihmaW5hbCBUeXBlIHR5cGUsIGZpbmFsIFN0cmluZyByZWZuYW1lKSB7CisgICAgICB0aGlzLnR5cGUgPSB0eXBlOworICAgICAgdGhpcy5yZWZuYW1lID0gcmVmbmFtZTsKKyAgICB9CisKKyAgICBwdWJsaWMgVHlwZSBnZXRUeXBlKCkgeworICAgICAgcmV0dXJuIHR5cGU7CisgICAgfQorCisgICAgcHVibGljIFN0cmluZyBnZXRSZWZuYW1lKCkgeworICAgICAgcmV0dXJuIHJlZm5hbWU7CisgICAgfQorCisgICAgQE92ZXJyaWRlCisgICAgcHVibGljIFN0cmluZyB0b1N0cmluZygpIHsKKyAgICAgIHJldHVybiB0eXBlICsgIiAiICsgcmVmbmFtZTsKKyAgICB9CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZGF0YS9BcHByb3ZhbERldGFpbC5qYXZhIGIvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL0FwcHJvdmFsRGV0YWlsLmphdmEKaW5kZXggM2Q0MzhmMi4uMDVlODZiZSAxMDA2NDQKLS0tIGEvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL0FwcHJvdmFsRGV0YWlsLmphdmEKKysrIGIvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL0FwcHJvdmFsRGV0YWlsLmphdmEKQEAgLTQyLDYgKzQyLDcgQEAKICAgcHJvdGVjdGVkIEFjY291bnQuSWQgYWNjb3VudDsKICAgcHJvdGVjdGVkIExpc3Q8UGF0Y2hTZXRBcHByb3ZhbD4gYXBwcm92YWxzOwogICBwcm90ZWN0ZWQgYm9vbGVhbiBjYW5SZW1vdmU7CisgIHByaXZhdGUgU2V0PFN0cmluZz4gdm90YWJsZTsKIAogICBwcml2YXRlIHRyYW5zaWVudCBTZXQ8U3RyaW5nPiBhcHByb3ZlZDsKICAgcHJpdmF0ZSB0cmFuc2llbnQgU2V0PFN0cmluZz4gcmVqZWN0ZWQ7CkBAIC0xMTIsNiArMTEzLDEzIEBACiAgICAgcmVqZWN0ZWQuYWRkKGxhYmVsKTsKICAgfQogCisgIHB1YmxpYyB2b2lkIHZvdGFibGUoU3RyaW5nIGxhYmVsKSB7CisgICAgaWYgKHZvdGFibGUgPT0gbnVsbCkgeworICAgICAgdm90YWJsZSA9IG5ldyBIYXNoU2V0PFN0cmluZz4oKTsKKyAgICB9CisgICAgdm90YWJsZS5hZGQobGFiZWwpOworICB9CisKICAgcHVibGljIGJvb2xlYW4gaXNBcHByb3ZlZChTdHJpbmcgbGFiZWwpIHsKICAgICByZXR1cm4gYXBwcm92ZWQgIT0gbnVsbCAmJiBhcHByb3ZlZC5jb250YWlucyhsYWJlbCk7CiAgIH0KQEAgLTExOSw0ICsxMjcsOCBAQAogICBwdWJsaWMgYm9vbGVhbiBpc1JlamVjdGVkKFN0cmluZyBsYWJlbCkgewogICAgIHJldHVybiByZWplY3RlZCAhPSBudWxsICYmIHJlamVjdGVkLmNvbnRhaW5zKGxhYmVsKTsKICAgfQorCisgIHB1YmxpYyBib29sZWFuIGNhblZvdGUoU3RyaW5nIGxhYmVsKSB7CisgICAgcmV0dXJuIHZvdGFibGUgIT0gbnVsbCAmJiB2b3RhYmxlLmNvbnRhaW5zKGxhYmVsKTsKKyAgfQogfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL0NoYW5nZURldGFpbC5qYXZhIGIvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL0NoYW5nZURldGFpbC5qYXZhCmluZGV4IDc0ZDE5NjIuLjUyOTI4M2IgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZGF0YS9DaGFuZ2VEZXRhaWwuamF2YQorKysgYi9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvQ2hhbmdlRGV0YWlsLmphdmEKQEAgLTE3LDYgKzE3LDcgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQ2hhbmdlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5DaGFuZ2VNZXNzYWdlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUHJvamVjdDsKIAogaW1wb3J0IGphdmEudXRpbC5BcnJheUxpc3Q7CiBpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb247CkBAIC00MCw2ICs0MSw4IEBACiAgIHByb3RlY3RlZCBMaXN0PFBhdGNoU2V0PiBwYXRjaFNldHM7CiAgIHByb3RlY3RlZCBMaXN0PEFwcHJvdmFsRGV0YWlsPiBhcHByb3ZhbHM7CiAgIHByb3RlY3RlZCBMaXN0PFN1Ym1pdFJlY29yZD4gc3VibWl0UmVjb3JkczsKKyAgcHJvdGVjdGVkIFByb2plY3QuU3VibWl0VHlwZSBzdWJtaXRUeXBlOworICBwcm90ZWN0ZWQgU3VibWl0VHlwZVJlY29yZCBzdWJtaXRUeXBlUmVjb3JkOwogICBwcm90ZWN0ZWQgYm9vbGVhbiBjYW5TdWJtaXQ7CiAgIHByb3RlY3RlZCBMaXN0PENoYW5nZU1lc3NhZ2U+IG1lc3NhZ2VzOwogICBwcm90ZWN0ZWQgUGF0Y2hTZXQuSWQgY3VycmVudFBhdGNoU2V0SWQ7CkBAIC0xODcsNiArMTkwLDE0IEBACiAgICAgcmV0dXJuIHN1Ym1pdFJlY29yZHM7CiAgIH0KIAorICBwdWJsaWMgdm9pZCBzZXRTdWJtaXRUeXBlUmVjb3JkKFN1Ym1pdFR5cGVSZWNvcmQgc3VibWl0VHlwZVJlY29yZCkgeworICAgIHRoaXMuc3VibWl0VHlwZVJlY29yZCA9IHN1Ym1pdFR5cGVSZWNvcmQ7CisgIH0KKworICBwdWJsaWMgU3VibWl0VHlwZVJlY29yZCBnZXRTdWJtaXRUeXBlUmVjb3JkKCkgeworICAgIHJldHVybiBzdWJtaXRUeXBlUmVjb3JkOworICB9CisKICAgcHVibGljIGJvb2xlYW4gaXNDdXJyZW50UGF0Y2hTZXQoZmluYWwgUGF0Y2hTZXREZXRhaWwgZGV0YWlsKSB7CiAgICAgcmV0dXJuIGN1cnJlbnRQYXRjaFNldElkICE9IG51bGwKICAgICAgICAgJiYgZGV0YWlsLmdldFBhdGNoU2V0KCkuZ2V0SWQoKS5lcXVhbHMoY3VycmVudFBhdGNoU2V0SWQpOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL0dlcnJpdENvbmZpZy5qYXZhIGIvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL0dlcnJpdENvbmZpZy5qYXZhCmluZGV4IDdjMTYxMjkuLmJmOWY5YWIgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZGF0YS9HZXJyaXRDb25maWcuamF2YQorKysgYi9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvR2Vycml0Q29uZmlnLmphdmEKQEAgLTUxLDYgKzUxLDcgQEAKICAgcHJvdGVjdGVkIGJvb2xlYW4gZG9jdW1lbnRhdGlvbkF2YWlsYWJsZTsKICAgcHJvdGVjdGVkIGJvb2xlYW4gdGVzdENoYW5nZU1lcmdlOwogICBwcm90ZWN0ZWQgU3RyaW5nIGFub255bW91c0Nvd2FyZE5hbWU7CisgIHByb3RlY3RlZCBpbnQgc3VnZ2VzdEZyb207CiAKICAgcHVibGljIFN0cmluZyBnZXRSZWdpc3RlclVybCgpIHsKICAgICByZXR1cm4gcmVnaXN0ZXJVcmw7CkBAIC0yMzgsNiArMjM5LDE0IEBACiAgICAgdGhpcy5hbm9ueW1vdXNDb3dhcmROYW1lID0gYW5vbnltb3VzQ293YXJkTmFtZTsKICAgfQogCisgIHB1YmxpYyBpbnQgZ2V0U3VnZ2VzdEZyb20oKSB7CisgICAgcmV0dXJuIHN1Z2dlc3RGcm9tOworICB9CisKKyAgcHVibGljIHZvaWQgc2V0U3VnZ2VzdEZyb20oZmluYWwgaW50IHN1Z2dlc3RGcm9tKSB7CisgICAgdGhpcy5zdWdnZXN0RnJvbSA9IHN1Z2dlc3RGcm9tOworICB9CisKICAgcHVibGljIGJvb2xlYW4gc2l0ZUhhc1VzZXJuYW1lcygpIHsKICAgICBpZiAoZ2V0QXV0aFR5cGUoKSA9PSBBdXRoVHlwZS5DVVNUT01fRVhURU5TSU9OCiAgICAgICAgICYmIGdldEh0dHBQYXNzd29yZFVybCgpICE9IG51bGwKZGlmZiAtLWdpdCBhL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZGF0YS9Ib3N0UGFnZURhdGEuamF2YSBiL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZGF0YS9Ib3N0UGFnZURhdGEuamF2YQppbmRleCBmOTkxZjRjLi5mYzdmOTJkIDEwMDY0NAotLS0gYS9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvSG9zdFBhZ2VEYXRhLmphdmEKKysrIGIvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL0hvc3RQYWdlRGF0YS5qYXZhCkBAIC0xNyw2ICsxNyw4IEBACiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnREaWZmUHJlZmVyZW5jZTsKIAoraW1wb3J0IGphdmEudXRpbC5MaXN0OworCiAvKiogRGF0YSBzZW50IGFzIHBhcnQgb2YgdGhlIGhvc3QgcGFnZSwgdG8gYm9vdHN0cmFwIHRoZSBVSS4gKi8KIHB1YmxpYyBjbGFzcyBIb3N0UGFnZURhdGEgewogICBwdWJsaWMgQWNjb3VudCBhY2NvdW50OwpAQCAtMjQsNiArMjYsNyBAQAogICBwdWJsaWMgU3RyaW5nIHhzcmZUb2tlbjsKICAgcHVibGljIEdlcnJpdENvbmZpZyBjb25maWc7CiAgIHB1YmxpYyBUaGVtZSB0aGVtZTsKKyAgcHVibGljIExpc3Q8U3RyaW5nPiBwbHVnaW5zOwogCiAgIHB1YmxpYyBzdGF0aWMgY2xhc3MgVGhlbWUgewogICAgIHB1YmxpYyBTdHJpbmcgYmFja2dyb3VuZENvbG9yOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL1BhdGNoU2V0UHVibGlzaERldGFpbC5qYXZhIGIvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL1BhdGNoU2V0UHVibGlzaERldGFpbC5qYXZhCmluZGV4IDNjNWM2ODguLmNmNGIyOGIgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZGF0YS9QYXRjaFNldFB1Ymxpc2hEZXRhaWwuamF2YQorKysgYi9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvUGF0Y2hTZXRQdWJsaXNoRGV0YWlsLmphdmEKQEAgLTMzLDYgKzMzLDcgQEAKICAgcHJvdGVjdGVkIExpc3Q8UGVybWlzc2lvblJhbmdlPiBsYWJlbHM7CiAgIHByb3RlY3RlZCBMaXN0PEFwcHJvdmFsRGV0YWlsPiBhcHByb3ZhbHM7CiAgIHByb3RlY3RlZCBMaXN0PFN1Ym1pdFJlY29yZD4gc3VibWl0UmVjb3JkczsKKyAgcHJvdGVjdGVkIFN1Ym1pdFR5cGVSZWNvcmQgc3VibWl0VHlwZVJlY29yZDsKICAgcHJvdGVjdGVkIExpc3Q8UGF0Y2hTZXRBcHByb3ZhbD4gZ2l2ZW47CiAgIHByb3RlY3RlZCBib29sZWFuIGNhblN1Ym1pdDsKIApAQCAtNjEsNiArNjIsMTQgQEAKICAgICByZXR1cm4gc3VibWl0UmVjb3JkczsKICAgfQogCisgIHB1YmxpYyB2b2lkIHNldFN1Ym1pdFR5cGVSZWNvcmQoU3VibWl0VHlwZVJlY29yZCBzdWJtaXRUeXBlUmVjb3JkKSB7CisgICAgdGhpcy5zdWJtaXRUeXBlUmVjb3JkID0gc3VibWl0VHlwZVJlY29yZDsKKyAgfQorCisgIHB1YmxpYyBTdWJtaXRUeXBlUmVjb3JkIGdldFN1Ym1pdFR5cGVSZWNvcmQoKSB7CisgICAgcmV0dXJuIHN1Ym1pdFR5cGVSZWNvcmQ7CisgIH0KKwogICBwdWJsaWMgTGlzdDxQYXRjaFNldEFwcHJvdmFsPiBnZXRHaXZlbigpIHsKICAgICByZXR1cm4gZ2l2ZW47CiAgIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZGF0YS9QZXJtaXNzaW9uLmphdmEgYi9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvUGVybWlzc2lvbi5qYXZhCmluZGV4IDVjYjc3ODcuLjI5ZDk0MzEgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZGF0YS9QZXJtaXNzaW9uLmphdmEKKysrIGIvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL1Blcm1pc3Npb24uamF2YQpAQCAtMzMsNiArMzMsNyBAQAogICBwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBQVVNIX1RBRyA9ICJwdXNoVGFnIjsKICAgcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgUkVBRCA9ICJyZWFkIjsKICAgcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgUkVCQVNFID0gInJlYmFzZSI7CisgIHB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIFJFTU9WRV9SRVZJRVdFUiA9ICJyZW1vdmVSZXZpZXdlciI7CiAgIHB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIFNVQk1JVCA9ICJzdWJtaXQiOwogCiAgIHByaXZhdGUgc3RhdGljIGZpbmFsIExpc3Q8U3RyaW5nPiBOQU1FU19MQzsKQEAgLTUyLDYgKzUzLDcgQEAKICAgICBOQU1FU19MQy5hZGQoUFVTSF9UQUcudG9Mb3dlckNhc2UoKSk7CiAgICAgTkFNRVNfTEMuYWRkKExBQkVMLnRvTG93ZXJDYXNlKCkpOwogICAgIE5BTUVTX0xDLmFkZChSRUJBU0UudG9Mb3dlckNhc2UoKSk7CisgICAgTkFNRVNfTEMuYWRkKFJFTU9WRV9SRVZJRVdFUi50b0xvd2VyQ2FzZSgpKTsKICAgICBOQU1FU19MQy5hZGQoU1VCTUlULnRvTG93ZXJDYXNlKCkpOwogCiAgICAgbGFiZWxJbmRleCA9IE5BTUVTX0xDLmluZGV4T2YoUGVybWlzc2lvbi5MQUJFTCk7CmRpZmYgLS1naXQgYS9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvUHJvamVjdEFkbWluU2VydmljZS5qYXZhIGIvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL1Byb2plY3RBZG1pblNlcnZpY2UuamF2YQppbmRleCAxM2MwYTQ4Li5hOGFhMDQ1IDEwMDY0NAotLS0gYS9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvUHJvamVjdEFkbWluU2VydmljZS5qYXZhCisrKyBiL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZGF0YS9Qcm9qZWN0QWRtaW5TZXJ2aWNlLmphdmEKQEAgLTY2LDcgKzY2LDcgQEAKICAgQEF1ZGl0CiAgIEBTaWduSW5SZXF1aXJlZAogICB2b2lkIGFkZEJyYW5jaChQcm9qZWN0Lk5hbWVLZXkgcHJvamVjdE5hbWUsIFN0cmluZyBicmFuY2hOYW1lLAotICAgICAgU3RyaW5nIHN0YXJ0aW5nUmV2aXNpb24sIEFzeW5jQ2FsbGJhY2s8TGlzdEJyYW5jaGVzUmVzdWx0PiBjYWxsYmFjayk7CisgICAgICBTdHJpbmcgc3RhcnRpbmdSZXZpc2lvbiwgQXN5bmNDYWxsYmFjazxBZGRCcmFuY2hSZXN1bHQ+IGNhbGxiYWNrKTsKIAogICBAQXVkaXQKICAgQFNpZ25JblJlcXVpcmVkCmRpZmYgLS1naXQgYS9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvU3VibWl0VHlwZVJlY29yZC5qYXZhIGIvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL1N1Ym1pdFR5cGVSZWNvcmQuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi40ZWVhNzk4Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL1N1Ym1pdFR5cGVSZWNvcmQuamF2YQpAQCAtMCwwICsxLDU4IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGE7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUHJvamVjdDsKKworLyoqCisgKiBEZXNjcmliZXMgdGhlIHN1Ym1pdCB0eXBlIGZvciBhIGNoYW5nZS4KKyAqLworcHVibGljIGNsYXNzIFN1Ym1pdFR5cGVSZWNvcmQgeworICBwdWJsaWMgc3RhdGljIGVudW0gU3RhdHVzIHsKKyAgICAvKiogVGhlIHR5cGUgd2FzIGNvbXB1dGVkIHN1Y2Nlc3NmdWxseSAqLworICAgIE9LLAorCisgICAgLyoqIEFuIGludGVybmFsIHNlcnZlciBlcnJvciBvY2N1cnJlZCBwcmV2ZW50aW5nIGNvbXB1dGF0aW9uLgorICAgICAqIDxwPgorICAgICAqIEFkZGl0aW9uYWwgZGV0YWlsIG1heSBiZSBhdmFpbGFibGUgaW4ge0BsaW5rIFN1Ym1pdFR5cGVSZWNvcmQjZXJyb3JNZXNzYWdlfQorICAgICAqLworICAgIFJVTEVfRVJST1IKKyAgfQorCisgIHB1YmxpYyBzdGF0aWMgU3VibWl0VHlwZVJlY29yZCBPSyhQcm9qZWN0LlN1Ym1pdFR5cGUgdHlwZSkgeworICAgIFN1Ym1pdFR5cGVSZWNvcmQgciA9IG5ldyBTdWJtaXRUeXBlUmVjb3JkKCk7CisgICAgci5zdGF0dXMgPSBTdGF0dXMuT0s7CisgICAgci50eXBlID0gdHlwZTsKKyAgICByZXR1cm4gcjsKKyAgfQorCisgIHB1YmxpYyBTdGF0dXMgc3RhdHVzOworICBwdWJsaWMgUHJvamVjdC5TdWJtaXRUeXBlIHR5cGU7CisgIHB1YmxpYyBTdHJpbmcgZXJyb3JNZXNzYWdlOworCisgIHB1YmxpYyBTdHJpbmcgdG9TdHJpbmcoKSB7CisgICAgU3RyaW5nQnVpbGRlciBzYiA9IG5ldyBTdHJpbmdCdWlsZGVyKCk7CisgICAgc2IuYXBwZW5kKHN0YXR1cyk7CisgICAgaWYgKHN0YXR1cyA9PSBTdGF0dXMuUlVMRV9FUlJPUiAmJiBlcnJvck1lc3NhZ2UgIT0gbnVsbCkgeworICAgICAgc2IuYXBwZW5kKCcoJykuYXBwZW5kKGVycm9yTWVzc2FnZSkuYXBwZW5kKCIpIik7CisgICAgfQorICAgIGlmICh0eXBlICE9IG51bGwpIHsKKyAgICAgIHNiLmFwcGVuZCgnWycpOworICAgICAgc2IuYXBwZW5kKHR5cGUubmFtZSgpKTsKKyAgICAgIHNiLmFwcGVuZCgnXScpOworICAgIH0KKyAgICByZXR1cm4gc2IudG9TdHJpbmcoKTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWV4dGVuc2lvbi1hcGkvcG9tLnhtbCBiL2dlcnJpdC1leHRlbnNpb24tYXBpL3BvbS54bWwKaW5kZXggZmY2NzJkNS4uMTA4MGVkMSAxMDA2NDQKLS0tIGEvZ2Vycml0LWV4dGVuc2lvbi1hcGkvcG9tLnhtbAorKysgYi9nZXJyaXQtZXh0ZW5zaW9uLWFwaS9wb20ueG1sCkBAIC0yMiw3ICsyMiw3IEBACiAgIDxwYXJlbnQ+CiAgICAgPGdyb3VwSWQ+Y29tLmdvb2dsZS5nZXJyaXQ8L2dyb3VwSWQ+CiAgICAgPGFydGlmYWN0SWQ+Z2Vycml0LXBhcmVudDwvYXJ0aWZhY3RJZD4KLSAgICA8dmVyc2lvbj4yLjUtU05BUFNIT1Q8L3ZlcnNpb24+CisgICAgPHZlcnNpb24+Mi42LVNOQVBTSE9UPC92ZXJzaW9uPgogICA8L3BhcmVudD4KIAogICA8YXJ0aWZhY3RJZD5nZXJyaXQtZXh0ZW5zaW9uLWFwaTwvYXJ0aWZhY3RJZD4KZGlmZiAtLWdpdCBhL2dlcnJpdC1leHRlbnNpb24tYXBpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvZXh0ZW5zaW9ucy9yZWdpc3RyYXRpb24vRHluYW1pY1NldFByb3ZpZGVyLmphdmEgYi9nZXJyaXQtZXh0ZW5zaW9uLWFwaS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2V4dGVuc2lvbnMvcmVnaXN0cmF0aW9uL0R5bmFtaWNTZXRQcm92aWRlci5qYXZhCmluZGV4IDZjMjE1NTMuLjIxZmExYjggMTAwNjQ0Ci0tLSBhL2dlcnJpdC1leHRlbnNpb24tYXBpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvZXh0ZW5zaW9ucy9yZWdpc3RyYXRpb24vRHluYW1pY1NldFByb3ZpZGVyLmphdmEKKysrIGIvZ2Vycml0LWV4dGVuc2lvbi1hcGkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9leHRlbnNpb25zL3JlZ2lzdHJhdGlvbi9EeW5hbWljU2V0UHJvdmlkZXIuamF2YQpAQCAtMTksNyArMTksNiBAQAogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdG9yOwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlByb3ZpZGVyOwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlR5cGVMaXRlcmFsOwotaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LmludGVybmFsLlVuaXF1ZUFubm90YXRpb25zOwogCiBpbXBvcnQgamF2YS51dGlsLkFycmF5TGlzdDsKIGltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbnM7CkBAIC0yNyw4ICsyNiw2IEBACiBpbXBvcnQgamF2YS51dGlsLmNvbmN1cnJlbnQuYXRvbWljLkF0b21pY1JlZmVyZW5jZTsKIAogY2xhc3MgRHluYW1pY1NldFByb3ZpZGVyPFQ+IGltcGxlbWVudHMgUHJvdmlkZXI8RHluYW1pY1NldDxUPj4gewotICBwcml2YXRlIHN0YXRpYyBmaW5hbCBDbGFzczw/PiBVTklRVUVfQU5OT1RBVElPTiA9Ci0gICAgICBVbmlxdWVBbm5vdGF0aW9ucy5jcmVhdGUoKS5nZXRDbGFzcygpOwogICBwcml2YXRlIGZpbmFsIFR5cGVMaXRlcmFsPFQ+IHR5cGU7CiAKICAgQEluamVjdApkaWZmIC0tZ2l0IGEvZ2Vycml0LWV4dGVuc2lvbi1hcGkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9leHRlbnNpb25zL3dlYnVpL0d3dFBsdWdpbi5qYXZhIGIvZ2Vycml0LWV4dGVuc2lvbi1hcGkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9leHRlbnNpb25zL3dlYnVpL0d3dFBsdWdpbi5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmU3NDFhM2YKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtZXh0ZW5zaW9uLWFwaS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2V4dGVuc2lvbnMvd2VidWkvR3d0UGx1Z2luLmphdmEKQEAgLTAsMCArMSwzMyBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMud2VidWk7CisKKy8qKiBDb25maWd1cmVzIGEgd2ViIFVJIHBsdWdpbiBjb21waWxlZCB1c2luZyBHV1QuICovCitwdWJsaWMgY2xhc3MgR3d0UGx1Z2luIGV4dGVuZHMgV2ViVWlQbHVnaW4geworICBwcml2YXRlIGZpbmFsIFN0cmluZyBtb2R1bGVOYW1lOworCisgIC8qKgorICAgKiBAcGFyYW0gbW9kdWxlTmFtZSBuYW1lIG9mIEdXVCBtb2R1bGUuIFRoZSByZXNvdXJjZQorICAgKiAgICAgICAge0Bjb2RlIHN0YXRpYy8kTU9EVUxFLyRNT0RVTEUubm9jYWNoZS5qc30gd2lsbCBiZSB1c2VkLgorICAgKi8KKyAgcHVibGljIEd3dFBsdWdpbihTdHJpbmcgbW9kdWxlTmFtZSkgeworICAgIHRoaXMubW9kdWxlTmFtZSA9IG1vZHVsZU5hbWU7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIFN0cmluZyBnZXRKYXZhU2NyaXB0UmVzb3VyY2VQYXRoKCkgeworICAgIHJldHVybiBTdHJpbmcuZm9ybWF0KCJzdGF0aWMvJXMvJXMubm9jYWNoZS5qcyIsIG1vZHVsZU5hbWUsIG1vZHVsZU5hbWUpOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtZXh0ZW5zaW9uLWFwaS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2V4dGVuc2lvbnMvd2VidWkvSmF2YVNjcmlwdFBsdWdpbi5qYXZhIGIvZ2Vycml0LWV4dGVuc2lvbi1hcGkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9leHRlbnNpb25zL3dlYnVpL0phdmFTY3JpcHRQbHVnaW4uamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi44OWE0ZjMzCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWV4dGVuc2lvbi1hcGkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9leHRlbnNpb25zL3dlYnVpL0phdmFTY3JpcHRQbHVnaW4uamF2YQpAQCAtMCwwICsxLDMzIEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy53ZWJ1aTsKKworLyoqIENvbmZpZ3VyZXMgYSB3ZWIgVUkgcGx1Z2luIHdyaXR0ZW4gdXNpbmcgSmF2YVNjcmlwdC4gKi8KK3B1YmxpYyBjbGFzcyBKYXZhU2NyaXB0UGx1Z2luIGV4dGVuZHMgV2ViVWlQbHVnaW4geworICBwcml2YXRlIGZpbmFsIFN0cmluZyBmaWxlTmFtZTsKKworICAvKioKKyAgICogQHBhcmFtIGZpbGVOYW1lIG9mIEphdmFTY3JpcHQgc291cmNlIGZpbGUgdW5kZXIge0Bjb2RlIHN0YXRpYy99CisgICAqICAgICAgICBzdWJkaXJlY3Rvcnkgd2l0aGluIHRoZSBwbHVnaW4ncyBKQVIuCisgICAqLworICBwdWJsaWMgSmF2YVNjcmlwdFBsdWdpbihTdHJpbmcgZmlsZU5hbWUpIHsKKyAgICB0aGlzLmZpbGVOYW1lID0gZmlsZU5hbWU7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIFN0cmluZyBnZXRKYXZhU2NyaXB0UmVzb3VyY2VQYXRoKCkgeworICAgIHJldHVybiAic3RhdGljLyIgKyBmaWxlTmFtZTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWV4dGVuc2lvbi1hcGkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9leHRlbnNpb25zL3dlYnVpL1dlYlVpUGx1Z2luLmphdmEgYi9nZXJyaXQtZXh0ZW5zaW9uLWFwaS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2V4dGVuc2lvbnMvd2VidWkvV2ViVWlQbHVnaW4uamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi41Y2QxOTgxCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWV4dGVuc2lvbi1hcGkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9leHRlbnNpb25zL3dlYnVpL1dlYlVpUGx1Z2luLmphdmEKQEAgLTAsMCArMSw2OSBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMud2VidWk7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLmFubm90YXRpb25zLkV4dGVuc2lvblBvaW50OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMuYW5ub3RhdGlvbnMuUGx1Z2luTmFtZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CisKKy8qKgorICogU3BlY2lmaWVzIEphdmFTY3JpcHQgdG8gZHluYW1pY2FsbHkgbG9hZCBpbnRvIHRoZSB3ZWIgVUkuCisgKiA8cD4KKyAqIFRvIGF1dG9tYXRpY2FsbHkgcmVnaXN0ZXIgKGluc3RlYWQgb2Ygd3JpdGluZyBhIEd1aWNlIG1vZHVsZSksIGRlY2xhcmUgdGhlCisgKiBpbnRlbnRpb24gd2l0aCB7QGNvZGUgQExpc3Rlbn0sIGV4dGVuZCB0aGUgY29ycmVjdCBjbGFzcyBhbmQgZGVmaW5lIGEKKyAqIGNvbnN0cnVjdG9yIHRvIGNvbmZpZ3VyZSB0aGUgY29ycmVjdCByZXNvdXJjZToKKyAqCisgKiA8cHJlPgorICogJiMwNjQ7TGlzdGVuCisgKiBjbGFzcyBNeUpzIGV4dGVuZHMgSmF2YVNjcmlwdFBsdWdpbiB7CisgKiAgIE15SnMoKSB7CisgKiAgICAgc3VwZXIoJnF1b3Q7aGVsbG8uanMmcXVvdDspOworICogICB9CisgKiB9CisgKiA8L3ByZT4KKyAqCisgKiBAc2VlIEd3dFBsdWdpbgorICogQHNlZSBKYXZhU2NyaXB0UGx1Z2luCisgKi8KK0BFeHRlbnNpb25Qb2ludAorcHVibGljIGFic3RyYWN0IGNsYXNzIFdlYlVpUGx1Z2luIHsKKyAgcHVibGljIHN0YXRpYyBmaW5hbCBHd3RQbHVnaW4gZ3d0KFN0cmluZyBtb2R1bGVOYW1lKSB7CisgICAgcmV0dXJuIG5ldyBHd3RQbHVnaW4obW9kdWxlTmFtZSk7CisgIH0KKworICBwdWJsaWMgc3RhdGljIGZpbmFsIEphdmFTY3JpcHRQbHVnaW4ganMoU3RyaW5nIHNjcmlwdE5hbWUpIHsKKyAgICByZXR1cm4gbmV3IEphdmFTY3JpcHRQbHVnaW4oc2NyaXB0TmFtZSk7CisgIH0KKworICBwcml2YXRlIFN0cmluZyBwbHVnaW5OYW1lOworCisgIC8qKiBAcmV0dXJuIGluc3RhbGxlZCBuYW1lIG9mIHRoZSBwbHVnaW4gdGhhdCBwcm92aWRlcyB0aGlzIFVJIGZlYXR1cmUuICAqLworICBwdWJsaWMgZmluYWwgU3RyaW5nIGdldFBsdWdpbk5hbWUoKSB7CisgICAgcmV0dXJuIHBsdWdpbk5hbWU7CisgIH0KKworICBASW5qZWN0CisgIHZvaWQgc2V0UGx1Z2luTmFtZShAUGx1Z2luTmFtZSBTdHJpbmcgcGx1Z2luTmFtZSkgeworICAgIHRoaXMucGx1Z2luTmFtZSA9IHBsdWdpbk5hbWU7CisgIH0KKworICAvKiogQHJldHVybiBwYXRoIHRvIGluaXRpYWxpemF0aW9uIHNjcmlwdCB3aXRoaW4gdGhlIHBsdWdpbidzIEpBUi4gKi8KKyAgcHVibGljIGFic3RyYWN0IFN0cmluZyBnZXRKYXZhU2NyaXB0UmVzb3VyY2VQYXRoKCk7CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBTdHJpbmcgdG9TdHJpbmcoKSB7CisgICAgcmV0dXJuIGdldEphdmFTY3JpcHRSZXNvdXJjZVBhdGgoKTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dGRlYnVnL3BvbS54bWwgYi9nZXJyaXQtZ3d0ZGVidWcvcG9tLnhtbAppbmRleCAwMWI5M2E2Li45ZGI0MzRhIDEwMDY0NAotLS0gYS9nZXJyaXQtZ3d0ZGVidWcvcG9tLnhtbAorKysgYi9nZXJyaXQtZ3d0ZGVidWcvcG9tLnhtbApAQCAtMjIsNyArMjIsNyBAQAogICA8cGFyZW50PgogICAgIDxncm91cElkPmNvbS5nb29nbGUuZ2Vycml0PC9ncm91cElkPgogICAgIDxhcnRpZmFjdElkPmdlcnJpdC1wYXJlbnQ8L2FydGlmYWN0SWQ+Ci0gICAgPHZlcnNpb24+Mi41LVNOQVBTSE9UPC92ZXJzaW9uPgorICAgIDx2ZXJzaW9uPjIuNi1TTkFQU0hPVDwvdmVyc2lvbj4KICAgPC9wYXJlbnQ+CiAKICAgPGFydGlmYWN0SWQ+Z2Vycml0LWd3dGRlYnVnPC9hcnRpZmFjdElkPgpAQCAtNzMsMTQgKzczLDEyIEBACiAgICAgPGRlcGVuZGVuY3k+CiAgICAgICA8Z3JvdXBJZD5ib3VuY3ljYXN0bGU8L2dyb3VwSWQ+CiAgICAgICA8YXJ0aWZhY3RJZD5iY3Byb3YtamRrMTU8L2FydGlmYWN0SWQ+Ci0gICAgICA8dmVyc2lvbj4xNDA8L3ZlcnNpb24+CiAgICAgICA8c2NvcGU+cHJvdmlkZWQ8L3Njb3BlPgogICAgIDwvZGVwZW5kZW5jeT4KIAogICAgIDxkZXBlbmRlbmN5PgogICAgICAgPGdyb3VwSWQ+Ym91bmN5Y2FzdGxlPC9ncm91cElkPgogICAgICAgPGFydGlmYWN0SWQ+YmNwZy1qZGsxNTwvYXJ0aWZhY3RJZD4KLSAgICAgIDx2ZXJzaW9uPjE0MDwvdmVyc2lvbj4KICAgICAgIDxzY29wZT5wcm92aWRlZDwvc2NvcGU+CiAgICAgPC9kZXBlbmRlbmN5PgogCmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvcG9tLnhtbCBiL2dlcnJpdC1nd3R1aS9wb20ueG1sCmluZGV4IGIzMjkxZDEuLmU1NDk2YmEgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1nd3R1aS9wb20ueG1sCisrKyBiL2dlcnJpdC1nd3R1aS9wb20ueG1sCkBAIC0yMiw3ICsyMiw3IEBACiAgIDxwYXJlbnQ+CiAgICAgPGdyb3VwSWQ+Y29tLmdvb2dsZS5nZXJyaXQ8L2dyb3VwSWQ+CiAgICAgPGFydGlmYWN0SWQ+Z2Vycml0LXBhcmVudDwvYXJ0aWZhY3RJZD4KLSAgICA8dmVyc2lvbj4yLjUtU05BUFNIT1Q8L3ZlcnNpb24+CisgICAgPHZlcnNpb24+Mi42LVNOQVBTSE9UPC92ZXJzaW9uPgogICA8L3BhcmVudD4KIAogICA8YXJ0aWZhY3RJZD5nZXJyaXQtZ3d0dWk8L2FydGlmYWN0SWQ+CkBAIC0yMzIsNyArMjMyLDcgQEAKICAgICAgICAgICAgIDxjb25maWd1cmF0aW9uPgogICAgICAgICAgICAgICA8dGFyZ2V0PgogICAgICAgICAgICAgICAgIDxwcm9wZXJ0eSBuYW1lPSJkc3QiIGxvY2F0aW9uPSIke3Byb2plY3QuYnVpbGQuZGlyZWN0b3J5fS8ke3Byb2plY3QuYnVpbGQuZmluYWxOYW1lfSIvPgotICAgICAgICAgICAgICAgIDxwcm9wZXJ0eSBuYW1lPSJhcHAiIGxvY2F0aW9uPSIke2RzdH0vZ2Vycml0Ii8+CisgICAgICAgICAgICAgICAgPHByb3BlcnR5IG5hbWU9ImFwcCIgbG9jYXRpb249IiR7ZHN0fS9nZXJyaXRfdWkiLz4KIAogICAgICAgICAgICAgICAgIDxta2RpciBkaXI9IiR7YXBwfSIvPgogICAgICAgICAgICAgICAgIDxhcHBseSBleGVjdXRhYmxlPSJnemlwIiBhZGRzb3VyY2VmaWxlPSJmYWxzZSI+CkBAIC0yNTcsNyArMjU3LDcgQEAKICAgICAgICAgPGdyb3VwSWQ+b3JnLmFwYWNoZS5tYXZlbi5wbHVnaW5zPC9ncm91cElkPgogICAgICAgICA8YXJ0aWZhY3RJZD5tYXZlbi13YXItcGx1Z2luPC9hcnRpZmFjdElkPgogICAgICAgICA8Y29uZmlndXJhdGlvbj4KLSAgICAgICAgICA8cGFja2FnaW5nRXhjbHVkZXM+V0VCLUlORi9jbGFzc2VzLyoqLFdFQi1JTkYvbGliLyoqPC9wYWNrYWdpbmdFeGNsdWRlcz4KKyAgICAgICAgICA8cGFja2FnaW5nRXhjbHVkZXM+V0VCLUlORi9jbGFzc2VzLyoqLFdFQi1JTkYvZGVwbG95LyoqLFdFQi1JTkYvbGliLyoqPC9wYWNrYWdpbmdFeGNsdWRlcz4KICAgICAgICAgICA8YXR0YWNoQ2xhc3Nlcz50cnVlPC9hdHRhY2hDbGFzc2VzPgogICAgICAgICAgIDxhcmNoaXZlPgogICAgICAgICAgICAgPGFkZE1hdmVuRGVzY3JpcHRvcj5mYWxzZTwvYWRkTWF2ZW5EZXNjcmlwdG9yPgpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvR2Vycml0R3d0VUkuZ3d0LnhtbCBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L0dlcnJpdEd3dFVJLmd3dC54bWwKaW5kZXggODU1NWM3NS4uNWZkYzViYiAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvR2Vycml0R3d0VUkuZ3d0LnhtbAorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9HZXJyaXRHd3RVSS5nd3QueG1sCkBAIC0xMyw3ICsxMyw3IEBACiAgU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAogIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgogLS0+Ci08bW9kdWxlIHJlbmFtZS10bz0iZ2Vycml0Ij4KKzxtb2R1bGUgcmVuYW1lLXRvPSJnZXJyaXRfdWkiPgogICA8aW5oZXJpdHMgbmFtZT0nY29tLmdvb2dsZS5nd3QuZWRpdG9yLkVkaXRvcicvPgogICA8aW5oZXJpdHMgbmFtZT0nY29tLmdvb2dsZS5nd3QudXNlci5Vc2VyJy8+CiAgIDxpbmhlcml0cyBuYW1lPSdjb20uZ29vZ2xlLmd3dC5yZXNvdXJjZXMuUmVzb3VyY2VzJy8+CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9HZXJyaXRHd3RVSWdlY2tvMV84Lmd3dC54bWwgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9HZXJyaXRHd3RVSWdlY2tvMV84Lmd3dC54bWwKaW5kZXggZDFhOWZlNC4uZDdlODM1ZiAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvR2Vycml0R3d0VUlnZWNrbzFfOC5nd3QueG1sCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L0dlcnJpdEd3dFVJZ2Vja28xXzguZ3d0LnhtbApAQCAtMTMsNyArMTMsNyBAQAogIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKICBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KIC0tPgotPG1vZHVsZSByZW5hbWUtdG89ImdlcnJpdCI+Cis8bW9kdWxlIHJlbmFtZS10bz0iZ2Vycml0X3VpIj4KICAgPGluaGVyaXRzIG5hbWU9J2NvbS5nb29nbGUuZ2Vycml0LkdlcnJpdEd3dFVJJy8+CiAgIDxzZXQtcHJvcGVydHkgbmFtZT0idXNlci5hZ2VudCIgdmFsdWU9ImdlY2tvMV84IiAvPgogICA8c2V0LXByb3BlcnR5IG5hbWU9ImxvY2FsZSIgdmFsdWU9ImRlZmF1bHQiIC8+CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9HZXJyaXRHd3RVSXNhZmFyaS5nd3QueG1sIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvR2Vycml0R3d0VUlzYWZhcmkuZ3d0LnhtbAppbmRleCA3NjU1YzFmLi44OGJlYTg0IDEwMDY0NAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9HZXJyaXRHd3RVSXNhZmFyaS5nd3QueG1sCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L0dlcnJpdEd3dFVJc2FmYXJpLmd3dC54bWwKQEAgLTEzLDcgKzEzLDcgQEAKICBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCiAgbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCiAtLT4KLTxtb2R1bGUgcmVuYW1lLXRvPSJnZXJyaXQiPgorPG1vZHVsZSByZW5hbWUtdG89ImdlcnJpdF91aSI+CiAgIDxpbmhlcml0cyBuYW1lPSdjb20uZ29vZ2xlLmdlcnJpdC5HZXJyaXRHd3RVSScvPgogICA8c2V0LXByb3BlcnR5IG5hbWU9InVzZXIuYWdlbnQiIHZhbHVlPSJzYWZhcmkiIC8+CiAgIDxzZXQtcHJvcGVydHkgbmFtZT0ibG9jYWxlIiB2YWx1ZT0iZGVmYXVsdCIgLz4KZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9HZXJyaXQuamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9HZXJyaXQuamF2YQppbmRleCA4ZmU2NThiLi45Mjc2YmExIDEwMDY0NAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvR2Vycml0LmphdmEKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L0dlcnJpdC5qYXZhCkBAIC00MiwxMCArNDIsMTMgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudERpZmZQcmVmZXJlbmNlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R2VuZXJhbFByZWZlcmVuY2VzOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BdXRoVHlwZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC5jb3JlLmNsaWVudC5DYWxsYmFjazsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC5jb3JlLmNsaWVudC5FbnRyeVBvaW50OwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmNvcmUuY2xpZW50LkdXVDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC5jb3JlLmNsaWVudC5KYXZhU2NyaXB0T2JqZWN0OworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmNvcmUuY2xpZW50LlNjcmlwdEluamVjdG9yOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmRvbS5jbGllbnQuQW5jaG9yRWxlbWVudDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC5kb20uY2xpZW50LkRvY3VtZW50OwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LmxvZ2ljYWwuc2hhcmVkLlZhbHVlQ2hhbmdlRXZlbnQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQubG9naWNhbC5zaGFyZWQuVmFsdWVDaGFuZ2VIYW5kbGVyOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0Lmh0dHAuY2xpZW50LlVSTDsKQEAgLTY3LDkgKzcwLDEyIEBACiBpbXBvcnQgY29tLmdvb2dsZS5nd3RleHB1aS5jbGlwcHkuY2xpZW50LkNvcHlhYmxlTGFiZWw7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3RleHB1aS51c2VyLmNsaWVudC5Vc2VyQWdlbnQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3RleHB1aS51c2VyLmNsaWVudC5WaWV3U2l0ZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dGpzb25ycGMuY2xpZW50LkNhbGxiYWNrSGFuZGxlOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0anNvbnJwYy5jbGllbnQuSnNvbkRlZlRhcmdldDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dGpzb25ycGMuY2xpZW50Lkpzb25VdGlsOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0anNvbnJwYy5jbGllbnQuWHNyZk1hbmFnZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nd3Rqc29ucnBjLmNsaWVudC5pbXBsLlJlc3VsdERlc2VyaWFsaXplcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dGpzb25ycGMuY29tbW9uLkFzeW5jQ2FsbGJhY2s7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uY2xpZW50LktleVV0aWw7CiAKIGltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OwpAQCAtMzcwLDcgKzM3Niw5IEBACiAKICAgICBmaW5hbCBIb3N0UGFnZURhdGFTZXJ2aWNlIGhwZCA9IEdXVC5jcmVhdGUoSG9zdFBhZ2VEYXRhU2VydmljZS5jbGFzcyk7CiAgICAgaHBkLmxvYWQobmV3IEdlcnJpdENhbGxiYWNrPEhvc3RQYWdlRGF0YT4oKSB7CisgICAgICBAT3ZlcnJpZGUKICAgICAgIHB1YmxpYyB2b2lkIG9uU3VjY2VzcyhmaW5hbCBIb3N0UGFnZURhdGEgcmVzdWx0KSB7CisgICAgICAgIERvY3VtZW50LmdldCgpLmdldEVsZW1lbnRCeUlkKCJnZXJyaXRfaG9zdHBhZ2VkYXRhIikucmVtb3ZlRnJvbVBhcmVudCgpOwogICAgICAgICBteUNvbmZpZyA9IHJlc3VsdC5jb25maWc7CiAgICAgICAgIG15VGhlbWUgPSByZXN1bHQudGhlbWU7CiAgICAgICAgIGlmIChyZXN1bHQuYWNjb3VudCAhPSBudWxsKSB7CkBAIC0zODEsNyArMzg5LDcgQEAKICAgICAgICAgICBteUFjY291bnREaWZmUHJlZiA9IHJlc3VsdC5hY2NvdW50RGlmZlByZWY7CiAgICAgICAgICAgYXBwbHlVc2VyUHJlZmVyZW5jZXMoKTsKICAgICAgICAgfQotICAgICAgICBvbk1vZHVsZUxvYWQyKCk7CisgICAgICAgIG9uTW9kdWxlTG9hZDIocmVzdWx0KTsKICAgICAgIH0KICAgICB9KTsKICAgfQpAQCAtNDYzLDcgKzQ3MSw3IEBACiAgICAgYnRtbWVudS5hZGQocG93ZXJlZEJ5KTsKICAgfQogCi0gIHByaXZhdGUgdm9pZCBvbk1vZHVsZUxvYWQyKCkgeworICBwcml2YXRlIHZvaWQgb25Nb2R1bGVMb2FkMihIb3N0UGFnZURhdGEgaHBkKSB7CiAgICAgUkVTT1VSQ0VTLmd3dF9vdmVycmlkZSgpLmVuc3VyZUluamVjdGVkKCk7CiAgICAgUkVTT1VSQ0VTLmNzcygpLmVuc3VyZUluamVjdGVkKCk7CiAKQEAgLTU0MSw2ICs1NDksNyBAQAogICAgIHJlZnJlc2hNZW51QmFyKCk7CiAKICAgICBIaXN0b3J5LmFkZFZhbHVlQ2hhbmdlSGFuZGxlcihuZXcgVmFsdWVDaGFuZ2VIYW5kbGVyPFN0cmluZz4oKSB7CisgICAgICBAT3ZlcnJpZGUKICAgICAgIHB1YmxpYyB2b2lkIG9uVmFsdWVDaGFuZ2UoZmluYWwgVmFsdWVDaGFuZ2VFdmVudDxTdHJpbmc+IGV2ZW50KSB7CiAgICAgICAgIGRpc3BsYXkoZXZlbnQuZ2V0VmFsdWUoKSk7CiAgICAgICB9CkBAIC01NTYsNyArNTY1LDUwIEBACiAgICAgaWYgKHNpZ25JbkFuY2hvciAhPSBudWxsKSB7CiAgICAgICBzaWduSW5BbmNob3Iuc2V0SHJlZihsb2dpblJlZGlyZWN0KHRva2VuKSk7CiAgICAgfQotICAgIGRpc3BsYXkodG9rZW4pOworICAgIGxvYWRQbHVnaW5zKGhwZCwgdG9rZW4pOworICB9CisKKyAgcHJpdmF0ZSB2b2lkIGxvYWRQbHVnaW5zKEhvc3RQYWdlRGF0YSBocGQsIGZpbmFsIFN0cmluZyB0b2tlbikgeworICAgIGlmIChocGQucGx1Z2lucyAhPSBudWxsKSB7CisgICAgICBmb3IgKGZpbmFsIFN0cmluZyB1cmwgOiBocGQucGx1Z2lucykgeworICAgICAgICBTY3JpcHRJbmplY3Rvci5mcm9tVXJsKHVybCkKKyAgICAgICAgICAgIC5zZXRXaW5kb3coU2NyaXB0SW5qZWN0b3IuVE9QX1dJTkRPVykKKyAgICAgICAgICAgIC5zZXRDYWxsYmFjayhuZXcgQ2FsbGJhY2s8Vm9pZCwgRXhjZXB0aW9uPigpIHsKKyAgICAgICAgICAgICAgQE92ZXJyaWRlCisgICAgICAgICAgICAgIHB1YmxpYyB2b2lkIG9uU3VjY2VzcyhWb2lkIHJlc3VsdCkgeworICAgICAgICAgICAgICB9CisKKyAgICAgICAgICAgICAgQE92ZXJyaWRlCisgICAgICAgICAgICAgIHB1YmxpYyB2b2lkIG9uRmFpbHVyZShFeGNlcHRpb24gcmVhc29uKSB7CisgICAgICAgICAgICAgICAgRXJyb3JEaWFsb2cgZCA9IG5ldyBFcnJvckRpYWxvZyhyZWFzb24pOworICAgICAgICAgICAgICAgIGQuc2V0VGl0bGUoTS5wbHVnaW5GYWlsZWQodXJsKSk7CisgICAgICAgICAgICAgICAgZC5jZW50ZXIoKTsKKyAgICAgICAgICAgICAgfQorICAgICAgICAgICAgfSkuaW5qZWN0KCk7CisgICAgICB9CisgICAgfQorCisgICAgQ2FsbGJhY2tIYW5kbGU8Vm9pZD4gY2IgPSBuZXcgQ2FsbGJhY2tIYW5kbGU8Vm9pZD4oCisgICAgICAgIG5ldyBSZXN1bHREZXNlcmlhbGl6ZXI8Vm9pZD4oKSB7CisgICAgICAgICAgQE92ZXJyaWRlCisgICAgICAgICAgcHVibGljIFZvaWQgZnJvbVJlc3VsdChKYXZhU2NyaXB0T2JqZWN0IHJlc3BvbnNlT2JqZWN0KSB7CisgICAgICAgICAgICByZXR1cm4gbnVsbDsKKyAgICAgICAgICB9CisgICAgICAgIH0sCisgICAgICAgIG5ldyBBc3luY0NhbGxiYWNrPFZvaWQ+KCkgeworICAgICAgICAgIEBPdmVycmlkZQorICAgICAgICAgIHB1YmxpYyB2b2lkIG9uRmFpbHVyZShUaHJvd2FibGUgY2F1Z2h0KSB7CisgICAgICAgICAgfQorCisgICAgICAgICAgQE92ZXJyaWRlCisgICAgICAgICAgcHVibGljIHZvaWQgb25TdWNjZXNzKFZvaWQgcmVzdWx0KSB7CisgICAgICAgICAgICBkaXNwbGF5KHRva2VuKTsKKyAgICAgICAgICB9CisgICAgICAgIH0pOworICAgIGNiLmluc3RhbGwoKTsKKyAgICBTY3JpcHRJbmplY3Rvci5mcm9tU3RyaW5nKGNiLmdldEZ1bmN0aW9uTmFtZSgpICsgIigpOyIpCisgICAgICAgIC5zZXRXaW5kb3coU2NyaXB0SW5qZWN0b3IuVE9QX1dJTkRPVykKKyAgICAgICAgLmluamVjdCgpOwogICB9CiAKICAgcHVibGljIHN0YXRpYyB2b2lkIHJlZnJlc2hNZW51QmFyKCkgewpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L0dlcnJpdENvbnN0YW50cy5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L0dlcnJpdENvbnN0YW50cy5qYXZhCmluZGV4IDg3YzAxY2MuLjMzMWNlYjYgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9HZXJyaXRDb25zdGFudHMuamF2YQorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvR2Vycml0Q29uc3RhbnRzLmphdmEKQEAgLTEwOCw0ICsxMDgsNiBAQAogCiAgIFN0cmluZyBwcm9qZWN0QWNjZXNzRXJyb3IoKTsKICAgU3RyaW5nIHByb2plY3RBY2Nlc3NQcm9wb3NlRm9yUmV2aWV3SGludCgpOworCisgIFN0cmluZyB1c2VyQ2Fubm90Vm90ZVRvb2xUaXAoKTsKIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9HZXJyaXRDb25zdGFudHMucHJvcGVydGllcyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9HZXJyaXRDb25zdGFudHMucHJvcGVydGllcwppbmRleCA1OTZiM2FkLi5lZjIzYzhkIDEwMDY0NAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvR2Vycml0Q29uc3RhbnRzLnByb3BlcnRpZXMKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L0dlcnJpdENvbnN0YW50cy5wcm9wZXJ0aWVzCkBAIC05MiwzICs5Miw1IEBACiAKIHByb2plY3RBY2Nlc3NFcnJvciA9IFlvdSBkb24ndCBoYXZlIHBlcm1pc3Npb25zIHRvIG1vZGlmeSB0aGUgYWNjZXNzIHJpZ2h0cyBmb3IgdGhlIGZvbGxvd2luZyByZWZzOgogcHJvamVjdEFjY2Vzc1Byb3Bvc2VGb3JSZXZpZXdIaW50ID0gWW91IG1heSBwcm9wb3NlIHRoZXNlIG1vZGlmaWNhdGlvbnMgdG8gdGhlIHByb2plY3Qgb3duZXJzIGJ5IGNsaWNraW5nIG9uICdTYXZlIGZvciBSZXZpZXcnLgorCit1c2VyQ2Fubm90Vm90ZVRvb2xUaXAgPSBVc2VyIGNhbm5vdCB2b3RlIGluIHRoaXMgY2F0ZWdvcnkKZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9HZXJyaXRDc3MuamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9HZXJyaXRDc3MuamF2YQppbmRleCA5Y2JmNWNkLi5jOWMyNDE2IDEwMDY0NAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvR2Vycml0Q3NzLmphdmEKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L0dlcnJpdENzcy5qYXZhCkBAIC0zNywxMiArMzcsMTIgQEAKICAgU3RyaW5nIGFwcHJvdmFsaGludCgpOwogICBTdHJpbmcgYXBwcm92YWxyb2xlKCk7CiAgIFN0cmluZyBhcHByb3ZhbHNjb3JlKCk7CisgIFN0cmluZyBub3RWb3RhYmxlKCk7CiAgIFN0cmluZyBibG9ja0hlYWRlcigpOwogICBTdHJpbmcgYm90dG9taGVhZGVyKCk7CiAgIFN0cmluZyBjQVBQUk9WQUwoKTsKICAgU3RyaW5nIGNJRCgpOwogICBTdHJpbmcgY0xhc3RVcGRhdGUoKTsKLSAgU3RyaW5nIGNQUk9KRUNUKCk7CiAgIFN0cmluZyBjU1VCSkVDVCgpOwogICBTdHJpbmcgY2hhbmdlQ29tbWVudHMoKTsKICAgU3RyaW5nIGNoYW5nZUluZm9CbG9jaygpOwpAQCAtNTksNiArNTksNyBAQAogICBTdHJpbmcgY29tbWVudENlbGwoKTsKICAgU3RyaW5nIGNvbW1lbnRFZGl0b3JQYW5lbCgpOwogICBTdHJpbmcgY29tbWVudEhvbGRlcigpOworICBTdHJpbmcgY29tbWVudEhvbGRlckxlZnRtb3N0KCk7CiAgIFN0cmluZyBjb21tZW50UGFuZWwoKTsKICAgU3RyaW5nIGNvbW1lbnRQYW5lbEJvcmRlcigpOwogICBTdHJpbmcgY29tbWVudFBhbmVsQXV0aG9yQ2VsbCgpOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L0dlcnJpdE1lc3NhZ2VzLmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvR2Vycml0TWVzc2FnZXMuamF2YQppbmRleCBhZWZhM2E1Li4xMmU3NDAyIDEwMDY0NAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvR2Vycml0TWVzc2FnZXMuamF2YQorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvR2Vycml0TWVzc2FnZXMuamF2YQpAQCAtMjIsNiArMjIsMTQgQEAKICAgU3RyaW5nIHBvd2VyZWRCeShTdHJpbmcgdmVyc2lvbik7CiAKICAgU3RyaW5nIG5vU3VjaEFjY291bnRNZXNzYWdlKFN0cmluZyB3aG8pOwotCiAgIFN0cmluZyBub1N1Y2hHcm91cE1lc3NhZ2UoU3RyaW5nIHdobyk7CisKKyAgU3RyaW5nIGJyYW5jaENyZWF0aW9uRmFpbGVkKFN0cmluZyBicmFuY2hOYW1lLCBTdHJpbmcgZXJyb3IpOworICBTdHJpbmcgaW52YWxpZEJyYW5jaE5hbWUoU3RyaW5nIGJyYW5jaE5hbWUpOworICBTdHJpbmcgaW52YWxpZFJldmlzaW9uKFN0cmluZyByZXZpc2lvbik7CisgIFN0cmluZyBicmFuY2hDcmVhdGlvbk5vdEFsbG93ZWRVbmRlclJlZm5hbWVQcmVmaXgoU3RyaW5nIHJlZm5hbWVQcmVmaXgpOworICBTdHJpbmcgYnJhbmNoQWxyZWFkeUV4aXN0cyhTdHJpbmcgYnJhbmNoTmFtZSk7CisgIFN0cmluZyBicmFuY2hDcmVhdGlvbkNvbmZsaWN0KFN0cmluZyBicmFuY2hOYW1lLCBTdHJpbmcgZXhpc3RpbmdCcmFuY2hOYW1lKTsKKworICBTdHJpbmcgcGx1Z2luRmFpbGVkKFN0cmluZyBzY3JpcHRQYXRoKTsKIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9HZXJyaXRNZXNzYWdlcy5wcm9wZXJ0aWVzIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L0dlcnJpdE1lc3NhZ2VzLnByb3BlcnRpZXMKaW5kZXggNzk3NzJiZC4uODRjZjQ3NiAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L0dlcnJpdE1lc3NhZ2VzLnByb3BlcnRpZXMKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L0dlcnJpdE1lc3NhZ2VzLnByb3BlcnRpZXMKQEAgLTMsNSArMywxMyBAQAogcG93ZXJlZEJ5ID0gUG93ZXJlZCBieSA8YSBocmVmPSJodHRwOi8vY29kZS5nb29nbGUuY29tL3AvZ2Vycml0LyIgdGFyZ2V0PSJfYmxhbmsiPkdlcnJpdCBDb2RlIFJldmlldzwvYT4gKHswfSkKIAogbm9TdWNoQWNjb3VudE1lc3NhZ2UgPSB7MH0gaXMgbm90IGEgcmVnaXN0ZXJlZCB1c2VyLgotCiBub1N1Y2hHcm91cE1lc3NhZ2UgPSBHcm91cCB7MH0gZG9lcyBub3QgZXhpc3Qgb3IgaXMgbm90IHZpc2libGUgdG8geW91LgorCiticmFuY2hDcmVhdGlvbkZhaWxlZCA9IENyZWF0aW5nIGJyYW5jaCB7MH0gZmFpbGVkLiBFcnJvcjogezF9CitpbnZhbGlkQnJhbmNoTmFtZSA9IFRoZSBicmFuY2ggbmFtZSB7MH0gaXMgbm90IHZhbGlkLgoraW52YWxpZFJldmlzaW9uID0gVGhlIHJldmlzaW9uIHswfSBpcyBub3QgdmFsaWQuCiticmFuY2hDcmVhdGlvbk5vdEFsbG93ZWRVbmRlclJlZm5hbWVQcmVmaXggPSBCcmFuY2ggY3JlYXRpb24gaXMgbm90IGFsbG93ZWQgdW5kZXIgezB9LgorYnJhbmNoQWxyZWFkeUV4aXN0cyA9IEEgYnJhbmNoIHdpdGggdGhlIG5hbWUgezB9IGFscmVhZHkgZXhpc3RzLgorYnJhbmNoQ3JlYXRpb25Db25mbGljdCA9IENhbm5vdCBjcmVhdGUgYnJhbmNoIHswfSBzaW5jZSBpdCBjb25mbGljdHMgd2l0aCBicmFuY2ggezF9LgorCitwbHVnaW5GYWlsZWQgPSBQbHVnaW4gSmF2YVNjcmlwdCB7MH0gZmFpbGVkIHRvIGxvYWQKZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hY2NvdW50L1JlZ2lzdGVyU2NyZWVuLmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYWNjb3VudC9SZWdpc3RlclNjcmVlbi5qYXZhCmluZGV4IDA4NGVhNmYuLjI4MTA5MzEgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hY2NvdW50L1JlZ2lzdGVyU2NyZWVuLmphdmEKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FjY291bnQvUmVnaXN0ZXJTY3JlZW4uamF2YQpAQCAtMTI1LDcgKzEyNSw3IEBACiAgICAgICBhZ3JlZW1lbnRHcm91cC5hZGQod2h5QWdyZWVtZW50KTsKIAogICAgICAgY2hvaWNlcy5hZGQobmV3IElubGluZUh5cGVybGluayhVdGlsLkMubmV3QWdyZWVtZW50KCksCi0gICAgICAgICAgUGFnZUxpbmtzLlNFVFRJTkdTX05FV19BR1JFRU1FTlQgKyAiLCIgKyBuZXh0VG9rZW4pKTsKKyAgICAgICAgICBQYWdlTGlua3MuU0VUVElOR1NfTkVXX0FHUkVFTUVOVCkpOwogICAgICAgY2hvaWNlcwogICAgICAgICAgIC5hZGQobmV3IElubGluZUh5cGVybGluayhVdGlsLkMud2VsY29tZUFncmVlbWVudExhdGVyKCksIG5leHRUb2tlbikpOwogICAgICAgZm9ybUJvZHkuYWRkKGFncmVlbWVudEdyb3VwKTsKZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hZG1pbi9BZG1pbkNvbnN0YW50cy5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FkbWluL0FkbWluQ29uc3RhbnRzLmphdmEKaW5kZXggMGMxODE2OS4uMzk2NmU5MyAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FkbWluL0FkbWluQ29uc3RhbnRzLmphdmEKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FkbWluL0FkbWluQ29uc3RhbnRzLmphdmEKQEAgLTY4LDYgKzY4LDcgQEAKICAgU3RyaW5nIHByb2plY3RTdWJtaXRUeXBlX0ZBU1RfRk9SV0FSRF9PTkxZKCk7CiAgIFN0cmluZyBwcm9qZWN0U3VibWl0VHlwZV9NRVJHRV9BTFdBWVMoKTsKICAgU3RyaW5nIHByb2plY3RTdWJtaXRUeXBlX01FUkdFX0lGX05FQ0VTU0FSWSgpOworICBTdHJpbmcgcHJvamVjdFN1Ym1pdFR5cGVfUkVCQVNFX0lGX05FQ0VTU0FSWSgpOwogICBTdHJpbmcgcHJvamVjdFN1Ym1pdFR5cGVfQ0hFUlJZX1BJQ0soKTsKIAogICBTdHJpbmcgcHJvamVjdFN0YXRlX0FDVElWRSgpOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FkbWluL0FkbWluQ29uc3RhbnRzLnByb3BlcnRpZXMgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYWRtaW4vQWRtaW5Db25zdGFudHMucHJvcGVydGllcwppbmRleCAzZmYzZjQzLi42NzM3YzU4IDEwMDY0NAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYWRtaW4vQWRtaW5Db25zdGFudHMucHJvcGVydGllcworKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYWRtaW4vQWRtaW5Db25zdGFudHMucHJvcGVydGllcwpAQCAtNDYsNiArNDYsNyBAQAogCiBwcm9qZWN0U3VibWl0VHlwZV9GQVNUX0ZPUldBUkRfT05MWSA9IEZhc3QgRm9yd2FyZCBPbmx5CiBwcm9qZWN0U3VibWl0VHlwZV9NRVJHRV9JRl9ORUNFU1NBUlkgPSBNZXJnZSBJZiBOZWNlc3NhcnkKK3Byb2plY3RTdWJtaXRUeXBlX1JFQkFTRV9JRl9ORUNFU1NBUlkgPSBSZWJhc2UgSWYgTmVjZXNzYXJ5CiBwcm9qZWN0U3VibWl0VHlwZV9NRVJHRV9BTFdBWVMgPSBBbHdheXMgTWVyZ2UKIHByb2plY3RTdWJtaXRUeXBlX0NIRVJSWV9QSUNLID0gQ2hlcnJ5IFBpY2sKIApAQCAtMTEzLDYgKzExNCw3IEBACiAJcHVzaFRhZywgXAogCXJlYWQsIFwKIAlyZWJhc2UsIFwKKwlyZW1vdmVSZXZpZXdlciwgXAogCXN1Ym1pdAogYWJhbmRvbiA9IEFiYW5kb24KIGNyZWF0ZSA9IENyZWF0ZSBSZWZlcmVuY2UKQEAgLTEyNSw2ICsxMjcsNyBAQAogcHVzaFRhZyA9IFB1c2ggQW5ub3RhdGVkIFRhZwogcmVhZCA9IFJlYWQKIHJlYmFzZSA9IFJlYmFzZQorcmVtb3ZlUmV2aWV3ZXIgPSBSZW1vdmUgUmV2aWV3ZXIKIHN1Ym1pdCA9IFN1Ym1pdAogCiByZWZFcnJvckVtcHR5ID0gUmVmZXJlbmNlIG11c3QgYmUgc3VwcGxpZWQKZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hZG1pbi9Qcm9qZWN0QnJhbmNoZXNTY3JlZW4uamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hZG1pbi9Qcm9qZWN0QnJhbmNoZXNTY3JlZW4uamF2YQppbmRleCA1NmQ5NDE3Li44YWVmYjliIDEwMDY0NAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYWRtaW4vUHJvamVjdEJyYW5jaGVzU2NyZWVuLmphdmEKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FkbWluL1Byb2plY3RCcmFuY2hlc1NjcmVlbi5qYXZhCkBAIC0yNCw5ICsyNCw4IEBACiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnVpLkJyYW5jaExpbms7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnVpLkZhbmN5RmxleFRhYmxlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aS5IaW50VGV4dEJveDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5BZGRCcmFuY2hSZXN1bHQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuTGlzdEJyYW5jaGVzUmVzdWx0OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5lcnJvcnMuSW52YWxpZE5hbWVFeGNlcHRpb247Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmVycm9ycy5JbnZhbGlkUmV2aXNpb25FeGNlcHRpb247CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkJyYW5jaDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQ2hhbmdlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5Qcm9qZWN0OwpAQCAtNDQsOSArNDMsOSBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkZsb3dQYW5lbDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5HcmlkOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkxhYmVsOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLlRleHRCb3g7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuVmVydGljYWxQYW5lbDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dGV4cHVpLnNhZmVodG1sLmNsaWVudC5TYWZlSHRtbEJ1aWxkZXI7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3Rqc29ucnBjLmNsaWVudC5SZW1vdGVKc29uRXhjZXB0aW9uOwogCiBpbXBvcnQgamF2YS51dGlsLkhhc2hTZXQ7CiBpbXBvcnQgamF2YS51dGlsLkxpc3Q7CkBAIC0xNjQsMTMgKzE2MywxMyBAQAogICB9CiAKICAgcHJpdmF0ZSB2b2lkIGRvQWRkTmV3QnJhbmNoKCkgewotICAgIFN0cmluZyBicmFuY2hOYW1lID0gbmFtZVR4dEJveC5nZXRUZXh0KCk7CisgICAgZmluYWwgU3RyaW5nIGJyYW5jaE5hbWUgPSBuYW1lVHh0Qm94LmdldFRleHQoKTsKICAgICBpZiAoIiIuZXF1YWxzKGJyYW5jaE5hbWUpKSB7CiAgICAgICBuYW1lVHh0Qm94LnNldEZvY3VzKHRydWUpOwogICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIFN0cmluZyByZXYgPSBpcmV2VHh0Qm94LmdldFRleHQoKTsKKyAgICBmaW5hbCBTdHJpbmcgcmV2ID0gaXJldlR4dEJveC5nZXRUZXh0KCk7CiAgICAgaWYgKCIiLmVxdWFscyhyZXYpKSB7CiAgICAgICBpcmV2VHh0Qm94LnNldFRleHQoIkhFQUQiKTsKICAgICAgIFNjaGVkdWxlci5nZXQoKS5zY2hlZHVsZURlZmVycmVkKG5ldyBTY2hlZHVsZWRDb21tYW5kKCkgewpAQCAtMTgzLDQxICsxODIsNzAgQEAKICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBpZiAoIWJyYW5jaE5hbWUuc3RhcnRzV2l0aChCcmFuY2guUl9SRUZTKSkgewotICAgICAgYnJhbmNoTmFtZSA9IEJyYW5jaC5SX0hFQURTICsgYnJhbmNoTmFtZTsKLSAgICB9Ci0KICAgICBhZGRCcmFuY2guc2V0RW5hYmxlZChmYWxzZSk7CiAgICAgVXRpbC5QUk9KRUNUX1NWQy5hZGRCcmFuY2goZ2V0UHJvamVjdEtleSgpLCBicmFuY2hOYW1lLCByZXYsCi0gICAgICAgIG5ldyBHZXJyaXRDYWxsYmFjazxMaXN0QnJhbmNoZXNSZXN1bHQ+KCkgewotICAgICAgICAgIHB1YmxpYyB2b2lkIG9uU3VjY2VzcyhmaW5hbCBMaXN0QnJhbmNoZXNSZXN1bHQgcmVzdWx0KSB7CisgICAgICAgIG5ldyBHZXJyaXRDYWxsYmFjazxBZGRCcmFuY2hSZXN1bHQ+KCkgeworICAgICAgICAgIHB1YmxpYyB2b2lkIG9uU3VjY2VzcyhmaW5hbCBBZGRCcmFuY2hSZXN1bHQgcmVzdWx0KSB7CiAgICAgICAgICAgICBhZGRCcmFuY2guc2V0RW5hYmxlZCh0cnVlKTsKLSAgICAgICAgICAgIG5hbWVUeHRCb3guc2V0VGV4dCgiIik7Ci0gICAgICAgICAgICBpcmV2VHh0Qm94LnNldFRleHQoIiIpOwotICAgICAgICAgICAgZGlzcGxheShyZXN1bHQuZ2V0QnJhbmNoZXMoKSk7CisgICAgICAgICAgICBpZiAoIXJlc3VsdC5oYXNFcnJvcigpKSB7CisgICAgICAgICAgICAgIG5hbWVUeHRCb3guc2V0VGV4dCgiIik7CisgICAgICAgICAgICAgIGlyZXZUeHRCb3guc2V0VGV4dCgiIik7CisgICAgICAgICAgICAgIGRpc3BsYXkocmVzdWx0LmdldExpc3RCcmFuY2hlc1Jlc3VsdCgpLmdldEJyYW5jaGVzKCkpOworICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgZmluYWwgQWRkQnJhbmNoUmVzdWx0LkVycm9yIGVycm9yID0gcmVzdWx0LmdldEVycm9yKCk7CisgICAgICAgICAgICAgIGZpbmFsIFN0cmluZyBtc2c7CisgICAgICAgICAgICAgIHN3aXRjaCAoZXJyb3IuZ2V0VHlwZSgpKSB7CisgICAgICAgICAgICAgICAgY2FzZSBJTlZBTElEX05BTUU6CisgICAgICAgICAgICAgICAgICBzZWxlY3RBbGxBbmRGb2N1cyhuYW1lVHh0Qm94KTsKKyAgICAgICAgICAgICAgICAgIG1zZyA9IEdlcnJpdC5NLmludmFsaWRCcmFuY2hOYW1lKGJyYW5jaE5hbWUpOworICAgICAgICAgICAgICAgICAgYnJlYWs7CisKKyAgICAgICAgICAgICAgICBjYXNlIElOVkFMSURfUkVWSVNJT046CisgICAgICAgICAgICAgICAgICBzZWxlY3RBbGxBbmRGb2N1cyhpcmV2VHh0Qm94KTsKKyAgICAgICAgICAgICAgICAgIG1zZyA9IEdlcnJpdC5NLmludmFsaWRSZXZpc2lvbihyZXYpOworICAgICAgICAgICAgICAgICAgYnJlYWs7CisKKyAgICAgICAgICAgICAgICBjYXNlIEJSQU5DSF9DUkVBVElPTl9OT1RfQUxMT1dFRF9VTkRFUl9SRUZOQU1FX1BSRUZJWDoKKyAgICAgICAgICAgICAgICAgIHNlbGVjdEFsbEFuZEZvY3VzKG5hbWVUeHRCb3gpOworICAgICAgICAgICAgICAgICAgbXNnID0KKyAgICAgICAgICAgICAgICAgICAgICBHZXJyaXQuTS5icmFuY2hDcmVhdGlvbk5vdEFsbG93ZWRVbmRlclJlZm5hbWVQcmVmaXgoZXJyb3IKKyAgICAgICAgICAgICAgICAgICAgICAgICAgLmdldFJlZm5hbWUoKSk7CisgICAgICAgICAgICAgICAgICBicmVhazsKKworICAgICAgICAgICAgICAgIGNhc2UgQlJBTkNIX0FMUkVBRFlfRVhJU1RTOgorICAgICAgICAgICAgICAgICAgc2VsZWN0QWxsQW5kRm9jdXMobmFtZVR4dEJveCk7CisgICAgICAgICAgICAgICAgICBtc2cgPSBHZXJyaXQuTS5icmFuY2hBbHJlYWR5RXhpc3RzKGVycm9yLmdldFJlZm5hbWUoKSk7CisgICAgICAgICAgICAgICAgICBicmVhazsKKworICAgICAgICAgICAgICAgIGNhc2UgQlJBTkNIX0NSRUFUSU9OX0NPTkZMSUNUOgorICAgICAgICAgICAgICAgICAgc2VsZWN0QWxsQW5kRm9jdXMobmFtZVR4dEJveCk7CisgICAgICAgICAgICAgICAgICBtc2cgPQorICAgICAgICAgICAgICAgICAgICAgIEdlcnJpdC5NLmJyYW5jaENyZWF0aW9uQ29uZmxpY3QoYnJhbmNoTmFtZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgZXJyb3IuZ2V0UmVmbmFtZSgpKTsKKyAgICAgICAgICAgICAgICAgIGJyZWFrOworCisgICAgICAgICAgICAgICAgZGVmYXVsdDoKKyAgICAgICAgICAgICAgICAgIG1zZyA9CisgICAgICAgICAgICAgICAgICAgICAgR2Vycml0Lk0uYnJhbmNoQ3JlYXRpb25GYWlsZWQoYnJhbmNoTmFtZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgZXJyb3IudG9TdHJpbmcoKSk7CisgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgbmV3IEVycm9yRGlhbG9nKG1zZykuY2VudGVyKCk7CisgICAgICAgICAgICB9CiAgICAgICAgICAgfQogCiAgICAgICAgICAgQE92ZXJyaWRlCiAgICAgICAgICAgcHVibGljIHZvaWQgb25GYWlsdXJlKGZpbmFsIFRocm93YWJsZSBjYXVnaHQpIHsKLSAgICAgICAgICAgIGlmIChjYXVnaHQgaW5zdGFuY2VvZiBJbnZhbGlkTmFtZUV4Y2VwdGlvbgotICAgICAgICAgICAgICAgIHx8IGNhdWdodCBpbnN0YW5jZW9mIFJlbW90ZUpzb25FeGNlcHRpb24KLSAgICAgICAgICAgICAgICAmJiBjYXVnaHQuZ2V0TWVzc2FnZSgpLmVxdWFscyhJbnZhbGlkTmFtZUV4Y2VwdGlvbi5NRVNTQUdFKSkgewotICAgICAgICAgICAgICBuYW1lVHh0Qm94LnNlbGVjdEFsbCgpOwotICAgICAgICAgICAgICBuYW1lVHh0Qm94LnNldEZvY3VzKHRydWUpOwotCi0gICAgICAgICAgICB9IGVsc2UgaWYgKGNhdWdodCBpbnN0YW5jZW9mIEludmFsaWRSZXZpc2lvbkV4Y2VwdGlvbgotICAgICAgICAgICAgICAgIHx8IGNhdWdodCBpbnN0YW5jZW9mIFJlbW90ZUpzb25FeGNlcHRpb24KLSAgICAgICAgICAgICAgICAmJiBjYXVnaHQuZ2V0TWVzc2FnZSgpLmVxdWFscyhJbnZhbGlkUmV2aXNpb25FeGNlcHRpb24uTUVTU0FHRSkpIHsKLSAgICAgICAgICAgICAgaXJldlR4dEJveC5zZWxlY3RBbGwoKTsKLSAgICAgICAgICAgICAgaXJldlR4dEJveC5zZXRGb2N1cyh0cnVlKTsKLSAgICAgICAgICAgIH0KLQogICAgICAgICAgICAgYWRkQnJhbmNoLnNldEVuYWJsZWQodHJ1ZSk7CiAgICAgICAgICAgICBzdXBlci5vbkZhaWx1cmUoY2F1Z2h0KTsKICAgICAgICAgICB9CiAgICAgICAgIH0pOwogICB9CiAKKyAgcHJpdmF0ZSBzdGF0aWMgdm9pZCBzZWxlY3RBbGxBbmRGb2N1cyhmaW5hbCBUZXh0Qm94IHRleHRCb3gpIHsKKyAgICB0ZXh0Qm94LnNlbGVjdEFsbCgpOworICAgIHRleHRCb3guc2V0Rm9jdXModHJ1ZSk7CisgIH0KKwogICBwcml2YXRlIGNsYXNzIEJyYW5jaGVzVGFibGUgZXh0ZW5kcyBGYW5jeUZsZXhUYWJsZTxCcmFuY2g+IHsKICAgICBib29sZWFuIGNhbkRlbGV0ZTsKIApkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FkbWluL1V0aWwuamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hZG1pbi9VdGlsLmphdmEKaW5kZXggYWE1YjdiNi4uNGY4ZGQ5OSAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FkbWluL1V0aWwuamF2YQorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYWRtaW4vVXRpbC5qYXZhCkBAIC00NSw2ICs0NSw4IEBACiAgICAgICAgIHJldHVybiBDLnByb2plY3RTdWJtaXRUeXBlX0ZBU1RfRk9SV0FSRF9PTkxZKCk7CiAgICAgICBjYXNlIE1FUkdFX0lGX05FQ0VTU0FSWToKICAgICAgICAgcmV0dXJuIEMucHJvamVjdFN1Ym1pdFR5cGVfTUVSR0VfSUZfTkVDRVNTQVJZKCk7CisgICAgICBjYXNlIFJFQkFTRV9JRl9ORUNFU1NBUlk6CisgICAgICAgIHJldHVybiBDLnByb2plY3RTdWJtaXRUeXBlX1JFQkFTRV9JRl9ORUNFU1NBUlkoKTsKICAgICAgIGNhc2UgTUVSR0VfQUxXQVlTOgogICAgICAgICByZXR1cm4gQy5wcm9qZWN0U3VibWl0VHlwZV9NRVJHRV9BTFdBWVMoKTsKICAgICAgIGNhc2UgQ0hFUlJZX1BJQ0s6CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9BcHByb3ZhbFRhYmxlLmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9BcHByb3ZhbFRhYmxlLmphdmEKaW5kZXggNzMwMzZmZi4uMzg5MWVkZCAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvQXBwcm92YWxUYWJsZS5qYXZhCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9jaGFuZ2VzL0FwcHJvdmFsVGFibGUuamF2YQpAQCAtMzk3LDYgKzM5NywxMCBAQAogCiAgICAgZm9yIChTdHJpbmcgbGFiZWxOYW1lIDogY29sdW1ucykgewogICAgICAgZm10LnNldFN0eWxlTmFtZShyb3csIGNvbCwgR2Vycml0LlJFU09VUkNFUy5jc3MoKS5hcHByb3ZhbHNjb3JlKCkpOworICAgICAgaWYgKCFhZC5jYW5Wb3RlKGxhYmVsTmFtZSkpIHsKKyAgICAgICAgZm10LmFkZFN0eWxlTmFtZShyb3csIGNvbCwgR2Vycml0LlJFU09VUkNFUy5jc3MoKS5ub3RWb3RhYmxlKCkpOworICAgICAgICBmbXQuZ2V0RWxlbWVudChyb3csIGNvbCkuc2V0VGl0bGUoR2Vycml0LkMudXNlckNhbm5vdFZvdGVUb29sVGlwKCkpOworICAgICAgfQogCiAgICAgICBpZiAoYWQuaXNSZWplY3RlZChsYWJlbE5hbWUpKSB7CiAgICAgICAgIHRhYmxlLnNldFdpZGdldChyb3csIGNvbCwgbmV3IEltYWdlKEdlcnJpdC5SRVNPVVJDRVMucmVkTm90KCkpKTsKZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9jaGFuZ2VzL0NoYW5nZUNvbnN0YW50cy5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvQ2hhbmdlQ29uc3RhbnRzLmphdmEKaW5kZXggZDQyOTkyZi4uMjBkM2ZlYSAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvQ2hhbmdlQ29uc3RhbnRzLmphdmEKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvQ2hhbmdlQ29uc3RhbnRzLmphdmEKQEAgLTk1LDYgKzk1LDcgQEAKICAgU3RyaW5nIGNoYW5nZUluZm9CbG9ja1VwbG9hZGVkKCk7CiAgIFN0cmluZyBjaGFuZ2VJbmZvQmxvY2tVcGRhdGVkKCk7CiAgIFN0cmluZyBjaGFuZ2VJbmZvQmxvY2tTdGF0dXMoKTsKKyAgU3RyaW5nIGNoYW5nZUluZm9CbG9ja1N1Ym1pdFR5cGUoKTsKICAgU3RyaW5nIGNoYW5nZVBlcm1hbGluaygpOwogICBTdHJpbmcgY2hhbmdlSW5mb0Jsb2NrQ2FuTWVyZ2UoKTsKICAgU3RyaW5nIGNoYW5nZUluZm9CbG9ja0Nhbk1lcmdlWWVzKCk7CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9DaGFuZ2VDb25zdGFudHMucHJvcGVydGllcyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9jaGFuZ2VzL0NoYW5nZUNvbnN0YW50cy5wcm9wZXJ0aWVzCmluZGV4IDhjZWI3NGMuLjU2ZjYyMTkgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9jaGFuZ2VzL0NoYW5nZUNvbnN0YW50cy5wcm9wZXJ0aWVzCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9jaGFuZ2VzL0NoYW5nZUNvbnN0YW50cy5wcm9wZXJ0aWVzCkBAIC03Miw2ICs3Miw3IEBACiBjaGFuZ2VJbmZvQmxvY2tVcGxvYWRlZCA9IFVwbG9hZGVkCiBjaGFuZ2VJbmZvQmxvY2tVcGRhdGVkID0gVXBkYXRlZAogY2hhbmdlSW5mb0Jsb2NrU3RhdHVzID0gU3RhdHVzCitjaGFuZ2VJbmZvQmxvY2tTdWJtaXRUeXBlID0gU3VibWl0IFR5cGUKIGNoYW5nZVBlcm1hbGluayA9IFBlcm1hbGluawogY2hhbmdlSW5mb0Jsb2NrQ2FuTWVyZ2UgPSBDYW4gTWVyZ2UKIGNoYW5nZUluZm9CbG9ja0Nhbk1lcmdlWWVzID0gWWVzCmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9DaGFuZ2VEZXNjcmlwdGlvbkJsb2NrLmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9DaGFuZ2VEZXNjcmlwdGlvbkJsb2NrLmphdmEKaW5kZXggYzhiMmE2Ni4uMzJkOTJmZSAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvQ2hhbmdlRGVzY3JpcHRpb25CbG9jay5qYXZhCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9jaGFuZ2VzL0NoYW5nZURlc2NyaXB0aW9uQmxvY2suamF2YQpAQCAtMTUsNiArMTUsNyBAQAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuY2hhbmdlczsKIAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkFjY291bnRJbmZvQ2FjaGU7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuU3VibWl0VHlwZVJlY29yZDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQ2hhbmdlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldEluZm87CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuQ29tcG9zaXRlOwpAQCAtMzYsOCArMzcsOCBAQAogICB9CiAKICAgcHVibGljIHZvaWQgZGlzcGxheShDaGFuZ2UgY2hnLCBCb29sZWFuIHN0YXJyZWQsIFBhdGNoU2V0SW5mbyBpbmZvLAotICAgICAgZmluYWwgQWNjb3VudEluZm9DYWNoZSBhY2MpIHsKLSAgICBpbmZvQmxvY2suZGlzcGxheShjaGcsIGFjYyk7CisgICAgICBmaW5hbCBBY2NvdW50SW5mb0NhY2hlIGFjYywgU3VibWl0VHlwZVJlY29yZCBzdWJtaXRUeXBlUmVjb3JkKSB7CisgICAgaW5mb0Jsb2NrLmRpc3BsYXkoY2hnLCBhY2MsIHN1Ym1pdFR5cGVSZWNvcmQpOwogICAgIG1lc3NhZ2VCbG9jay5kaXNwbGF5KGNoZy5nZXRJZCgpLCBzdGFycmVkLCBpbmZvLmdldE1lc3NhZ2UoKSk7CiAgIH0KIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9jaGFuZ2VzL0NoYW5nZUluZm9CbG9jay5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvQ2hhbmdlSW5mb0Jsb2NrLmphdmEKaW5kZXggM2ZmYWNjMy4uYzQyY2E4ZCAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvQ2hhbmdlSW5mb0Jsb2NrLmphdmEKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvQ2hhbmdlSW5mb0Jsb2NrLmphdmEKQEAgLTIxLDYgKzIxLDcgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQudWkuQnJhbmNoTGluazsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQudWkuUHJvamVjdExpbms7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQWNjb3VudEluZm9DYWNoZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5TdWJtaXRUeXBlUmVjb3JkOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5CcmFuY2g7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZTsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5Db21wb3NpdGU7CkBAIC0zNiw5ICszNywxMCBAQAogICBwcml2YXRlIHN0YXRpYyBmaW5hbCBpbnQgUl9UT1BJQyA9IDQ7CiAgIHByaXZhdGUgc3RhdGljIGZpbmFsIGludCBSX1VQTE9BREVEID0gNTsKICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgaW50IFJfVVBEQVRFRCA9IDY7Ci0gIHByaXZhdGUgc3RhdGljIGZpbmFsIGludCBSX1NUQVRVUyA9IDc7Ci0gIHByaXZhdGUgc3RhdGljIGZpbmFsIGludCBSX01FUkdFX1RFU1QgPSA4OwotICBwcml2YXRlIHN0YXRpYyBmaW5hbCBpbnQgUl9DTlQgPSA5OworICBwcml2YXRlIHN0YXRpYyBmaW5hbCBpbnQgUl9TVUJNSVRfVFlQRSA9IDc7CisgIHByaXZhdGUgc3RhdGljIGZpbmFsIGludCBSX1NUQVRVUyA9IDg7CisgIHByaXZhdGUgc3RhdGljIGZpbmFsIGludCBSX01FUkdFX1RFU1QgPSA5OworICBwcml2YXRlIHN0YXRpYyBmaW5hbCBpbnQgUl9DTlQgPSAxMDsKIAogICBwcml2YXRlIGZpbmFsIEdyaWQgdGFibGU7CiAKQEAgLTU5LDYgKzYxLDcgQEAKICAgICBpbml0Um93KFJfVVBMT0FERUQsIFV0aWwuQy5jaGFuZ2VJbmZvQmxvY2tVcGxvYWRlZCgpKTsKICAgICBpbml0Um93KFJfVVBEQVRFRCwgVXRpbC5DLmNoYW5nZUluZm9CbG9ja1VwZGF0ZWQoKSk7CiAgICAgaW5pdFJvdyhSX1NUQVRVUywgVXRpbC5DLmNoYW5nZUluZm9CbG9ja1N0YXR1cygpKTsKKyAgICBpbml0Um93KFJfU1VCTUlUX1RZUEUsIFV0aWwuQy5jaGFuZ2VJbmZvQmxvY2tTdWJtaXRUeXBlKCkpOwogICAgIGlmIChHZXJyaXQuZ2V0Q29uZmlnKCkudGVzdENoYW5nZU1lcmdlKCkpIHsKICAgICAgIGluaXRSb3coUl9NRVJHRV9URVNULCBVdGlsLkMuY2hhbmdlSW5mb0Jsb2NrQ2FuTWVyZ2UoKSk7CiAgICAgfQpAQCAtNzcsNyArODAsOCBAQAogICAgIHRhYmxlLmdldENlbGxGb3JtYXR0ZXIoKS5hZGRTdHlsZU5hbWUocm93LCAwLCBHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmhlYWRlcigpKTsKICAgfQogCi0gIHB1YmxpYyB2b2lkIGRpc3BsYXkoZmluYWwgQ2hhbmdlIGNoZywgZmluYWwgQWNjb3VudEluZm9DYWNoZSBhY2MpIHsKKyAgcHVibGljIHZvaWQgZGlzcGxheShmaW5hbCBDaGFuZ2UgY2hnLCBmaW5hbCBBY2NvdW50SW5mb0NhY2hlIGFjYywKKyAgICAgIFN1Ym1pdFR5cGVSZWNvcmQgc3VibWl0VHlwZVJlY29yZCkgewogICAgIGZpbmFsIEJyYW5jaC5OYW1lS2V5IGRzdCA9IGNoZy5nZXREZXN0KCk7CiAKICAgICBDb3B5YWJsZUxhYmVsIGNoYW5nZUlkTGFiZWwgPQpAQCAtOTQsNiArOTgsMTQgQEAKICAgICB0YWJsZS5zZXRUZXh0KFJfVVBMT0FERUQsIDEsIG1lZGl1bUZvcm1hdChjaGcuZ2V0Q3JlYXRlZE9uKCkpKTsKICAgICB0YWJsZS5zZXRUZXh0KFJfVVBEQVRFRCwgMSwgbWVkaXVtRm9ybWF0KGNoZy5nZXRMYXN0VXBkYXRlZE9uKCkpKTsKICAgICB0YWJsZS5zZXRUZXh0KFJfU1RBVFVTLCAxLCBVdGlsLnRvTG9uZ1N0cmluZyhjaGcuZ2V0U3RhdHVzKCkpKTsKKyAgICBTdHJpbmcgc3VibWl0VHlwZTsKKyAgICBpZiAoc3VibWl0VHlwZVJlY29yZC5zdGF0dXMgPT0gU3VibWl0VHlwZVJlY29yZC5TdGF0dXMuT0spIHsKKyAgICAgIHN1Ym1pdFR5cGUgPSBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuYWRtaW4uVXRpbAorICAgICAgICAgICAgICAudG9Mb25nU3RyaW5nKHN1Ym1pdFR5cGVSZWNvcmQudHlwZSk7CisgICAgfSBlbHNlIHsKKyAgICAgIHN1Ym1pdFR5cGUgPSBzdWJtaXRUeXBlUmVjb3JkLnN0YXR1cy5uYW1lKCk7CisgICAgfQorICAgIHRhYmxlLnNldFRleHQoUl9TVUJNSVRfVFlQRSwgMSwgc3VibWl0VHlwZSk7CiAgICAgZmluYWwgQ2hhbmdlLlN0YXR1cyBzdGF0dXMgPSBjaGcuZ2V0U3RhdHVzKCk7CiAgICAgaWYgKEdlcnJpdC5nZXRDb25maWcoKS50ZXN0Q2hhbmdlTWVyZ2UoKSkgewogICAgICAgaWYgKHN0YXR1cy5lcXVhbHMoQ2hhbmdlLlN0YXR1cy5ORVcpIHx8IHN0YXR1cy5lcXVhbHMoQ2hhbmdlLlN0YXR1cy5EUkFGVCkpIHsKZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9jaGFuZ2VzL0NoYW5nZVNjcmVlbi5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvQ2hhbmdlU2NyZWVuLmphdmEKaW5kZXggNGRkNmIwMy4uNTg2OGJlNCAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvQ2hhbmdlU2NyZWVuLmphdmEKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvQ2hhbmdlU2NyZWVuLmphdmEKQEAgLTI4Miw3ICsyODIsNyBAQAogICAgIGRlc2NyaXB0aW9uQmxvY2suZGlzcGxheShkZXRhaWwuZ2V0Q2hhbmdlKCksCiAgICAgICAgIGRldGFpbC5pc1N0YXJyZWQoKSwKICAgICAgICAgZGV0YWlsLmdldEN1cnJlbnRQYXRjaFNldERldGFpbCgpLmdldEluZm8oKSwKLSAgICAgICAgZGV0YWlsLmdldEFjY291bnRzKCkpOworICAgICAgICBkZXRhaWwuZ2V0QWNjb3VudHMoKSwgZGV0YWlsLmdldFN1Ym1pdFR5cGVSZWNvcmQoKSk7CiAgICAgZGVwZW5kc09uLmRpc3BsYXkoZGV0YWlsLmdldERlcGVuZHNPbigpKTsKICAgICBuZWVkZWRCeS5kaXNwbGF5KGRldGFpbC5nZXROZWVkZWRCeSgpKTsKICAgICBhcHByb3ZhbHMuZGlzcGxheShkZXRhaWwpOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvQ2hhbmdlVGFibGUuamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9jaGFuZ2VzL0NoYW5nZVRhYmxlLmphdmEKaW5kZXggZWY0ZWY1Mi4uN2M2YTM2ZCAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvQ2hhbmdlVGFibGUuamF2YQorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9DaGFuZ2VUYWJsZS5qYXZhCkBAIC0xODMsOCArMTgzLDYgQEAKICAgICB9CiAgICAgZm10LmFkZFN0eWxlTmFtZShyb3csIENfSUQsIEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuY0lEKCkpOwogICAgIGZtdC5hZGRTdHlsZU5hbWUocm93LCBDX1NVQkpFQ1QsIEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuY1NVQkpFQ1QoKSk7Ci0gICAgZm10LmFkZFN0eWxlTmFtZShyb3csIENfUFJPSkVDVCwgR2Vycml0LlJFU09VUkNFUy5jc3MoKS5jUFJPSkVDVCgpKTsKLSAgICBmbXQuYWRkU3R5bGVOYW1lKHJvdywgQ19CUkFOQ0gsIEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuY1BST0pFQ1QoKSk7CiAgICAgZm10LmFkZFN0eWxlTmFtZShyb3csIENfTEFTVF9VUERBVEUsIEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuY0xhc3RVcGRhdGUoKSk7CiAgICAgZm9yIChpbnQgaSA9IEJBU0VfQ09MVU1OUzsgaSA8IGNvbHVtbnM7IGkrKykgewogICAgICAgZm10LmFkZFN0eWxlTmFtZShyb3csIGksIEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuY0FQUFJPVkFMKCkpOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvQ2hhbmdlVGFibGUyLmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9DaGFuZ2VUYWJsZTIuamF2YQppbmRleCAwZGQwYjBmLi5hYTkxYWYwIDEwMDY0NAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9DaGFuZ2VUYWJsZTIuamF2YQorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9DaGFuZ2VUYWJsZTIuamF2YQpAQCAtMTQxLDggKzE0MSw2IEBACiAgICAgfQogICAgIGZtdC5hZGRTdHlsZU5hbWUocm93LCBDX0lELCBHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmNJRCgpKTsKICAgICBmbXQuYWRkU3R5bGVOYW1lKHJvdywgQ19TVUJKRUNULCBHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmNTVUJKRUNUKCkpOwotICAgIGZtdC5hZGRTdHlsZU5hbWUocm93LCBDX1BST0pFQ1QsIEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuY1BST0pFQ1QoKSk7Ci0gICAgZm10LmFkZFN0eWxlTmFtZShyb3csIENfQlJBTkNILCBHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmNQUk9KRUNUKCkpOwogICAgIGZtdC5hZGRTdHlsZU5hbWUocm93LCBDX0xBU1RfVVBEQVRFLCBHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmNMYXN0VXBkYXRlKCkpOwogICAgIGZvciAoaW50IGkgPSBCQVNFX0NPTFVNTlM7IGkgPCBjb2x1bW5zOyBpKyspIHsKICAgICAgIGZtdC5hZGRTdHlsZU5hbWUocm93LCBpLCBHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmNBUFBST1ZBTCgpKTsKZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9jaGFuZ2VzL1B1Ymxpc2hDb21tZW50U2NyZWVuLmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9QdWJsaXNoQ29tbWVudFNjcmVlbi5qYXZhCmluZGV4IDQ3MDVhYWQuLmY5ZDAzNmEgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9jaGFuZ2VzL1B1Ymxpc2hDb21tZW50U2NyZWVuLmphdmEKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvUHVibGlzaENvbW1lbnRTY3JlZW4uamF2YQpAQCAtMjc0LDcgKzI3NCw4IEBACiAgIHByaXZhdGUgdm9pZCBkaXNwbGF5KGZpbmFsIFBhdGNoU2V0UHVibGlzaERldGFpbCByKSB7CiAgICAgc2V0UGFnZVRpdGxlKFV0aWwuTS5wdWJsaXNoQ29tbWVudHMoci5nZXRDaGFuZ2UoKS5nZXRLZXkoKS5hYmJyZXZpYXRlKCksCiAgICAgICAgIHBhdGNoU2V0SWQuZ2V0KCkpKTsKLSAgICBkZXNjQmxvY2suZGlzcGxheShyLmdldENoYW5nZSgpLCBudWxsLCByLmdldFBhdGNoU2V0SW5mbygpLCByLmdldEFjY291bnRzKCkpOworICAgIGRlc2NCbG9jay5kaXNwbGF5KHIuZ2V0Q2hhbmdlKCksIG51bGwsIHIuZ2V0UGF0Y2hTZXRJbmZvKCksIHIuZ2V0QWNjb3VudHMoKSwKKyAgICAgICAgci5nZXRTdWJtaXRUeXBlUmVjb3JkKCkpOwogCiAgICAgaWYgKHIuZ2V0Q2hhbmdlKCkuZ2V0U3RhdHVzKCkuaXNPcGVuKCkpIHsKICAgICAgIGluaXRBcHByb3ZhbHMociwgYXBwcm92YWxQYW5lbCk7CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvZ2Vycml0LmNzcyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9nZXJyaXQuY3NzCmluZGV4IDc1MTJkOGMuLmIxNjE4OTcgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9nZXJyaXQuY3NzCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9nZXJyaXQuY3NzCkBAIC0zNyw3ICszNyw3IEBACiBAZGVmIGJsYWNrICMwMDAwMDA7CiBAZGVmIHdoaXRlICNmZmZmZmY7CiBAZGVmIG5vcm0tZm9udCAgQXJpYWwgVW5pY29kZSBNUywgQXJpYWwsIHNhbnMtc2VyaWY7Ci1AZGVmIG1vbm8tZm9udCAnTHVjaWRhIENvbnNvbGUnLCAnTHVjaWRhIFNhbnMgVHlwZXdyaXRlcicsIE1vbmFjbywgbW9ub3NwYWNlOworQGRlZiBtb25vLWZvbnQgIG1vbm9zcGFjZTsKIAogQGV2YWwgYmFja2dyb3VuZENvbG9yIGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5HZXJyaXQuZ2V0VGhlbWUoKS5iYWNrZ3JvdW5kQ29sb3I7CiBAZXZhbCB0b3BNZW51Q29sb3IgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LkdlcnJpdC5nZXRUaGVtZSgpLnRvcE1lbnVDb2xvcjsKQEAgLTUyMywxMCArNTIzLDYgQEAKICAgd2hpdGUtc3BhY2U6IG5vd3JhcDsKIH0KIAotLmNoYW5nZVRhYmxlIC5jUFJPSkVDVCB7Ci0gIHdoaXRlLXNwYWNlOiBub3dyYXA7Ci19Ci0KIC5jaGFuZ2VUYWJsZSAuY0xhc3RVcGRhdGUgewogICB3aGl0ZS1zcGFjZTogbm93cmFwOwogICB0ZXh0LWFsaWduOiByaWdodDsKQEAgLTY1OSw5ICs2NTUsMTEgQEAKICAgcGFkZGluZy1sZWZ0OiAwOwogICBwYWRkaW5nLXJpZ2h0OiAwOwogICBib3JkZXItdG9wOiAxcHggc29saWQgYmxhY2s7Ci0gIGJvcmRlci1sZWZ0OiAxcHggc29saWQgYmxhY2s7CiAgIGJvcmRlci1yaWdodDogMXB4IHNvbGlkIGJsYWNrOwogfQorLnBhdGNoQ29udGVudFRhYmxlIHRkLmNvbW1lbnRIb2xkZXJMZWZ0bW9zdCB7CisgIGJvcmRlci1sZWZ0OiAxcHggc29saWQgYmxhY2s7Cit9CiAucGF0Y2hDb250ZW50VGFibGUgdGQuY29tbWVudEhvbGRlci5jb21tZW50UGFuZWxMYXN0IHsKICAgYm9yZGVyLWJvdHRvbTogMXB4IHNvbGlkIGJsYWNrOwogfQpAQCAtODcxLDYgKzg2OSw5IEBACiAuaW5mb1RhYmxlIHRkLmFwcHJvdmFsc2NvcmUgewogICB0ZXh0LWFsaWduOiBjZW50ZXI7CiB9CisuaW5mb1RhYmxlIHRkLm5vdFZvdGFibGUgeworICBiYWNrZ3JvdW5kOiAjRjVGNUY1OworfQogLmluZm9UYWJsZSB0ZC5uZWdzY29yZSB7CiAgIGNvbG9yOiByZWQ7CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvcGF0Y2hlcy9BYnN0cmFjdFBhdGNoQ29udGVudFRhYmxlLmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvcGF0Y2hlcy9BYnN0cmFjdFBhdGNoQ29udGVudFRhYmxlLmphdmEKaW5kZXggMjRhMmFlNS4uZGM0ZGI3MyAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3BhdGNoZXMvQWJzdHJhY3RQYXRjaENvbnRlbnRUYWJsZS5qYXZhCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9wYXRjaGVzL0Fic3RyYWN0UGF0Y2hDb250ZW50VGFibGUuamF2YQpAQCAtNDI3LDcgKzQyNyw5IEBACiAgICAgICAgIHNwYW5zW2NvbF0gPSB0YWJsZS5nZXRGbGV4Q2VsbEZvcm1hdHRlcigpLmdldFJvd1NwYW4ocm93LCBjZWxsKTsKICAgICAgICAgaWYgKGNvbCA9PSBjb2x1bW4pIHsKICAgICAgICAgICBmaW5hbCBXaWRnZXQgdyA9IHRhYmxlLmdldFdpZGdldChyb3csIGNlbGwpOwotICAgICAgICAgIGlmICh3IGluc3RhbmNlb2YgQ29tbWVudEVkaXRvclBhbmVsKSB7CisgICAgICAgICAgaWYgKHcgaW5zdGFuY2VvZiBDb21tZW50RWRpdG9yUGFuZWwKKyAgICAgICAgICAgICAgJiYgKChDb21tZW50RWRpdG9yUGFuZWwpIHcpLmdldENvbW1lbnQoKS5nZXRLZXkoKS5nZXRQYXJlbnRLZXkoKQorICAgICAgICAgICAgICAgICAgLmVxdWFscyhuZXdDb21tZW50LmdldEtleSgpLmdldFBhcmVudEtleSgpKSkgewogICAgICAgICAgICAgLy8gRG9uJ3QgaW5zZXJ0IHR3byBlZGl0b3JzIG9uIHRoZSBzYW1lIHBvc2l0aW9uLCBpdCBkb2Vzbid0IG1ha2UKICAgICAgICAgICAgIC8vIGFueSBzZW5zZSB0byB0aGUgdXNlci4KICAgICAgICAgICAgIC8vCkBAIC00NDEsNiArNDQzLDcgQEAKICAgICAgICAgICAgICAgYnJlYWsgRklORF9ST1c7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICByb3crKzsKKyAgICAgICAgICAgIGNlbGwtLTsKICAgICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgYnJlYWsgRklORF9ST1c7CiAgICAgICAgICAgfQpAQCAtNjMyLDYgKzYzNSw5IEBACiAgICAgICAgIEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuY29tbWVudFBhbmVsTGFzdCgpKTsKICAgICBmbXQuc2V0U3R5bGVOYW1lKHJvdywgY29sLCBHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmNvbW1lbnRIb2xkZXIoKSk7CiAgICAgZm10LmFkZFN0eWxlTmFtZShyb3csIGNvbCwgR2Vycml0LlJFU09VUkNFUy5jc3MoKS5jb21tZW50UGFuZWxMYXN0KCkpOworICAgIGlmICghZm10LmdldFN0eWxlTmFtZShyb3csIGNvbCAtIDEpLmNvbnRhaW5zKEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuY29tbWVudEhvbGRlcigpKSkgeworICAgICAgZm10LmFkZFN0eWxlTmFtZShyb3csIGNvbCwgR2Vycml0LlJFU09VUkNFUy5jc3MoKS5jb21tZW50SG9sZGVyTGVmdG1vc3QoKSk7CisgICAgfQogICB9CiAKICAgcHJvdGVjdGVkIHN0YXRpYyBjbGFzcyBDb21tZW50TGlzdCB7CkBAIC04MDgsMTAgKzgxNCwxMCBAQAogICAgIH0KIAogICAgIHByaXZhdGUgdm9pZCBjYW5uZWRSZXBseShTdHJpbmcgbWVzc2FnZSkgewotICAgICAgQ29tbWVudEVkaXRvclBhbmVsIHAgPSBjcmVhdGVFZGl0b3IobnVsbCk7CisgICAgICBmaW5hbCBQYXRjaExpbmVDb21tZW50IG5ld0NvbW1lbnQgPSBuZXdDb21tZW50KCk7CisgICAgICBuZXdDb21tZW50LnNldE1lc3NhZ2UobWVzc2FnZSk7CisgICAgICBDb21tZW50RWRpdG9yUGFuZWwgcCA9IGNyZWF0ZUVkaXRvcihuZXdDb21tZW50KTsKICAgICAgIGlmIChwID09IG51bGwpIHsKLSAgICAgICAgZmluYWwgUGF0Y2hMaW5lQ29tbWVudCBuZXdDb21tZW50ID0gbmV3Q29tbWVudCgpOwotICAgICAgICBuZXdDb21tZW50LnNldE1lc3NhZ2UobWVzc2FnZSk7CiAKICAgICAgICAgZW5hYmxlQnV0dG9ucyhmYWxzZSk7CiAgICAgICAgIFBhdGNoVXRpbC5ERVRBSUxfU1ZDLnNhdmVEcmFmdChuZXdDb21tZW50LApkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3BhdGNoZXMvQ29tbWVudEVkaXRvclBhbmVsLmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvcGF0Y2hlcy9Db21tZW50RWRpdG9yUGFuZWwuamF2YQppbmRleCBiMGQ4MjViLi5iNjA5ZjE1IDEwMDY0NAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvcGF0Y2hlcy9Db21tZW50RWRpdG9yUGFuZWwuamF2YQorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvcGF0Y2hlcy9Db21tZW50RWRpdG9yUGFuZWwuamF2YQpAQCAtMTk4LDYgKzE5OCwxMCBAQAogICAgIHJldHVybiBjb21tZW50LmdldEtleSgpLmdldCgpID09IG51bGw7CiAgIH0KIAorICBwdWJsaWMgUGF0Y2hMaW5lQ29tbWVudCBnZXRDb21tZW50KCkgeworICAgIHJldHVybiBjb21tZW50OworICB9CisKICAgQE92ZXJyaWRlCiAgIHB1YmxpYyB2b2lkIG9uRG91YmxlQ2xpY2soZmluYWwgRG91YmxlQ2xpY2tFdmVudCBldmVudCkgewogICAgIGVkaXQoKTsKZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC91aS9BY2NvdW50R3JvdXBTdWdnZXN0T3JhY2xlLmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvdWkvQWNjb3VudEdyb3VwU3VnZ2VzdE9yYWNsZS5qYXZhCmluZGV4IDVkYTAwY2QuLjI3OGUxNTkgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC91aS9BY2NvdW50R3JvdXBTdWdnZXN0T3JhY2xlLmphdmEKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3VpL0FjY291bnRHcm91cFN1Z2dlc3RPcmFjbGUuamF2YQpAQCAtMjAsNyArMjAsNiBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R3JvdXA7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlByb2plY3Q7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuU3VnZ2VzdE9yYWNsZTsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dGV4cHVpLnNhZmVodG1sLmNsaWVudC5IaWdobGlnaHRTdWdnZXN0T3JhY2xlOwogCiBpbXBvcnQgamF2YS51dGlsLkFycmF5TGlzdDsKIGltcG9ydCBqYXZhLnV0aWwuSGFzaE1hcDsKQEAgLTI4LDE0ICsyNywxNCBAQAogaW1wb3J0IGphdmEudXRpbC5NYXA7CiAKIC8qKiBTdWdnZXN0aW9uIE9yYWNsZSBmb3IgQWNjb3VudEdyb3VwIGVudGl0aWVzLiAqLwotcHVibGljIGNsYXNzIEFjY291bnRHcm91cFN1Z2dlc3RPcmFjbGUgZXh0ZW5kcyBIaWdobGlnaHRTdWdnZXN0T3JhY2xlIHsKK3B1YmxpYyBjbGFzcyBBY2NvdW50R3JvdXBTdWdnZXN0T3JhY2xlIGV4dGVuZHMgU3VnZ2VzdEFmdGVyVHlwaW5nTkNoYXJzT3JhY2xlIHsKICAgcHJpdmF0ZSBNYXA8U3RyaW5nLCBBY2NvdW50R3JvdXAuVVVJRD4gcHJpb3JSZXN1bHRzID0KICAgICAgIG5ldyBIYXNoTWFwPFN0cmluZywgQWNjb3VudEdyb3VwLlVVSUQ+KCk7CiAKICAgcHJpdmF0ZSBQcm9qZWN0Lk5hbWVLZXkgcHJvamVjdE5hbWU7CiAKICAgQE92ZXJyaWRlCi0gIHB1YmxpYyB2b2lkIG9uUmVxdWVzdFN1Z2dlc3Rpb25zKGZpbmFsIFJlcXVlc3QgcmVxLCBmaW5hbCBDYWxsYmFjayBjYWxsYmFjaykgeworICBwdWJsaWMgdm9pZCBfb25SZXF1ZXN0U3VnZ2VzdGlvbnMoZmluYWwgUmVxdWVzdCByZXEsIGZpbmFsIENhbGxiYWNrIGNhbGxiYWNrKSB7CiAgICAgUnBjU3RhdHVzLmhpZGUobmV3IFJ1bm5hYmxlKCkgewogICAgICAgcHVibGljIHZvaWQgcnVuKCkgewogICAgICAgICBTdWdnZXN0VXRpbC5TVkMuc3VnZ2VzdEFjY291bnRHcm91cEZvclByb2plY3QoCmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvdWkvQWNjb3VudFN1Z2dlc3RPcmFjbGUuamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC91aS9BY2NvdW50U3VnZ2VzdE9yYWNsZS5qYXZhCmluZGV4IGJjZjY0MzguLmIxMTNhM2IgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC91aS9BY2NvdW50U3VnZ2VzdE9yYWNsZS5qYXZhCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC91aS9BY2NvdW50U3VnZ2VzdE9yYWNsZS5qYXZhCkBAIC0xOSwxNSArMTksMTQgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQucnBjLkdlcnJpdENhbGxiYWNrOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkFjY291bnRJbmZvOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLlN1Z2dlc3RPcmFjbGU7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3RleHB1aS5zYWZlaHRtbC5jbGllbnQuSGlnaGxpZ2h0U3VnZ2VzdE9yYWNsZTsKIAogaW1wb3J0IGphdmEudXRpbC5BcnJheUxpc3Q7CiBpbXBvcnQgamF2YS51dGlsLkxpc3Q7CiAKIC8qKiBTdWdnZXN0aW9uIE9yYWNsZSBmb3IgQWNjb3VudCBlbnRpdGllcy4gKi8KLXB1YmxpYyBjbGFzcyBBY2NvdW50U3VnZ2VzdE9yYWNsZSBleHRlbmRzIEhpZ2hsaWdodFN1Z2dlc3RPcmFjbGUgeworcHVibGljIGNsYXNzIEFjY291bnRTdWdnZXN0T3JhY2xlIGV4dGVuZHMgU3VnZ2VzdEFmdGVyVHlwaW5nTkNoYXJzT3JhY2xlIHsKICAgQE92ZXJyaWRlCi0gIHB1YmxpYyB2b2lkIG9uUmVxdWVzdFN1Z2dlc3Rpb25zKGZpbmFsIFJlcXVlc3QgcmVxLCBmaW5hbCBDYWxsYmFjayBjYWxsYmFjaykgeworICBwdWJsaWMgdm9pZCBfb25SZXF1ZXN0U3VnZ2VzdGlvbnMoZmluYWwgUmVxdWVzdCByZXEsIGZpbmFsIENhbGxiYWNrIGNhbGxiYWNrKSB7CiAgICAgUnBjU3RhdHVzLmhpZGUobmV3IFJ1bm5hYmxlKCkgewogICAgICAgcHVibGljIHZvaWQgcnVuKCkgewogICAgICAgICBTdWdnZXN0VXRpbC5TVkMuc3VnZ2VzdEFjY291bnQocmVxLmdldFF1ZXJ5KCksIEJvb2xlYW4uVFJVRSwKZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC91aS9Qcm9qZWN0TmFtZVN1Z2dlc3RPcmFjbGUuamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC91aS9Qcm9qZWN0TmFtZVN1Z2dlc3RPcmFjbGUuamF2YQppbmRleCAyNWVkMjU4Li40MGE2ODM0IDEwMDY0NAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvdWkvUHJvamVjdE5hbWVTdWdnZXN0T3JhY2xlLmphdmEKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3VpL1Byb2plY3ROYW1lU3VnZ2VzdE9yYWNsZS5qYXZhCkBAIC0xNywxMiArMTcsMTEgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuUnBjU3RhdHVzOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5wcm9qZWN0cy5Qcm9qZWN0TWFwOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5ycGMuR2Vycml0Q2FsbGJhY2s7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3RleHB1aS5zYWZlaHRtbC5jbGllbnQuSGlnaGxpZ2h0U3VnZ2VzdE9yYWNsZTsKIAogLyoqIFN1Z2dlc3Rpb24gT3JhY2xlIGZvciBQcm9qZWN0Lk5hbWVLZXkgZW50aXRpZXMuICovCi1wdWJsaWMgY2xhc3MgUHJvamVjdE5hbWVTdWdnZXN0T3JhY2xlIGV4dGVuZHMgSGlnaGxpZ2h0U3VnZ2VzdE9yYWNsZSB7CitwdWJsaWMgY2xhc3MgUHJvamVjdE5hbWVTdWdnZXN0T3JhY2xlIGV4dGVuZHMgU3VnZ2VzdEFmdGVyVHlwaW5nTkNoYXJzT3JhY2xlIHsKICAgQE92ZXJyaWRlCi0gIHB1YmxpYyB2b2lkIG9uUmVxdWVzdFN1Z2dlc3Rpb25zKGZpbmFsIFJlcXVlc3QgcmVxLCBmaW5hbCBDYWxsYmFjayBjYWxsYmFjaykgeworICBwdWJsaWMgdm9pZCBfb25SZXF1ZXN0U3VnZ2VzdGlvbnMoZmluYWwgUmVxdWVzdCByZXEsIGZpbmFsIENhbGxiYWNrIGNhbGxiYWNrKSB7CiAgICAgUnBjU3RhdHVzLmhpZGUobmV3IFJ1bm5hYmxlKCkgewogICAgICAgQE92ZXJyaWRlCiAgICAgICBwdWJsaWMgdm9pZCBydW4oKSB7CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvdWkvUHJvamVjdHNUYWJsZS5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3VpL1Byb2plY3RzVGFibGUuamF2YQppbmRleCAwY2JlMTk0Li5jZmMzZDhlIDEwMDY0NAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvdWkvUHJvamVjdHNUYWJsZS5qYXZhCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC91aS9Qcm9qZWN0c1RhYmxlLmphdmEKQEAgLTEyMCw3ICsxMjAsNiBAQAogCiAgICAgZmluYWwgRmxleENlbGxGb3JtYXR0ZXIgZm10ID0gdGFibGUuZ2V0RmxleENlbGxGb3JtYXR0ZXIoKTsKICAgICBmbXQuYWRkU3R5bGVOYW1lKHJvdywgMSwgR2Vycml0LlJFU09VUkNFUy5jc3MoKS5kYXRhQ2VsbCgpKTsKLSAgICBmbXQuYWRkU3R5bGVOYW1lKHJvdywgMSwgR2Vycml0LlJFU09VUkNFUy5jc3MoKS5jUFJPSkVDVCgpKTsKICAgICBmbXQuYWRkU3R5bGVOYW1lKHJvdywgMiwgR2Vycml0LlJFU09VUkNFUy5jc3MoKS5kYXRhQ2VsbCgpKTsKIAogICAgIHBvcHVsYXRlKHJvdywgayk7CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvdWkvUmV2aWV3ZXJTdWdnZXN0T3JhY2xlLmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvdWkvUmV2aWV3ZXJTdWdnZXN0T3JhY2xlLmphdmEKaW5kZXggNzQ3ZWY0MC4uZjNiMTQzOSAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3VpL1Jldmlld2VyU3VnZ2VzdE9yYWNsZS5qYXZhCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC91aS9SZXZpZXdlclN1Z2dlc3RPcmFjbGUuamF2YQpAQCAtMjIsMTggKzIyLDE3IEBACiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuUmV2aWV3ZXJJbmZvOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5DaGFuZ2U7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuU3VnZ2VzdE9yYWNsZTsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dGV4cHVpLnNhZmVodG1sLmNsaWVudC5IaWdobGlnaHRTdWdnZXN0T3JhY2xlOwogCiBpbXBvcnQgamF2YS51dGlsLkFycmF5TGlzdDsKIGltcG9ydCBqYXZhLnV0aWwuTGlzdDsKIAogLyoqIFN1Z2dlc3Rpb24gT3JhY2xlIGZvciByZXZpZXdlcnMuICovCi1wdWJsaWMgY2xhc3MgUmV2aWV3ZXJTdWdnZXN0T3JhY2xlIGV4dGVuZHMgSGlnaGxpZ2h0U3VnZ2VzdE9yYWNsZSB7CitwdWJsaWMgY2xhc3MgUmV2aWV3ZXJTdWdnZXN0T3JhY2xlIGV4dGVuZHMgU3VnZ2VzdEFmdGVyVHlwaW5nTkNoYXJzT3JhY2xlIHsKIAogICBwcml2YXRlIENoYW5nZS5JZCBjaGFuZ2VJZDsKIAogICBAT3ZlcnJpZGUKLSAgcHJvdGVjdGVkIHZvaWQgb25SZXF1ZXN0U3VnZ2VzdGlvbnMoZmluYWwgUmVxdWVzdCByZXEsIGZpbmFsIENhbGxiYWNrIGNhbGxiYWNrKSB7CisgIHByb3RlY3RlZCB2b2lkIF9vblJlcXVlc3RTdWdnZXN0aW9ucyhmaW5hbCBSZXF1ZXN0IHJlcSwgZmluYWwgQ2FsbGJhY2sgY2FsbGJhY2spIHsKICAgICBScGNTdGF0dXMuaGlkZShuZXcgUnVubmFibGUoKSB7CiAgICAgICBwdWJsaWMgdm9pZCBydW4oKSB7CiAgICAgICAgIFN1Z2dlc3RVdGlsLlNWQy5zdWdnZXN0Q2hhbmdlUmV2aWV3ZXIoY2hhbmdlSWQsIHJlcS5nZXRRdWVyeSgpLApkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3VpL1N1Z2dlc3RBZnRlclR5cGluZ05DaGFyc09yYWNsZS5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3VpL1N1Z2dlc3RBZnRlclR5cGluZ05DaGFyc09yYWNsZS5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjRmNTRiYTUKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvdWkvU3VnZ2VzdEFmdGVyVHlwaW5nTkNoYXJzT3JhY2xlLmphdmEKQEAgLTAsMCArMSwzNiBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aTsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5HZXJyaXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nd3RleHB1aS5zYWZlaHRtbC5jbGllbnQuSGlnaGxpZ2h0U3VnZ2VzdE9yYWNsZTsKKworLyoqCisgKiBTdWdnZXN0IG9yYWNsZSB0aGF0IG9ubHkgcHJvdmlkZXMgc3VnZ2VzdGlvbnMgaWYgdGhlIHVzZXIgaGFzIHR5cGVkIGF0IGxlYXN0CisgKiBhcyBtYW55IGNoYXJhY3RlcnMgYXMgY29uZmlndXJlZCBieSAnc3VnZ2VzdC5mcm9tJy4gSWYgJ3N1Z2dlc3QuZnJvbScgaXMgc2V0CisgKiB0byAwLCBzdWdnZXN0aW9ucyB3aWxsIGFsd2F5cyBiZSBwcm92aWRlZC4KKyAqLworcHVibGljIGFic3RyYWN0IGNsYXNzIFN1Z2dlc3RBZnRlclR5cGluZ05DaGFyc09yYWNsZSBleHRlbmRzIEhpZ2hsaWdodFN1Z2dlc3RPcmFjbGUgeworCisgIEBPdmVycmlkZQorICBwcm90ZWN0ZWQgdm9pZCBvblJlcXVlc3RTdWdnZXN0aW9ucyhmaW5hbCBSZXF1ZXN0IHJlcXVlc3QsIGZpbmFsIENhbGxiYWNrIGRvbmUpIHsKKyAgICBmaW5hbCBpbnQgc3VnZ2VzdEZyb20gPSBHZXJyaXQuZ2V0Q29uZmlnKCkuZ2V0U3VnZ2VzdEZyb20oKTsKKyAgICBpZiAoc3VnZ2VzdEZyb20gPT0gMCB8fCByZXF1ZXN0LmdldFF1ZXJ5KCkubGVuZ3RoKCkgPj0gc3VnZ2VzdEZyb20pIHsKKyAgICAgIF9vblJlcXVlc3RTdWdnZXN0aW9ucyhyZXF1ZXN0LCBkb25lKTsKKyAgICB9CisgIH0KKworICBwcm90ZWN0ZWQgYWJzdHJhY3Qgdm9pZCBfb25SZXF1ZXN0U3VnZ2VzdGlvbnMoUmVxdWVzdCByZXF1ZXN0LCBDYWxsYmFjayBkb25lKTsKK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1odHRwZC9wb20ueG1sIGIvZ2Vycml0LWh0dHBkL3BvbS54bWwKaW5kZXggY2VhY2I2Ni4uNjU2NDFhYSAxMDA2NDQKLS0tIGEvZ2Vycml0LWh0dHBkL3BvbS54bWwKKysrIGIvZ2Vycml0LWh0dHBkL3BvbS54bWwKQEAgLTIyLDcgKzIyLDcgQEAKICAgPHBhcmVudD4KICAgICA8Z3JvdXBJZD5jb20uZ29vZ2xlLmdlcnJpdDwvZ3JvdXBJZD4KICAgICA8YXJ0aWZhY3RJZD5nZXJyaXQtcGFyZW50PC9hcnRpZmFjdElkPgotICAgIDx2ZXJzaW9uPjIuNS1TTkFQU0hPVDwvdmVyc2lvbj4KKyAgICA8dmVyc2lvbj4yLjYtU05BUFNIT1Q8L3ZlcnNpb24+CiAgIDwvcGFyZW50PgogCiAgIDxhcnRpZmFjdElkPmdlcnJpdC1odHRwZDwvYXJ0aWZhY3RJZD4KZGlmZiAtLWdpdCBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL0dlcnJpdENvbmZpZ1Byb3ZpZGVyLmphdmEgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9HZXJyaXRDb25maWdQcm92aWRlci5qYXZhCmluZGV4IGMxZjNhZTQuLmI1YTRiM2MgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL0dlcnJpdENvbmZpZ1Byb3ZpZGVyLmphdmEKKysrIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvR2Vycml0Q29uZmlnUHJvdmlkZXIuamF2YQpAQCAtMTIxLDYgKzEyMSw3IEBACiAgICAgY29uZmlnLnNldFRlc3RDaGFuZ2VNZXJnZShjZmcuZ2V0Qm9vbGVhbigiY2hhbmdlTWVyZ2UiLAogICAgICAgICAidGVzdCIsIGZhbHNlKSk7CiAgICAgY29uZmlnLnNldEFub255bW91c0Nvd2FyZE5hbWUoYW5vbnltb3VzQ293YXJkTmFtZSk7CisgICAgY29uZmlnLnNldFN1Z2dlc3RGcm9tKGNmZy5nZXRJbnQoInN1Z2dlc3QiLCAiZnJvbSIsIDApKTsKIAogICAgIGNvbmZpZy5zZXRSZXBvcnRCdWdVcmwoY2ZnLmdldFN0cmluZygiZ2Vycml0IiwgbnVsbCwgInJlcG9ydEJ1Z1VybCIpKTsKICAgICBpZiAoY29uZmlnLmdldFJlcG9ydEJ1Z1VybCgpID09IG51bGwpIHsKZGlmZiAtLWdpdCBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL0dpdE92ZXJIdHRwU2VydmxldC5qYXZhIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvR2l0T3Zlckh0dHBTZXJ2bGV0LmphdmEKaW5kZXggYWVhNDJmNC4uZTZhMDVjNiAxMDA2NDQKLS0tIGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvR2l0T3Zlckh0dHBTZXJ2bGV0LmphdmEKKysrIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvR2l0T3Zlckh0dHBTZXJ2bGV0LmphdmEKQEAgLTIzLDYgKzIzLDcgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuSWRlbnRpZmllZFVzZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNhY2hlLkNhY2hlTW9kdWxlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuQXN5bmNSZWNlaXZlQ29tbWl0czsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LkNoYW5nZUNhY2hlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuR2l0UmVwb3NpdG9yeU1hbmFnZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5SZWNlaXZlQ29tbWl0czsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LlRhZ0NhY2hlOwpAQCAtMTk4LDExICsxOTksMTMgQEAKICAgc3RhdGljIGNsYXNzIFVwbG9hZEZpbHRlciBpbXBsZW1lbnRzIEZpbHRlciB7CiAgICAgcHJpdmF0ZSBmaW5hbCBQcm92aWRlcjxSZXZpZXdEYj4gZGI7CiAgICAgcHJpdmF0ZSBmaW5hbCBUYWdDYWNoZSB0YWdDYWNoZTsKKyAgICBwcml2YXRlIGZpbmFsIENoYW5nZUNhY2hlIGNoYW5nZUNhY2hlOwogCiAgICAgQEluamVjdAotICAgIFVwbG9hZEZpbHRlcihQcm92aWRlcjxSZXZpZXdEYj4gZGIsIFRhZ0NhY2hlIHRhZ0NhY2hlKSB7CisgICAgVXBsb2FkRmlsdGVyKFByb3ZpZGVyPFJldmlld0RiPiBkYiwgVGFnQ2FjaGUgdGFnQ2FjaGUsIENoYW5nZUNhY2hlIGNoYW5nZUNhY2hlKSB7CiAgICAgICB0aGlzLmRiID0gZGI7CiAgICAgICB0aGlzLnRhZ0NhY2hlID0gdGFnQ2FjaGU7CisgICAgICB0aGlzLmNoYW5nZUNhY2hlID0gY2hhbmdlQ2FjaGU7CiAgICAgfQogCiAgICAgQE92ZXJyaWRlCkBAIC0yMjEsNyArMjI0LDcgQEAKICAgICAgIH0KIAogICAgICAgaWYgKCFwYy5hbGxSZWZzQXJlVmlzaWJsZSgpKSB7Ci0gICAgICAgIHVwLnNldEFkdmVydGlzZVJlZnNIb29rKG5ldyBWaXNpYmxlUmVmRmlsdGVyKHRhZ0NhY2hlLCByZXBvLCBwYywgZGIuZ2V0KCksIHRydWUpKTsKKyAgICAgICAgdXAuc2V0QWR2ZXJ0aXNlUmVmc0hvb2sobmV3IFZpc2libGVSZWZGaWx0ZXIodGFnQ2FjaGUsIGNoYW5nZUNhY2hlLCByZXBvLCBwYywgZGIuZ2V0KCksIHRydWUpKTsKICAgICAgIH0KIAogICAgICAgbmV4dC5kb0ZpbHRlcihyZXF1ZXN0LCByZXNwb25zZSk7CmRpZmYgLS1naXQgYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9XZWJNb2R1bGUuamF2YSBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL1dlYk1vZHVsZS5qYXZhCmluZGV4IDFhNDhiYjUuLjU5MWQ5N2MgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL1dlYk1vZHVsZS5qYXZhCisrKyBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL1dlYk1vZHVsZS5qYXZhCkBAIC0xOCw2ICsxOCw4IEBACiBpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVnaXN0cmF0aW9uLlByaXZhdGVJbnRlcm5hbHNfRHluYW1pY1R5cGVzLnJlZ2lzdGVySW5QYXJlbnRJbmplY3RvcnM7CiAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5HZXJyaXRDb25maWc7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZWdpc3RyYXRpb24uRHluYW1pY1NldDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLndlYnVpLldlYlVpUGx1Z2luOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLmF1dGguYmVjb21lLkJlY29tZUFueUFjY291bnRMb2dpblNlcnZsZXQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuaHR0cGQuYXV0aC5jb250YWluZXIuSHR0cEF1dGhNb2R1bGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuaHR0cGQuYXV0aC5jb250YWluZXIuSHR0cHNDbGllbnRTc2xDZXJ0TW9kdWxlOwpAQCAtMTMwLDYgKzEzMiw3IEBACiAgICAgICAgIFNJTkdMRVRPTik7CiAgICAgYmluZChHZXJyaXRDb25maWdQcm92aWRlci5jbGFzcyk7CiAgICAgYmluZChHZXJyaXRDb25maWcuY2xhc3MpLnRvUHJvdmlkZXIoR2Vycml0Q29uZmlnUHJvdmlkZXIuY2xhc3MpOworICAgIER5bmFtaWNTZXQuc2V0T2YoYmluZGVyKCksIFdlYlVpUGx1Z2luLmNsYXNzKTsKIAogICAgIGJpbmQoQWNjb3VudE1hbmFnZXIuY2xhc3MpOwogICAgIGJpbmQoQ2hhbmdlVXNlck5hbWUuQ3VycmVudFVzZXIuY2xhc3MpOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvYXV0aC9iZWNvbWUvQmVjb21lQW55QWNjb3VudExvZ2luU2VydmxldC5qYXZhIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvYXV0aC9iZWNvbWUvQmVjb21lQW55QWNjb3VudExvZ2luU2VydmxldC5qYXZhCmluZGV4IDA4MjE0OTYuLmQwODgxNTAgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL2F1dGgvYmVjb21lL0JlY29tZUFueUFjY291bnRMb2dpblNlcnZsZXQuamF2YQorKysgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9hdXRoL2JlY29tZS9CZWNvbWVBbnlBY2NvdW50TG9naW5TZXJ2bGV0LmphdmEKQEAgLTE1Miw3ICsxNTIsNyBAQAogICAgICAgdGhyb3cgbmV3IEZpbGVOb3RGb3VuZEV4Y2VwdGlvbigiTm8gIiArIHBhZ2VOYW1lICsgIiBpbiB3ZWJhcHAiKTsKICAgICB9CiAgICAgaWYgKCFJU19ERVYpIHsKLSAgICAgIGZpbmFsIEVsZW1lbnQgZGV2bW9kZSA9IEh0bWxEb21VdGlsLmZpbmQoZG9jLCAiZ2Vycml0X2d3dGRldm1vZGUiKTsKKyAgICAgIGZpbmFsIEVsZW1lbnQgZGV2bW9kZSA9IEh0bWxEb21VdGlsLmZpbmQoZG9jLCAiZ3d0ZGV2bW9kZSIpOwogICAgICAgaWYgKGRldm1vZGUgIT0gbnVsbCkgewogICAgICAgICBkZXZtb2RlLmdldFBhcmVudE5vZGUoKS5yZW1vdmVDaGlsZChkZXZtb2RlKTsKICAgICAgIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3BsdWdpbnMvSHR0cFBsdWdpblNlcnZsZXQuamF2YSBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3BsdWdpbnMvSHR0cFBsdWdpblNlcnZsZXQuamF2YQppbmRleCBlNzM3NzAwLi5kMDA5MjYxIDEwMDY0NAotLS0gYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9wbHVnaW5zL0h0dHBQbHVnaW5TZXJ2bGV0LmphdmEKKysrIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcGx1Z2lucy9IdHRwUGx1Z2luU2VydmxldC5qYXZhCkBAIC01MDEsNiArNTAxLDEwIEBACiAgICAgfQogICAgIGlmIChjb250ZW50VHlwZSA9PSBudWxsKSB7CiAgICAgICBjb250ZW50VHlwZSA9IG1pbWVVdGlsLmdldE1pbWVUeXBlKGVudHJ5LmdldE5hbWUoKSwgZGF0YSkudG9TdHJpbmcoKTsKKyAgICAgIGlmICgiYXBwbGljYXRpb24vb2N0ZXQtc3RyZWFtIi5lcXVhbHMoY29udGVudFR5cGUpCisgICAgICAgICAgJiYgZW50cnkuZ2V0TmFtZSgpLmVuZHNXaXRoKCIuanMiKSkgeworICAgICAgICBjb250ZW50VHlwZSA9ICJhcHBsaWNhdGlvbi9qYXZhc2NyaXB0IjsKKyAgICAgIH0KICAgICB9CiAKICAgICBsb25nIHRpbWUgPSBlbnRyeS5nZXRUaW1lKCk7CmRpZmYgLS1naXQgYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9yYXcvSG9zdFBhZ2VTZXJ2bGV0LmphdmEgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9yYXcvSG9zdFBhZ2VTZXJ2bGV0LmphdmEKaW5kZXggNmE0M2Q5NS4uZmRhY2E2MCAxMDA2NDQKLS0tIGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcmF3L0hvc3RQYWdlU2VydmxldC5qYXZhCisrKyBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3Jhdy9Ib3N0UGFnZVNlcnZsZXQuamF2YQpAQCAtMTQsMjUgKzE0LDI5IEBACiAKIHBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuaHR0cGQucmF3OwogCitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uaGFzaC5IYXNoZXI7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uaGFzaC5IYXNoaW5nOworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuTGlzdHM7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24ucHJpbWl0aXZlcy5CeXRlczsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5HZXJyaXRDb25maWc7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuSG9zdFBhZ2VEYXRhOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVnaXN0cmF0aW9uLkR5bmFtaWNTZXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy53ZWJ1aS5XZWJVaVBsdWdpbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5IdG1sRG9tVXRpbDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5XZWJTZXNzaW9uOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5DdXJyZW50VXNlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuSWRlbnRpZmllZFVzZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5HZXJyaXRTZXJ2ZXJDb25maWc7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5TaXRlUGF0aHM7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3Rqc29ucnBjLnNlcnZlci5SUENTZXJ2bGV0VXRpbHM7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3RleHB1aS5saW5rZXIuc2VydmVyLlBlcm11dGF0aW9uOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0ZXhwdWkubGlua2VyLnNlcnZlci5QZXJtdXRhdGlvblNlbGVjdG9yOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0anNvbnJwYy5zZXJ2ZXIuSnNvblNlcnZsZXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nd3Rqc29ucnBjLnNlcnZlci5SUENTZXJ2bGV0VXRpbHM7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlByb3ZpZGVyOwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlNpbmdsZXRvbjsKIAogaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLkNvbmZpZzsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5Db25zdGFudHM7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuT2JqZWN0SWQ7CiBpbXBvcnQgb3JnLnNsZjRqLkxvZ2dlcjsKIGltcG9ydCBvcmcuc2xmNGouTG9nZ2VyRmFjdG9yeTsKIGltcG9ydCBvcmcudzNjLmRvbS5Eb2N1bWVudDsKQEAgLTQ0LDggKzQ4LDggQEAKIGltcG9ydCBqYXZhLmlvLklucHV0U3RyZWFtOwogaW1wb3J0IGphdmEuaW8uT3V0cHV0U3RyZWFtOwogaW1wb3J0IGphdmEuaW8uU3RyaW5nV3JpdGVyOwotaW1wb3J0IGphdmEuc2VjdXJpdHkuTWVzc2FnZURpZ2VzdDsKIGltcG9ydCBqYXZhLnV0aWwuSGFzaE1hcDsKK2ltcG9ydCBqYXZhLnV0aWwuTGlzdDsKIGltcG9ydCBqYXZhLnV0aWwuTWFwOwogCiBpbXBvcnQgamF2YXguc2VydmxldC5TZXJ2bGV0Q29udGV4dDsKQEAgLTY2LDYgKzcwLDcgQEAKICAgcHJpdmF0ZSBmaW5hbCBQcm92aWRlcjxDdXJyZW50VXNlcj4gY3VycmVudFVzZXI7CiAgIHByaXZhdGUgZmluYWwgUHJvdmlkZXI8V2ViU2Vzc2lvbj4gc2Vzc2lvbjsKICAgcHJpdmF0ZSBmaW5hbCBHZXJyaXRDb25maWcgY29uZmlnOworICBwcml2YXRlIGZpbmFsIER5bmFtaWNTZXQ8V2ViVWlQbHVnaW4+IHBsdWdpbnM7CiAgIHByaXZhdGUgZmluYWwgSG9zdFBhZ2VEYXRhLlRoZW1lIHNpZ25lZE91dFRoZW1lOwogICBwcml2YXRlIGZpbmFsIEhvc3RQYWdlRGF0YS5UaGVtZSBzaWduZWRJblRoZW1lOwogICBwcml2YXRlIGZpbmFsIFNpdGVQYXRocyBzaXRlOwpAQCAtNzksMTUgKzg0LDE4IEBACiAgIEhvc3RQYWdlU2VydmxldChmaW5hbCBQcm92aWRlcjxDdXJyZW50VXNlcj4gY3UsIGZpbmFsIFByb3ZpZGVyPFdlYlNlc3Npb24+IHcsCiAgICAgICBmaW5hbCBTaXRlUGF0aHMgc3AsIGZpbmFsIFRoZW1lRmFjdG9yeSB0aGVtZUZhY3RvcnksCiAgICAgICBmaW5hbCBHZXJyaXRDb25maWcgZ2MsIGZpbmFsIFNlcnZsZXRDb250ZXh0IHNlcnZsZXRDb250ZXh0LAorICAgICAgZmluYWwgRHluYW1pY1NldDxXZWJVaVBsdWdpbj4gd2ViVWlQbHVnaW5zLAogICAgICAgQEdlcnJpdFNlcnZlckNvbmZpZyBmaW5hbCBDb25maWcgY2ZnKQogICAgICAgdGhyb3dzIElPRXhjZXB0aW9uLCBTZXJ2bGV0RXhjZXB0aW9uIHsKICAgICBjdXJyZW50VXNlciA9IGN1OwogICAgIHNlc3Npb24gPSB3OwogICAgIGNvbmZpZyA9IGdjOworICAgIHBsdWdpbnMgPSB3ZWJVaVBsdWdpbnM7CiAgICAgc2lnbmVkT3V0VGhlbWUgPSB0aGVtZUZhY3RvcnkuZ2V0U2lnbmVkT3V0VGhlbWUoKTsKICAgICBzaWduZWRJblRoZW1lID0gdGhlbWVGYWN0b3J5LmdldFNpZ25lZEluVGhlbWUoKTsKICAgICBzaXRlID0gc3A7CiAgICAgcmVmcmVzaEhlYWRlckZvb3RlciA9IGNmZy5nZXRCb29sZWFuKCJzaXRlIiwgInJlZnJlc2hIZWFkZXJGb290ZXIiLCB0cnVlKTsKKyAgICBib29sZWFuIGNoZWNrVXNlckFnZW50ID0gY2ZnLmdldEJvb2xlYW4oInNpdGUiLCAiY2hlY2tVc2VyQWdlbnQiLCB0cnVlKTsKIAogICAgIGZpbmFsIFN0cmluZyBwYWdlTmFtZSA9ICJIb3N0UGFnZS5odG1sIjsKICAgICB0ZW1wbGF0ZSA9IEh0bWxEb21VdGlsLnBhcnNlRmlsZShnZXRDbGFzcygpLCBwYWdlTmFtZSk7CkBAIC0xMDIsNDAgKzExMCw0MCBAQAogICAgICAgdGhyb3cgbmV3IFNlcnZsZXRFeGNlcHRpb24oIk5vICIgKyBIUERfSUQgKyAiIGluICIgKyBwYWdlTmFtZSk7CiAgICAgfQogCi0gICAgZmluYWwgU3RyaW5nIHNyYyA9ICJnZXJyaXQvZ2Vycml0Lm5vY2FjaGUuanMiOwotICAgIHNlbGVjdG9yID0gbmV3IFBlcm11dGF0aW9uU2VsZWN0b3IoImdlcnJpdCIpOwotICAgIGlmIChJU19ERVYgfHwgIWNmZy5nZXRCb29sZWFuKCJzaXRlIiwgImNoZWNrVXNlckFnZW50IiwgdHJ1ZSkpIHsKLSAgICAgIG5vQ2FjaGVOYW1lID0gc3JjOwotICAgIH0gZWxzZSB7Ci0gICAgICBmaW5hbCBFbGVtZW50IGRldm1vZGUgPSBIdG1sRG9tVXRpbC5maW5kKHRlbXBsYXRlLCAiZ2Vycml0X2d3dGRldm1vZGUiKTsKKyAgICBTdHJpbmcgc3JjID0gImdlcnJpdF91aS9nZXJyaXRfdWkubm9jYWNoZS5qcyI7CisgICAgaWYgKCFJU19ERVYpIHsKKyAgICAgIEVsZW1lbnQgZGV2bW9kZSA9IEh0bWxEb21VdGlsLmZpbmQodGVtcGxhdGUsICJnd3RkZXZtb2RlIik7CiAgICAgICBpZiAoZGV2bW9kZSAhPSBudWxsKSB7CiAgICAgICAgIGRldm1vZGUuZ2V0UGFyZW50Tm9kZSgpLnJlbW92ZUNoaWxkKGRldm1vZGUpOwogICAgICAgfQogCiAgICAgICBJbnB1dFN0cmVhbSBpbiA9IHNlcnZsZXRDb250ZXh0LmdldFJlc291cmNlQXNTdHJlYW0oIi8iICsgc3JjKTsKLSAgICAgIGlmIChpbiA9PSBudWxsKSB7Ci0gICAgICAgIHRocm93IG5ldyBJT0V4Y2VwdGlvbigiTm8gIiArIHNyYyArICIgaW4gd2ViYXBwIHJvb3QiKTsKLSAgICAgIH0KLQotICAgICAgZmluYWwgTWVzc2FnZURpZ2VzdCBtZCA9IENvbnN0YW50cy5uZXdNZXNzYWdlRGlnZXN0KCk7Ci0gICAgICB0cnkgeworICAgICAgaWYgKGluICE9IG51bGwpIHsKKyAgICAgICAgSGFzaGVyIG1kID0gSGFzaGluZy5tZDUoKS5uZXdIYXNoZXIoKTsKICAgICAgICAgdHJ5IHsKLSAgICAgICAgICBmaW5hbCBieXRlW10gYnVmID0gbmV3IGJ5dGVbMTAyNF07Ci0gICAgICAgICAgaW50IG47Ci0gICAgICAgICAgd2hpbGUgKChuID0gaW4ucmVhZChidWYpKSA+IDApIHsKLSAgICAgICAgICAgIG1kLnVwZGF0ZShidWYsIDAsIG4pOworICAgICAgICAgIHRyeSB7CisgICAgICAgICAgICBmaW5hbCBieXRlW10gYnVmID0gbmV3IGJ5dGVbMTAyNF07CisgICAgICAgICAgICBpbnQgbjsKKyAgICAgICAgICAgIHdoaWxlICgobiA9IGluLnJlYWQoYnVmKSkgPiAwKSB7CisgICAgICAgICAgICAgIG1kLnB1dEJ5dGVzKGJ1ZiwgMCwgbik7CisgICAgICAgICAgICB9CisgICAgICAgICAgfSBmaW5hbGx5IHsKKyAgICAgICAgICAgIGluLmNsb3NlKCk7CiAgICAgICAgICAgfQotICAgICAgICB9IGZpbmFsbHkgewotICAgICAgICAgIGluLmNsb3NlKCk7CisgICAgICAgIH0gY2F0Y2ggKElPRXhjZXB0aW9uIGUpIHsKKyAgICAgICAgICB0aHJvdyBuZXcgSU9FeGNlcHRpb24oIkZhaWxlZCByZWFkaW5nICIgKyBzcmMsIGUpOwogICAgICAgICB9Ci0gICAgICB9IGNhdGNoIChJT0V4Y2VwdGlvbiBlKSB7Ci0gICAgICAgIHRocm93IG5ldyBJT0V4Y2VwdGlvbigiRmFpbGVkIHJlYWRpbmcgIiArIHNyYywgZSk7CisgICAgICAgIHNyYyArPSAiP2NvbnRlbnQ9IiArIG1kLmhhc2goKS50b1N0cmluZygpOworICAgICAgfSBlbHNlIHsKKyAgICAgICAgbG9nLmRlYnVnKCJObyAiICsgc3JjICsgIiBpbiB3ZWJhcHAgcm9vdDsga2VlcGluZyBub25jYWNoZS5qcyBVUkwiKTsKICAgICAgIH0KLSAgICAgIGZpbmFsIFN0cmluZyBpZCA9IE9iamVjdElkLmZyb21SYXcobWQuZGlnZXN0KCkpLm5hbWUoKTsKLSAgICAgIG5vQ2FjaGVOYW1lID0gc3JjICsgIj9jb250ZW50PSIgKyBpZDsKLSAgICAgIHNlbGVjdG9yLmluaXQoc2VydmxldENvbnRleHQpOwogICAgIH0KIAorICAgIG5vQ2FjaGVOYW1lID0gc3JjOworICAgIHNlbGVjdG9yID0gbmV3IFBlcm11dGF0aW9uU2VsZWN0b3IoImdlcnJpdF91aSIpOworICAgIGlmIChjaGVja1VzZXJBZ2VudCAmJiAhSVNfREVWKSB7CisgICAgICBzZWxlY3Rvci5pbml0KHNlcnZsZXRDb250ZXh0KTsKKyAgICB9CiAgICAgcGFnZSA9IG5ldyBQYWdlKCk7CiAgIH0KIApAQCAtMTYzLDExICsxNzEsOSBAQAogICBwcm90ZWN0ZWQgdm9pZCBkb0dldChmaW5hbCBIdHRwU2VydmxldFJlcXVlc3QgcmVxLAogICAgICAgZmluYWwgSHR0cFNlcnZsZXRSZXNwb25zZSByc3ApIHRocm93cyBJT0V4Y2VwdGlvbiB7CiAgICAgZmluYWwgUGFnZS5Db250ZW50IHBhZ2UgPSBnZXQoKS5nZXQoc2VsZWN0KHJlcSkpOwotICAgIGZpbmFsIGJ5dGVbXSByYXc7Ci0KKyAgICBmaW5hbCBTdHJpbmdXcml0ZXIgdyA9IG5ldyBTdHJpbmdXcml0ZXIoKTsKICAgICBmaW5hbCBDdXJyZW50VXNlciB1c2VyID0gY3VycmVudFVzZXIuZ2V0KCk7CiAgICAgaWYgKHVzZXIgaW5zdGFuY2VvZiBJZGVudGlmaWVkVXNlcikgewotICAgICAgZmluYWwgU3RyaW5nV3JpdGVyIHcgPSBuZXcgU3RyaW5nV3JpdGVyKCk7CiAgICAgICB3LndyaXRlKEhQRF9JRCArICIuYWNjb3VudD0iKTsKICAgICAgIGpzb24oKChJZGVudGlmaWVkVXNlcikgdXNlcikuZ2V0QWNjb3VudCgpLCB3KTsKICAgICAgIHcud3JpdGUoIjsiKTsKQEAgLTE4MywxNyArMTg5LDE5IEBACiAgICAgICB3LndyaXRlKEhQRF9JRCArICIudGhlbWU9Iik7CiAgICAgICBqc29uKHNpZ25lZEluVGhlbWUsIHcpOwogICAgICAgdy53cml0ZSgiOyIpOwotCi0gICAgICBmaW5hbCBieXRlW10gdXNlckRhdGEgPSB3LnRvU3RyaW5nKCkuZ2V0Qnl0ZXMoIlVURi04Iik7Ci0gICAgICByYXcgPSBjb25jYXQocGFnZS5wYXJ0MSwgdXNlckRhdGEsIHBhZ2UucGFydDIpOwogICAgIH0gZWxzZSB7Ci0gICAgICByYXcgPSBwYWdlLmZ1bGw7CisgICAgICB3LndyaXRlKEhQRF9JRCArICIudGhlbWU9Iik7CisgICAgICBqc29uKHNpZ25lZE91dFRoZW1lLCB3KTsKKyAgICAgIHcud3JpdGUoIjsiKTsKICAgICB9CisgICAgcGx1Z2lucyh3KTsKIAorICAgIGZpbmFsIGJ5dGVbXSBocGQgPSB3LnRvU3RyaW5nKCkuZ2V0Qnl0ZXMoIlVURi04Iik7CisgICAgZmluYWwgYnl0ZVtdIHJhdyA9IEJ5dGVzLmNvbmNhdChwYWdlLnBhcnQxLCBocGQsIHBhZ2UucGFydDIpOwogICAgIGZpbmFsIGJ5dGVbXSB0b3NlbmQ7CiAgICAgaWYgKFJQQ1NlcnZsZXRVdGlscy5hY2NlcHRzR3ppcEVuY29kaW5nKHJlcSkpIHsKICAgICAgIHJzcC5zZXRIZWFkZXIoIkNvbnRlbnQtRW5jb2RpbmciLCAiZ3ppcCIpOwotICAgICAgdG9zZW5kID0gcmF3ID09IHBhZ2UuZnVsbCA/IHBhZ2UuZnVsbF9neiA6IEh0bWxEb21VdGlsLmNvbXByZXNzKHJhdyk7CisgICAgICB0b3NlbmQgPSBIdG1sRG9tVXRpbC5jb21wcmVzcyhyYXcpOwogICAgIH0gZWxzZSB7CiAgICAgICB0b3NlbmQgPSByYXc7CiAgICAgfQpAQCAtMjEyLDYgKzIyMCwyMCBAQAogICAgIH0KICAgfQogCisgIHByaXZhdGUgdm9pZCBwbHVnaW5zKFN0cmluZ1dyaXRlciB3KSB7CisgICAgTGlzdDxTdHJpbmc+IHVybHMgPSBMaXN0cy5uZXdBcnJheUxpc3QoKTsKKyAgICBmb3IgKFdlYlVpUGx1Z2luIHUgOiBwbHVnaW5zKSB7CisgICAgICB1cmxzLmFkZChTdHJpbmcuZm9ybWF0KCJwbHVnaW5zLyVzLyVzIiwKKyAgICAgICAgICB1LmdldFBsdWdpbk5hbWUoKSwKKyAgICAgICAgICB1LmdldEphdmFTY3JpcHRSZXNvdXJjZVBhdGgoKSkpOworICAgIH0KKyAgICBpZiAoIXVybHMuaXNFbXB0eSgpKSB7CisgICAgICB3LndyaXRlKEhQRF9JRCArICIucGx1Z2lucz0iKTsKKyAgICAgIGpzb24odXJscywgdyk7CisgICAgICB3LndyaXRlKCI7Iik7CisgICAgfQorICB9CisKICAgcHJpdmF0ZSBQZXJtdXRhdGlvbiBzZWxlY3QoZmluYWwgSHR0cFNlcnZsZXRSZXF1ZXN0IHJlcSkgewogICAgIGlmICgiMCIuZXF1YWxzKHJlcS5nZXRQYXJhbWV0ZXIoInMiKSkpIHsKICAgICAgIC8vIElmIHM9MCBpcyB1c2VkIGluIHRoZSBVUkwsIHRoZSB1c2VyIGhhcyBleHBsaWNpdGx5IGFza2VkIHVzCkBAIC0yMjMsMjAgKzI0NSw2IEBACiAgICAgcmV0dXJuIHNlbGVjdG9yLnNlbGVjdChyZXEpOwogICB9CiAKLSAgcHJpdmF0ZSBzdGF0aWMgYnl0ZVtdIGNvbmNhdChieXRlW10gcDEsIGJ5dGVbXSBwMiwgYnl0ZVtdIHAzKSB7Ci0gICAgZmluYWwgYnl0ZVtdIHIgPSBuZXcgYnl0ZVtwMS5sZW5ndGggKyBwMi5sZW5ndGggKyBwMy5sZW5ndGhdOwotICAgIGludCBwID0gMDsKLSAgICBwID0gYXBwZW5kKHAxLCByLCBwKTsKLSAgICBwID0gYXBwZW5kKHAyLCByLCBwKTsKLSAgICBwID0gYXBwZW5kKHAzLCByLCBwKTsKLSAgICByZXR1cm4gcjsKLSAgfQotCi0gIHByaXZhdGUgc3RhdGljIGludCBhcHBlbmQoYnl0ZVtdIHNyYywgZmluYWwgYnl0ZVtdIGRzdCwgaW50IHApIHsKLSAgICBTeXN0ZW0uYXJyYXljb3B5KHNyYywgMCwgZHN0LCBwLCBzcmMubGVuZ3RoKTsKLSAgICByZXR1cm4gcCArIHNyYy5sZW5ndGg7Ci0gIH0KLQogICBwcml2YXRlIHN0YXRpYyBjbGFzcyBGaWxlSW5mbyB7CiAgICAgcHJpdmF0ZSBmaW5hbCBGaWxlIHBhdGg7CiAgICAgcHJpdmF0ZSBmaW5hbCBsb25nIHRpbWU7CkBAIC0yODgsNiArMjk2LDcgQEAKIAogICAgICAgRWxlbWVudCBub2NhY2hlID0gSHRtbERvbVV0aWwuZmluZChob3N0RG9jLCAiZ2Vycml0X21vZHVsZSIpOwogICAgICAgYXNTY3JpcHQobm9jYWNoZSk7CisgICAgICBub2NhY2hlLnJlbW92ZUF0dHJpYnV0ZSgiaWQiKTsKICAgICAgIG5vY2FjaGUuc2V0QXR0cmlidXRlKCJzcmMiLCBub0NhY2hlTmFtZSk7CiAgICAgICBwZXJtdXRhdGlvbnMucHV0KG51bGwsIG5ldyBDb250ZW50KGhvc3REb2MpKTsKICAgICB9CkBAIC0zMDUsNyArMzE0LDYgQEAKICAgICB9CiAKICAgICBwcml2YXRlIHZvaWQgYXNTY3JpcHQoZmluYWwgRWxlbWVudCBzY3JpcHROb2RlKSB7Ci0gICAgICBzY3JpcHROb2RlLnJlbW92ZUF0dHJpYnV0ZSgiaWQiKTsKICAgICAgIHNjcmlwdE5vZGUuc2V0QXR0cmlidXRlKCJ0eXBlIiwgInRleHQvamF2YXNjcmlwdCIpOwogICAgICAgc2NyaXB0Tm9kZS5zZXRBdHRyaWJ1dGUoImxhbmd1YWdlIiwgImphdmFzY3JpcHQiKTsKICAgICB9CkBAIC0zMTMsOCArMzIxLDYgQEAKICAgICBjbGFzcyBDb250ZW50IHsKICAgICAgIGZpbmFsIGJ5dGVbXSBwYXJ0MTsKICAgICAgIGZpbmFsIGJ5dGVbXSBwYXJ0MjsKLSAgICAgIGZpbmFsIGJ5dGVbXSBmdWxsOwotICAgICAgZmluYWwgYnl0ZVtdIGZ1bGxfZ3o7CiAKICAgICAgIENvbnRlbnQoRG9jdW1lbnQgaG9zdERvYykgdGhyb3dzIElPRXhjZXB0aW9uIHsKICAgICAgICAgZmluYWwgU3RyaW5nIHJhdyA9IEh0bWxEb21VdGlsLnRvU3RyaW5nKGhvc3REb2MpOwpAQCAtMzI0LDE1ICszMzAsNiBAQAogICAgICAgICB9CiAgICAgICAgIHBhcnQxID0gcmF3LnN1YnN0cmluZygwLCBwKS5nZXRCeXRlcygiVVRGLTgiKTsKICAgICAgICAgcGFydDIgPSByYXcuc3Vic3RyaW5nKHJhdy5pbmRleE9mKCc+JywgcCkgKyAxKS5nZXRCeXRlcygiVVRGLTgiKTsKLQotICAgICAgICBmaW5hbCBTdHJpbmdXcml0ZXIgdyA9IG5ldyBTdHJpbmdXcml0ZXIoKTsKLSAgICAgICAgdy53cml0ZShIUERfSUQgKyAiLnRoZW1lPSIpOwotICAgICAgICBqc29uKHNpZ25lZE91dFRoZW1lLCB3KTsKLSAgICAgICAgdy53cml0ZSgiOyIpOwotCi0gICAgICAgIGZpbmFsIGJ5dGVbXSB0aGVtZURhdGEgPSB3LnRvU3RyaW5nKCkuZ2V0Qnl0ZXMoIlVURi04Iik7Ci0gICAgICAgIGZ1bGwgPSBjb25jYXQocGFydDEsIHRoZW1lRGF0YSwgcGFydDIpOwotICAgICAgICBmdWxsX2d6ID0gSHRtbERvbVV0aWwuY29tcHJlc3MoZnVsbCk7CiAgICAgICB9CiAgICAgfQogCmRpZmYgLS1naXQgYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvUnBjU2VydmxldE1vZHVsZS5qYXZhIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL1JwY1NlcnZsZXRNb2R1bGUuamF2YQppbmRleCA4NzZmZWUzLi45NTNiYzcxIDEwMDY0NAotLS0gYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvUnBjU2VydmxldE1vZHVsZS5qYXZhCisrKyBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9ScGNTZXJ2bGV0TW9kdWxlLmphdmEKQEAgLTIyLDcgKzIyLDcgQEAKIAogLyoqIEJpbmRzIHtAbGluayBSZW1vdGVKc29uU2VydmljZX0gaW1wbGVtZW50YXRpb25zIHRvIGEgSlNPTiBzZXJ2bGV0LiAqLwogcHVibGljIGFic3RyYWN0IGNsYXNzIFJwY1NlcnZsZXRNb2R1bGUgZXh0ZW5kcyBTZXJ2bGV0TW9kdWxlIHsKLSAgcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgUFJFRklYID0gIi9nZXJyaXQvcnBjLyI7CisgIHB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIFBSRUZJWCA9ICIvZ2Vycml0X3VpL3JwYy8iOwogCiAgIHByaXZhdGUgZmluYWwgU3RyaW5nIHByZWZpeDsKIApkaWZmIC0tZ2l0IGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL2NoYW5nZS9EZXByZWNhdGVkQ2hhbmdlUXVlcnlTZXJ2bGV0LmphdmEgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvY2hhbmdlL0RlcHJlY2F0ZWRDaGFuZ2VRdWVyeVNlcnZsZXQuamF2YQppbmRleCBjZjQ0M2U3Li5kYTIxYzUxIDEwMDY0NAotLS0gYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvY2hhbmdlL0RlcHJlY2F0ZWRDaGFuZ2VRdWVyeVNlcnZsZXQuamF2YQorKysgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvY2hhbmdlL0RlcHJlY2F0ZWRDaGFuZ2VRdWVyeVNlcnZsZXQuamF2YQpAQCAtNzMsNiArNzMsNyBAQAogICAgIHAuc2V0SW5jbHVkZUN1cnJlbnRQYXRjaFNldChnZXQocmVxLCAiY3VycmVudC1wYXRjaC1zZXQiLCBmYWxzZSkpOwogICAgIHAuc2V0SW5jbHVkZVBhdGNoU2V0cyhnZXQocmVxLCAicGF0Y2gtc2V0cyIsIGZhbHNlKSk7CiAgICAgcC5zZXRJbmNsdWRlQXBwcm92YWxzKGdldChyZXEsICJhbGwtYXBwcm92YWxzIiwgZmFsc2UpKTsKKyAgICBwLnNldEluY2x1ZGVGaWxlcyhnZXQocmVxLCAiZmlsZXMiLCBmYWxzZSkpOwogICAgIHAuc2V0T3V0cHV0KHJzcC5nZXRPdXRwdXRTdHJlYW0oKSwgZm9ybWF0KTsKICAgICBwLnF1ZXJ5KGdldChyZXEsICJxIiwgInN0YXR1czpvcGVuIikpOwogICB9CmRpZmYgLS1naXQgYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvY2hhbmdlZGV0YWlsL0NoYW5nZURldGFpbEZhY3RvcnkuamF2YSBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9jaGFuZ2VkZXRhaWwvQ2hhbmdlRGV0YWlsRmFjdG9yeS5qYXZhCmluZGV4IDY2NjBhM2QuLjU1NTM0NjggMTAwNjQ0Ci0tLSBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9jaGFuZ2VkZXRhaWwvQ2hhbmdlRGV0YWlsRmFjdG9yeS5qYXZhCisrKyBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9jaGFuZ2VkZXRhaWwvQ2hhbmdlRGV0YWlsRmFjdG9yeS5qYXZhCkBAIC0xOSw2ICsxOSw3IEBACiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQXBwcm92YWxUeXBlczsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5DaGFuZ2VEZXRhaWw7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQ2hhbmdlSW5mbzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5QZXJtaXNzaW9uUmFuZ2U7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuU3VibWl0UmVjb3JkOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5lcnJvcnMuTm9TdWNoRW50aXR5RXhjZXB0aW9uOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLnJwYy5IYW5kbGVyOwpAQCAtNzEsNiArNzIsOCBAQAogCiAgIHByaXZhdGUgZmluYWwgQXBwcm92YWxUeXBlcyBhcHByb3ZhbFR5cGVzOwogICBwcml2YXRlIGZpbmFsIENoYW5nZUNvbnRyb2wuRmFjdG9yeSBjaGFuZ2VDb250cm9sRmFjdG9yeTsKKyAgcHJpdmF0ZSBmaW5hbCBDaGFuZ2VDb250cm9sLkdlbmVyaWNGYWN0b3J5IGNoYW5nZUNvbnRyb2xHZW5lcmljRmFjdG9yeTsKKyAgcHJpdmF0ZSBmaW5hbCBJZGVudGlmaWVkVXNlci5HZW5lcmljRmFjdG9yeSBpZGVudGlmaWVkVXNlckZhY3Rvcnk7CiAgIHByaXZhdGUgZmluYWwgRnVuY3Rpb25TdGF0ZS5GYWN0b3J5IGZ1bmN0aW9uU3RhdGU7CiAgIHByaXZhdGUgZmluYWwgUGF0Y2hTZXREZXRhaWxGYWN0b3J5LkZhY3RvcnkgcGF0Y2hTZXREZXRhaWw7CiAgIHByaXZhdGUgZmluYWwgQWNjb3VudEluZm9DYWNoZUZhY3RvcnkgYWljOwpAQCAtOTMsNiArOTYsOCBAQAogICAgICAgZmluYWwgUGF0Y2hTZXREZXRhaWxGYWN0b3J5LkZhY3RvcnkgcGF0Y2hTZXREZXRhaWwsIGZpbmFsIFJldmlld0RiIGRiLAogICAgICAgZmluYWwgR2l0UmVwb3NpdG9yeU1hbmFnZXIgcmVwb01hbmFnZXIsCiAgICAgICBmaW5hbCBDaGFuZ2VDb250cm9sLkZhY3RvcnkgY2hhbmdlQ29udHJvbEZhY3RvcnksCisgICAgICBmaW5hbCBDaGFuZ2VDb250cm9sLkdlbmVyaWNGYWN0b3J5IGNoYW5nZUNvbnRyb2xHZW5lcmljRmFjdG9yeSwKKyAgICAgIGZpbmFsIElkZW50aWZpZWRVc2VyLkdlbmVyaWNGYWN0b3J5IGlkZW50aWZpZWRVc2VyRmFjdG9yeSwKICAgICAgIGZpbmFsIEFjY291bnRJbmZvQ2FjaGVGYWN0b3J5LkZhY3RvcnkgYWNjb3VudEluZm9DYWNoZUZhY3RvcnksCiAgICAgICBmaW5hbCBBbm9ueW1vdXNVc2VyIGFub255bW91c1VzZXIsCiAgICAgICBmaW5hbCBNZXJnZU9wLkZhY3Rvcnkgb3BGYWN0b3J5LApAQCAtMTA0LDYgKzEwOSw4IEBACiAgICAgdGhpcy5kYiA9IGRiOwogICAgIHRoaXMucmVwb01hbmFnZXIgPSByZXBvTWFuYWdlcjsKICAgICB0aGlzLmNoYW5nZUNvbnRyb2xGYWN0b3J5ID0gY2hhbmdlQ29udHJvbEZhY3Rvcnk7CisgICAgdGhpcy5jaGFuZ2VDb250cm9sR2VuZXJpY0ZhY3RvcnkgPSBjaGFuZ2VDb250cm9sR2VuZXJpY0ZhY3Rvcnk7CisgICAgdGhpcy5pZGVudGlmaWVkVXNlckZhY3RvcnkgPSBpZGVudGlmaWVkVXNlckZhY3Rvcnk7CiAgICAgdGhpcy5hbm9ueW1vdXNVc2VyID0gYW5vbnltb3VzVXNlcjsKICAgICB0aGlzLmFpYyA9IGFjY291bnRJbmZvQ2FjaGVGYWN0b3J5LmNyZWF0ZSgpOwogCkBAIC0xNjEsNiArMTY4LDggQEAKICAgICB9CiAgICAgZGV0YWlsLnNldFN1Ym1pdFJlY29yZHMoc3VibWl0UmVjb3Jkcyk7CiAKKyAgICBkZXRhaWwuc2V0U3VibWl0VHlwZVJlY29yZChjb250cm9sLmdldFN1Ym1pdFR5cGVSZWNvcmQoZGIsIHBhdGNoKSk7CisKICAgICBwYXRjaHNldHNCeUlkID0gbmV3IEhhc2hNYXA8UGF0Y2hTZXQuSWQsIFBhdGNoU2V0PigpOwogICAgIGxvYWRQYXRjaFNldHMoKTsKICAgICBsb2FkTWVzc2FnZXMoKTsKQEAgLTI0MSw2ICsyNTAsMTQgQEAKICAgICAgIGlmIChjYS5nZXRQYXRjaFNldElkKCkuZXF1YWxzKHBzSWQpKSB7CiAgICAgICAgIGQuYWRkKGNhKTsKICAgICAgIH0KKyAgICAgIGZpbmFsIENoYW5nZUNvbnRyb2wgY2hnQ3RybCA9CisgICAgICAgICAgY2hhbmdlQ29udHJvbEdlbmVyaWNGYWN0b3J5LmNvbnRyb2xGb3IoZGV0YWlsLmdldENoYW5nZSgpLAorICAgICAgICAgICAgICBpZGVudGlmaWVkVXNlckZhY3RvcnkuY3JlYXRlKGNhLmdldEFjY291bnRJZCgpKSk7CisgICAgICBmb3IgKFBlcm1pc3Npb25SYW5nZSBwciA6IGNoZ0N0cmwuZ2V0TGFiZWxSYW5nZXMoKSkgeworICAgICAgICBpZiAocHIuZ2V0TWluKCkgIT0gMCB8fCBwci5nZXRNYXgoKSAhPSAwKSB7CisgICAgICAgICAgZC52b3RhYmxlKHByLmdldExhYmVsKCkpOworICAgICAgICB9CisgICAgICB9CiAgICAgfQogCiAgICAgZmluYWwgQWNjb3VudC5JZCBvd25lciA9IGRldGFpbC5nZXRDaGFuZ2UoKS5nZXRPd25lcigpOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL2NoYW5nZWRldGFpbC9DaGFuZ2VNYW5hZ2VTZXJ2aWNlSW1wbC5qYXZhIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL2NoYW5nZWRldGFpbC9DaGFuZ2VNYW5hZ2VTZXJ2aWNlSW1wbC5qYXZhCmluZGV4IGY5OTkyMWIuLjdlYzVmMzQgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9jaGFuZ2VkZXRhaWwvQ2hhbmdlTWFuYWdlU2VydmljZUltcGwuamF2YQorKysgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvY2hhbmdlZGV0YWlsL0NoYW5nZU1hbmFnZVNlcnZpY2VJbXBsLmphdmEKQEAgLTI0LDcgKzI0LDcgQEAKIGNsYXNzIENoYW5nZU1hbmFnZVNlcnZpY2VJbXBsIGltcGxlbWVudHMgQ2hhbmdlTWFuYWdlU2VydmljZSB7CiAgIHByaXZhdGUgZmluYWwgU3VibWl0QWN0aW9uLkZhY3Rvcnkgc3VibWl0QWN0aW9uOwogICBwcml2YXRlIGZpbmFsIEFiYW5kb25DaGFuZ2VIYW5kbGVyLkZhY3RvcnkgYWJhbmRvbkNoYW5nZUhhbmRsZXJGYWN0b3J5OwotICBwcml2YXRlIGZpbmFsIFJlYmFzZUNoYW5nZS5GYWN0b3J5IHJlYmFzZUNoYW5nZUZhY3Rvcnk7CisgIHByaXZhdGUgZmluYWwgUmViYXNlQ2hhbmdlSGFuZGxlci5GYWN0b3J5IHJlYmFzZUNoYW5nZUZhY3Rvcnk7CiAgIHByaXZhdGUgZmluYWwgUmVzdG9yZUNoYW5nZUhhbmRsZXIuRmFjdG9yeSByZXN0b3JlQ2hhbmdlSGFuZGxlckZhY3Rvcnk7CiAgIHByaXZhdGUgZmluYWwgUmV2ZXJ0Q2hhbmdlLkZhY3RvcnkgcmV2ZXJ0Q2hhbmdlRmFjdG9yeTsKICAgcHJpdmF0ZSBmaW5hbCBQdWJsaXNoQWN0aW9uLkZhY3RvcnkgcHVibGlzaEFjdGlvbjsKQEAgLTMzLDcgKzMzLDcgQEAKICAgQEluamVjdAogICBDaGFuZ2VNYW5hZ2VTZXJ2aWNlSW1wbChmaW5hbCBTdWJtaXRBY3Rpb24uRmFjdG9yeSBwYXRjaFNldEFjdGlvbiwKICAgICAgIGZpbmFsIEFiYW5kb25DaGFuZ2VIYW5kbGVyLkZhY3RvcnkgYWJhbmRvbkNoYW5nZUhhbmRsZXJGYWN0b3J5LAotICAgICAgZmluYWwgUmViYXNlQ2hhbmdlLkZhY3RvcnkgcmViYXNlQ2hhbmdlRmFjdG9yeSwKKyAgICAgIGZpbmFsIFJlYmFzZUNoYW5nZUhhbmRsZXIuRmFjdG9yeSByZWJhc2VDaGFuZ2VGYWN0b3J5LAogICAgICAgZmluYWwgUmVzdG9yZUNoYW5nZUhhbmRsZXIuRmFjdG9yeSByZXN0b3JlQ2hhbmdlSGFuZGxlckZhY3RvcnksCiAgICAgICBmaW5hbCBSZXZlcnRDaGFuZ2UuRmFjdG9yeSByZXZlcnRDaGFuZ2VGYWN0b3J5LAogICAgICAgZmluYWwgUHVibGlzaEFjdGlvbi5GYWN0b3J5IHB1Ymxpc2hBY3Rpb24sCmRpZmYgLS1naXQgYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvY2hhbmdlZGV0YWlsL0NoYW5nZU1vZHVsZS5qYXZhIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL2NoYW5nZWRldGFpbC9DaGFuZ2VNb2R1bGUuamF2YQppbmRleCBiNjcyYTQzOS4uMDFlMDI2MiAxMDA2NDQKLS0tIGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL2NoYW5nZWRldGFpbC9DaGFuZ2VNb2R1bGUuamF2YQorKysgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvY2hhbmdlZGV0YWlsL0NoYW5nZU1vZHVsZS5qYXZhCkBAIC0zMSw3ICszMSw3IEBACiAgICAgICAgIGZhY3RvcnkoQWJhbmRvbkNoYW5nZUhhbmRsZXIuRmFjdG9yeS5jbGFzcyk7CiAgICAgICAgIGZhY3RvcnkoUmVzdG9yZUNoYW5nZUhhbmRsZXIuRmFjdG9yeS5jbGFzcyk7CiAgICAgICAgIGZhY3RvcnkoUmV2ZXJ0Q2hhbmdlLkZhY3RvcnkuY2xhc3MpOwotICAgICAgICBmYWN0b3J5KFJlYmFzZUNoYW5nZS5GYWN0b3J5LmNsYXNzKTsKKyAgICAgICAgZmFjdG9yeShSZWJhc2VDaGFuZ2VIYW5kbGVyLkZhY3RvcnkuY2xhc3MpOwogICAgICAgICBmYWN0b3J5KENoYW5nZURldGFpbEZhY3RvcnkuRmFjdG9yeS5jbGFzcyk7CiAgICAgICAgIGZhY3RvcnkoSW5jbHVkZWRJbkRldGFpbEZhY3RvcnkuRmFjdG9yeS5jbGFzcyk7CiAgICAgICAgIGZhY3RvcnkoUGF0Y2hTZXREZXRhaWxGYWN0b3J5LkZhY3RvcnkuY2xhc3MpOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL2NoYW5nZWRldGFpbC9QYXRjaFNldFB1Ymxpc2hEZXRhaWxGYWN0b3J5LmphdmEgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvY2hhbmdlZGV0YWlsL1BhdGNoU2V0UHVibGlzaERldGFpbEZhY3RvcnkuamF2YQppbmRleCA1MGJhZjk3Li44YTQzMjBmIDEwMDY0NAotLS0gYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvY2hhbmdlZGV0YWlsL1BhdGNoU2V0UHVibGlzaERldGFpbEZhY3RvcnkuamF2YQorKysgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvY2hhbmdlZGV0YWlsL1BhdGNoU2V0UHVibGlzaERldGFpbEZhY3RvcnkuamF2YQpAQCAtNTUsNiArNTUsOCBAQAogICBwcml2YXRlIGZpbmFsIFJldmlld0RiIGRiOwogICBwcml2YXRlIGZpbmFsIEZ1bmN0aW9uU3RhdGUuRmFjdG9yeSBmdW5jdGlvblN0YXRlOwogICBwcml2YXRlIGZpbmFsIENoYW5nZUNvbnRyb2wuRmFjdG9yeSBjaGFuZ2VDb250cm9sRmFjdG9yeTsKKyAgcHJpdmF0ZSBmaW5hbCBDaGFuZ2VDb250cm9sLkdlbmVyaWNGYWN0b3J5IGNoYW5nZUNvbnRyb2xHZW5lcmljRmFjdG9yeTsKKyAgcHJpdmF0ZSBmaW5hbCBJZGVudGlmaWVkVXNlci5HZW5lcmljRmFjdG9yeSBpZGVudGlmaWVkVXNlckZhY3Rvcnk7CiAgIHByaXZhdGUgZmluYWwgQXBwcm92YWxUeXBlcyBhcHByb3ZhbFR5cGVzOwogICBwcml2YXRlIGZpbmFsIEFjY291bnRJbmZvQ2FjaGVGYWN0b3J5IGFpYzsKICAgcHJpdmF0ZSBmaW5hbCBJZGVudGlmaWVkVXNlciB1c2VyOwpAQCAtNzEsMTIgKzczLDE2IEBACiAgICAgICBmaW5hbCBBY2NvdW50SW5mb0NhY2hlRmFjdG9yeS5GYWN0b3J5IGFjY291bnRJbmZvQ2FjaGVGYWN0b3J5LAogICAgICAgZmluYWwgRnVuY3Rpb25TdGF0ZS5GYWN0b3J5IGZ1bmN0aW9uU3RhdGUsCiAgICAgICBmaW5hbCBDaGFuZ2VDb250cm9sLkZhY3RvcnkgY2hhbmdlQ29udHJvbEZhY3RvcnksCisgICAgICBmaW5hbCBDaGFuZ2VDb250cm9sLkdlbmVyaWNGYWN0b3J5IGNoYW5nZUNvbnRyb2xHZW5lcmljRmFjdG9yeSwKKyAgICAgIGZpbmFsIElkZW50aWZpZWRVc2VyLkdlbmVyaWNGYWN0b3J5IGlkZW50aWZpZWRVc2VyRmFjdG9yeSwKICAgICAgIGZpbmFsIEFwcHJvdmFsVHlwZXMgYXBwcm92YWxUeXBlcywKICAgICAgIGZpbmFsIElkZW50aWZpZWRVc2VyIHVzZXIsIEBBc3Npc3RlZCBmaW5hbCBQYXRjaFNldC5JZCBwYXRjaFNldElkKSB7CiAgICAgdGhpcy5pbmZvRmFjdG9yeSA9IGluZm9GYWN0b3J5OwogICAgIHRoaXMuZGIgPSBkYjsKICAgICB0aGlzLmZ1bmN0aW9uU3RhdGUgPSBmdW5jdGlvblN0YXRlOwogICAgIHRoaXMuY2hhbmdlQ29udHJvbEZhY3RvcnkgPSBjaGFuZ2VDb250cm9sRmFjdG9yeTsKKyAgICB0aGlzLmNoYW5nZUNvbnRyb2xHZW5lcmljRmFjdG9yeSA9IGNoYW5nZUNvbnRyb2xHZW5lcmljRmFjdG9yeTsKKyAgICB0aGlzLmlkZW50aWZpZWRVc2VyRmFjdG9yeSA9IGlkZW50aWZpZWRVc2VyRmFjdG9yeTsKICAgICB0aGlzLmFwcHJvdmFsVHlwZXMgPSBhcHByb3ZhbFR5cGVzOwogICAgIHRoaXMuYWljID0gYWNjb3VudEluZm9DYWNoZUZhY3RvcnkuY3JlYXRlKCk7CiAgICAgdGhpcy51c2VyID0gdXNlcjsKQEAgLTE4MCw2ICsxODYsOCBAQAogICAgICAgZGV0YWlsLnNldFN1Ym1pdFJlY29yZHMoc3VibWl0UmVjb3Jkcyk7CiAgICAgfQogCisgICAgZGV0YWlsLnNldFN1Ym1pdFR5cGVSZWNvcmQoY29udHJvbC5nZXRTdWJtaXRUeXBlUmVjb3JkKGRiLCBwYXRjaFNldCkpOworCiAgICAgZGV0YWlsLnNldExhYmVscyhhbGxvd2VkKTsKICAgICBkZXRhaWwuc2V0R2l2ZW4oZ2l2ZW4pOwogICAgIGxvYWRBcHByb3ZhbHMoZGV0YWlsLCBjb250cm9sKTsKQEAgLTE5MCw3ICsxOTgsNyBAQAogICB9CiAKICAgcHJpdmF0ZSB2b2lkIGxvYWRBcHByb3ZhbHMoZmluYWwgUGF0Y2hTZXRQdWJsaXNoRGV0YWlsIGRldGFpbCwKLSAgICAgIGZpbmFsIENoYW5nZUNvbnRyb2wgY29udHJvbCkgdGhyb3dzIE9ybUV4Y2VwdGlvbiB7CisgICAgICBmaW5hbCBDaGFuZ2VDb250cm9sIGNvbnRyb2wpIHRocm93cyBPcm1FeGNlcHRpb24sIE5vU3VjaENoYW5nZUV4Y2VwdGlvbiB7CiAgICAgZmluYWwgUGF0Y2hTZXQuSWQgcHNJZCA9IGRldGFpbC5nZXRDaGFuZ2UoKS5jdXJyZW50UGF0Y2hTZXRJZCgpOwogICAgIGZpbmFsIENoYW5nZS5JZCBjaGFuZ2VJZCA9IHBhdGNoU2V0SWQuZ2V0UGFyZW50S2V5KCk7CiAgICAgZmluYWwgTGlzdDxQYXRjaFNldEFwcHJvdmFsPiBhbGxBcHByb3ZhbHMgPQpAQCAtMjIxLDYgKzIyOSwxNCBAQAogICAgICAgaWYgKGNhLmdldFBhdGNoU2V0SWQoKS5lcXVhbHMocHNJZCkpIHsKICAgICAgICAgZC5hZGQoY2EpOwogICAgICAgfQorICAgICAgZmluYWwgQ2hhbmdlQ29udHJvbCBjaGdDdHJsID0KKyAgICAgICAgICBjaGFuZ2VDb250cm9sR2VuZXJpY0ZhY3RvcnkuY29udHJvbEZvcihkZXRhaWwuZ2V0Q2hhbmdlKCksCisgICAgICAgICAgICAgIGlkZW50aWZpZWRVc2VyRmFjdG9yeS5jcmVhdGUoY2EuZ2V0QWNjb3VudElkKCkpKTsKKyAgICAgIGZvciAoUGVybWlzc2lvblJhbmdlIHByIDogY2hnQ3RybC5nZXRMYWJlbFJhbmdlcygpKSB7CisgICAgICAgIGlmIChwci5nZXRNaW4oKSAhPSAwIHx8IHByLmdldE1heCgpICE9IDApIHsKKyAgICAgICAgICBkLnZvdGFibGUocHIuZ2V0TGFiZWwoKSk7CisgICAgICAgIH0KKyAgICAgIH0KICAgICB9CiAKICAgICBmaW5hbCBBY2NvdW50LklkIG93bmVyID0gZGV0YWlsLmdldENoYW5nZSgpLmdldE93bmVyKCk7CmRpZmYgLS1naXQgYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvY2hhbmdlZGV0YWlsL1JlYmFzZUNoYW5nZS5qYXZhIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL2NoYW5nZWRldGFpbC9SZWJhc2VDaGFuZ2UuamF2YQpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggZTcxZTMwMi4uMDAwMDAwMAotLS0gYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvY2hhbmdlZGV0YWlsL1JlYmFzZUNoYW5nZS5qYXZhCisrKyAvZGV2L251bGwKQEAgLTEsMTEwICswLDAgQEAKLS8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0Ci0vLwotLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7Ci0vLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCi0vLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKLS8vCi0vLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKLS8vCi0vLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCi0vLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAotLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCi0vLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCi0vLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KLQotcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5ycGMuY2hhbmdlZGV0YWlsOwotCi1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLkNoYW5nZUhvb2tSdW5uZXI7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQ2hhbmdlRGV0YWlsOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5lcnJvcnMuTm9TdWNoRW50aXR5RXhjZXB0aW9uOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLnJwYy5IYW5kbGVyOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5zZXJ2ZXIuUmV2aWV3RGI7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLkFwcHJvdmFsc1V0aWw7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLkNoYW5nZVV0aWw7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLkdlcnJpdFBlcnNvbklkZW50OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5JZGVudGlmaWVkVXNlcjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZXh0ZW5zaW9ucy5ldmVudHMuR2l0UmVmZXJlbmNlVXBkYXRlZDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LkdpdFJlcG9zaXRvcnlNYW5hZ2VyOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5tYWlsLkVtYWlsRXhjZXB0aW9uOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5tYWlsLlJlYmFzZWRQYXRjaFNldFNlbmRlcjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucGF0Y2guUGF0Y2hTZXRJbmZvRmFjdG9yeTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucGF0Y2guUGF0Y2hTZXRJbmZvTm90QXZhaWxhYmxlRXhjZXB0aW9uOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LkNoYW5nZUNvbnRyb2w7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuSW52YWxpZENoYW5nZU9wZXJhdGlvbkV4Y2VwdGlvbjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5Ob1N1Y2hDaGFuZ2VFeGNlcHRpb247Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLk9ybUV4Y2VwdGlvbjsKLWltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7Ci1pbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuYXNzaXN0ZWRpbmplY3QuQXNzaXN0ZWQ7Ci0KLWltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmVycm9ycy5JbmNvcnJlY3RPYmplY3RUeXBlRXhjZXB0aW9uOwotaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQuZXJyb3JzLk1pc3NpbmdPYmplY3RFeGNlcHRpb247Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuUGVyc29uSWRlbnQ7Ci0KLWltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOwotCi1jbGFzcyBSZWJhc2VDaGFuZ2UgZXh0ZW5kcyBIYW5kbGVyPENoYW5nZURldGFpbD4gewotICBpbnRlcmZhY2UgRmFjdG9yeSB7Ci0gICAgUmViYXNlQ2hhbmdlIGNyZWF0ZShQYXRjaFNldC5JZCBwYXRjaFNldElkKTsKLSAgfQotCi0gIHByaXZhdGUgZmluYWwgQ2hhbmdlQ29udHJvbC5GYWN0b3J5IGNoYW5nZUNvbnRyb2xGYWN0b3J5OwotICBwcml2YXRlIGZpbmFsIFJldmlld0RiIGRiOwotICBwcml2YXRlIGZpbmFsIElkZW50aWZpZWRVc2VyIGN1cnJlbnRVc2VyOwotICBwcml2YXRlIGZpbmFsIFJlYmFzZWRQYXRjaFNldFNlbmRlci5GYWN0b3J5IHJlYmFzZWRQYXRjaFNldFNlbmRlckZhY3Rvcnk7Ci0KLSAgcHJpdmF0ZSBmaW5hbCBDaGFuZ2VEZXRhaWxGYWN0b3J5LkZhY3RvcnkgY2hhbmdlRGV0YWlsRmFjdG9yeTsKLSAgcHJpdmF0ZSBmaW5hbCBHaXRSZWZlcmVuY2VVcGRhdGVkIHJlcGxpY2F0aW9uOwotCi0gIHByaXZhdGUgZmluYWwgUGF0Y2hTZXQuSWQgcGF0Y2hTZXRJZDsKLQotICBwcml2YXRlIGZpbmFsIENoYW5nZUhvb2tSdW5uZXIgaG9va3M7Ci0KLSAgcHJpdmF0ZSBmaW5hbCBHaXRSZXBvc2l0b3J5TWFuYWdlciBnaXRNYW5hZ2VyOwotICBwcml2YXRlIGZpbmFsIFBhdGNoU2V0SW5mb0ZhY3RvcnkgcGF0Y2hTZXRJbmZvRmFjdG9yeTsKLQotICBwcml2YXRlIGZpbmFsIFBlcnNvbklkZW50IG15SWRlbnQ7Ci0KLSAgcHJpdmF0ZSBmaW5hbCBBcHByb3ZhbHNVdGlsIGFwcHJvdmFsc1V0aWw7Ci0KLSAgQEluamVjdAotICBSZWJhc2VDaGFuZ2UoZmluYWwgQ2hhbmdlQ29udHJvbC5GYWN0b3J5IGNoYW5nZUNvbnRyb2xGYWN0b3J5LAotICAgICAgZmluYWwgUmV2aWV3RGIgZGIsIGZpbmFsIElkZW50aWZpZWRVc2VyIGN1cnJlbnRVc2VyLAotICAgICAgZmluYWwgUmViYXNlZFBhdGNoU2V0U2VuZGVyLkZhY3RvcnkgcmViYXNlZFBhdGNoU2V0U2VuZGVyRmFjdG9yeSwKLSAgICAgIGZpbmFsIENoYW5nZURldGFpbEZhY3RvcnkuRmFjdG9yeSBjaGFuZ2VEZXRhaWxGYWN0b3J5LAotICAgICAgQEFzc2lzdGVkIGZpbmFsIFBhdGNoU2V0LklkIHBhdGNoU2V0SWQsIGZpbmFsIENoYW5nZUhvb2tSdW5uZXIgaG9va3MsCi0gICAgICBmaW5hbCBHaXRSZXBvc2l0b3J5TWFuYWdlciBnaXRNYW5hZ2VyLAotICAgICAgZmluYWwgUGF0Y2hTZXRJbmZvRmFjdG9yeSBwYXRjaFNldEluZm9GYWN0b3J5LAotICAgICAgZmluYWwgR2l0UmVmZXJlbmNlVXBkYXRlZCByZXBsaWNhdGlvbiwKLSAgICAgIEBHZXJyaXRQZXJzb25JZGVudCBmaW5hbCBQZXJzb25JZGVudCBteUlkZW50LAotICAgICAgZmluYWwgQXBwcm92YWxzVXRpbCBhcHByb3ZhbHNVdGlsKSB7Ci0gICAgdGhpcy5jaGFuZ2VDb250cm9sRmFjdG9yeSA9IGNoYW5nZUNvbnRyb2xGYWN0b3J5OwotICAgIHRoaXMuZGIgPSBkYjsKLSAgICB0aGlzLmN1cnJlbnRVc2VyID0gY3VycmVudFVzZXI7Ci0gICAgdGhpcy5yZWJhc2VkUGF0Y2hTZXRTZW5kZXJGYWN0b3J5ID0gcmViYXNlZFBhdGNoU2V0U2VuZGVyRmFjdG9yeTsKLSAgICB0aGlzLmNoYW5nZURldGFpbEZhY3RvcnkgPSBjaGFuZ2VEZXRhaWxGYWN0b3J5OwotCi0gICAgdGhpcy5wYXRjaFNldElkID0gcGF0Y2hTZXRJZDsKLSAgICB0aGlzLmhvb2tzID0gaG9va3M7Ci0gICAgdGhpcy5naXRNYW5hZ2VyID0gZ2l0TWFuYWdlcjsKLQotICAgIHRoaXMucGF0Y2hTZXRJbmZvRmFjdG9yeSA9IHBhdGNoU2V0SW5mb0ZhY3Rvcnk7Ci0gICAgdGhpcy5yZXBsaWNhdGlvbiA9IHJlcGxpY2F0aW9uOwotICAgIHRoaXMubXlJZGVudCA9IG15SWRlbnQ7Ci0KLSAgICB0aGlzLmFwcHJvdmFsc1V0aWwgPSBhcHByb3ZhbHNVdGlsOwotICB9Ci0KLSAgQE92ZXJyaWRlCi0gIHB1YmxpYyBDaGFuZ2VEZXRhaWwgY2FsbCgpIHRocm93cyBOb1N1Y2hDaGFuZ2VFeGNlcHRpb24sIE9ybUV4Y2VwdGlvbiwKLSAgICAgIEVtYWlsRXhjZXB0aW9uLCBOb1N1Y2hFbnRpdHlFeGNlcHRpb24sIFBhdGNoU2V0SW5mb05vdEF2YWlsYWJsZUV4Y2VwdGlvbiwKLSAgICAgIE1pc3NpbmdPYmplY3RFeGNlcHRpb24sIEluY29ycmVjdE9iamVjdFR5cGVFeGNlcHRpb24sIElPRXhjZXB0aW9uLAotICAgICAgSW52YWxpZENoYW5nZU9wZXJhdGlvbkV4Y2VwdGlvbiB7Ci0KLSAgICBDaGFuZ2VVdGlsLnJlYmFzZUNoYW5nZShwYXRjaFNldElkLCBjdXJyZW50VXNlciwgZGIsCi0gICAgICAgIHJlYmFzZWRQYXRjaFNldFNlbmRlckZhY3RvcnksIGhvb2tzLCBnaXRNYW5hZ2VyLCBwYXRjaFNldEluZm9GYWN0b3J5LAotICAgICAgICByZXBsaWNhdGlvbiwgbXlJZGVudCwgY2hhbmdlQ29udHJvbEZhY3RvcnksIGFwcHJvdmFsc1V0aWwpOwotCi0gICAgcmV0dXJuIGNoYW5nZURldGFpbEZhY3RvcnkuY3JlYXRlKHBhdGNoU2V0SWQuZ2V0UGFyZW50S2V5KCkpLmNhbGwoKTsKLSAgfQotfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL2NoYW5nZWRldGFpbC9SZWJhc2VDaGFuZ2VIYW5kbGVyLmphdmEgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvY2hhbmdlZGV0YWlsL1JlYmFzZUNoYW5nZUhhbmRsZXIuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi41ZDE3MDczCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL2NoYW5nZWRldGFpbC9SZWJhc2VDaGFuZ2VIYW5kbGVyLmphdmEKQEAgLTAsMCArMSw2NyBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLnJwYy5jaGFuZ2VkZXRhaWw7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5DaGFuZ2VEZXRhaWw7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmVycm9ycy5Ob1N1Y2hFbnRpdHlFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuaHR0cGQucnBjLkhhbmRsZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5JZGVudGlmaWVkVXNlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY2hhbmdlZGV0YWlsLlJlYmFzZUNoYW5nZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIubWFpbC5FbWFpbEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucGF0Y2guUGF0Y2hTZXRJbmZvTm90QXZhaWxhYmxlRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LkludmFsaWRDaGFuZ2VPcGVyYXRpb25FeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuTm9TdWNoQ2hhbmdlRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5Pcm1FeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LmFzc2lzdGVkaW5qZWN0LkFzc2lzdGVkOworCitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5lcnJvcnMuSW5jb3JyZWN0T2JqZWN0VHlwZUV4Y2VwdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmVycm9ycy5NaXNzaW5nT2JqZWN0RXhjZXB0aW9uOworCitpbXBvcnQgamF2YS5pby5JT0V4Y2VwdGlvbjsKKworY2xhc3MgUmViYXNlQ2hhbmdlSGFuZGxlciBleHRlbmRzIEhhbmRsZXI8Q2hhbmdlRGV0YWlsPiB7CisgIGludGVyZmFjZSBGYWN0b3J5IHsKKyAgICBSZWJhc2VDaGFuZ2VIYW5kbGVyIGNyZWF0ZShQYXRjaFNldC5JZCBwYXRjaFNldElkKTsKKyAgfQorCisgIHByaXZhdGUgZmluYWwgUmViYXNlQ2hhbmdlIHJlYmFzZUNoYW5nZTsKKyAgcHJpdmF0ZSBmaW5hbCBJZGVudGlmaWVkVXNlciBjdXJyZW50VXNlcjsKKyAgcHJpdmF0ZSBmaW5hbCBDaGFuZ2VEZXRhaWxGYWN0b3J5LkZhY3RvcnkgY2hhbmdlRGV0YWlsRmFjdG9yeTsKKworICBwcml2YXRlIGZpbmFsIFBhdGNoU2V0LklkIHBhdGNoU2V0SWQ7CisKKyAgQEluamVjdAorICBSZWJhc2VDaGFuZ2VIYW5kbGVyKGZpbmFsIFJlYmFzZUNoYW5nZS5GYWN0b3J5IHJlYmFzZUNoYW5nZUZhY3RvcnksCisgICAgICBmaW5hbCBJZGVudGlmaWVkVXNlciBjdXJyZW50VXNlciwKKyAgICAgIGZpbmFsIENoYW5nZURldGFpbEZhY3RvcnkuRmFjdG9yeSBjaGFuZ2VEZXRhaWxGYWN0b3J5LAorICAgICAgQEFzc2lzdGVkIGZpbmFsIFBhdGNoU2V0LklkIHBhdGNoU2V0SWQpIHsKKyAgICB0aGlzLnJlYmFzZUNoYW5nZSA9IHJlYmFzZUNoYW5nZUZhY3RvcnkuY3JlYXRlKCk7CisgICAgdGhpcy5jdXJyZW50VXNlciA9IGN1cnJlbnRVc2VyOworICAgIHRoaXMuY2hhbmdlRGV0YWlsRmFjdG9yeSA9IGNoYW5nZURldGFpbEZhY3Rvcnk7CisKKyAgICB0aGlzLnBhdGNoU2V0SWQgPSBwYXRjaFNldElkOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBDaGFuZ2VEZXRhaWwgY2FsbCgpIHRocm93cyBOb1N1Y2hDaGFuZ2VFeGNlcHRpb24sIE9ybUV4Y2VwdGlvbiwKKyAgICAgIEVtYWlsRXhjZXB0aW9uLCBOb1N1Y2hFbnRpdHlFeGNlcHRpb24sIFBhdGNoU2V0SW5mb05vdEF2YWlsYWJsZUV4Y2VwdGlvbiwKKyAgICAgIE1pc3NpbmdPYmplY3RFeGNlcHRpb24sIEluY29ycmVjdE9iamVjdFR5cGVFeGNlcHRpb24sIElPRXhjZXB0aW9uLAorICAgICAgSW52YWxpZENoYW5nZU9wZXJhdGlvbkV4Y2VwdGlvbiB7CisgICAgcmViYXNlQ2hhbmdlLnJlYmFzZShwYXRjaFNldElkLCBjdXJyZW50VXNlci5nZXRBY2NvdW50SWQoKSk7CisgICAgcmV0dXJuIGNoYW5nZURldGFpbEZhY3RvcnkuY3JlYXRlKHBhdGNoU2V0SWQuZ2V0UGFyZW50S2V5KCkpLmNhbGwoKTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL3Byb2plY3QvQWRkQnJhbmNoLmphdmEgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvcHJvamVjdC9BZGRCcmFuY2guamF2YQppbmRleCA5N2U5YmI0Li40ZTE0YTM5IDEwMDY0NAotLS0gYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvcHJvamVjdC9BZGRCcmFuY2guamF2YQorKysgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvcHJvamVjdC9BZGRCcmFuY2guamF2YQpAQCAtMTUsOCArMTUsNyBAQAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5ycGMucHJvamVjdDsKIAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5DaGFuZ2VIb29rczsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5MaXN0QnJhbmNoZXNSZXN1bHQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmVycm9ycy5JbnZhbGlkTmFtZUV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5BZGRCcmFuY2hSZXN1bHQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmVycm9ycy5JbnZhbGlkUmV2aXNpb25FeGNlcHRpb247CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuaHR0cGQucnBjLkhhbmRsZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkJyYW5jaDsKQEAgLTQ2LDcgKzQ1LDcgQEAKIAogaW1wb3J0IGphdmEuaW8uSU9FeGNlcHRpb247CiAKLWNsYXNzIEFkZEJyYW5jaCBleHRlbmRzIEhhbmRsZXI8TGlzdEJyYW5jaGVzUmVzdWx0PiB7CitjbGFzcyBBZGRCcmFuY2ggZXh0ZW5kcyBIYW5kbGVyPEFkZEJyYW5jaFJlc3VsdD4gewogICBwcml2YXRlIHN0YXRpYyBmaW5hbCBMb2dnZXIgbG9nID0gTG9nZ2VyRmFjdG9yeS5nZXRMb2dnZXIoQWRkQnJhbmNoLmNsYXNzKTsKIAogICBpbnRlcmZhY2UgRmFjdG9yeSB7CkBAIC05MCw5ICs4OSw3IEBACiAgIH0KIAogICBAT3ZlcnJpZGUKLSAgcHVibGljIExpc3RCcmFuY2hlc1Jlc3VsdCBjYWxsKCkgdGhyb3dzIE5vU3VjaFByb2plY3RFeGNlcHRpb24sCi0gICAgICBJbnZhbGlkTmFtZUV4Y2VwdGlvbiwgSW52YWxpZFJldmlzaW9uRXhjZXB0aW9uLCBJT0V4Y2VwdGlvbiwKLSAgICAgIEJyYW5jaENyZWF0aW9uTm90QWxsb3dlZEV4Y2VwdGlvbiB7CisgIHB1YmxpYyBBZGRCcmFuY2hSZXN1bHQgY2FsbCgpIHRocm93cyBOb1N1Y2hQcm9qZWN0RXhjZXB0aW9uLCBJT0V4Y2VwdGlvbiB7CiAgICAgZmluYWwgUHJvamVjdENvbnRyb2wgcHJvamVjdENvbnRyb2wgPQogICAgICAgICBwcm9qZWN0Q29udHJvbEZhY3RvcnkuY29udHJvbEZvcihwcm9qZWN0TmFtZSk7CiAKQEAgLTEwNCwxMCArMTAxLDE0IEBACiAgICAgICByZWZuYW1lID0gQ29uc3RhbnRzLlJfSEVBRFMgKyByZWZuYW1lOwogICAgIH0KICAgICBpZiAoIVJlcG9zaXRvcnkuaXNWYWxpZFJlZk5hbWUocmVmbmFtZSkpIHsKLSAgICAgIHRocm93IG5ldyBJbnZhbGlkTmFtZUV4Y2VwdGlvbigpOworICAgICAgcmV0dXJuIG5ldyBBZGRCcmFuY2hSZXN1bHQobmV3IEFkZEJyYW5jaFJlc3VsdC5FcnJvcigKKyAgICAgICAgICBBZGRCcmFuY2hSZXN1bHQuRXJyb3IuVHlwZS5JTlZBTElEX05BTUUsIHJlZm5hbWUpKTsKICAgICB9CiAgICAgaWYgKE1hZ2ljQnJhbmNoLmlzTWFnaWNCcmFuY2gocmVmbmFtZSkpIHsKLSAgICAgIHRocm93IG5ldyBCcmFuY2hDcmVhdGlvbk5vdEFsbG93ZWRFeGNlcHRpb24ocmVmbmFtZSk7CisgICAgICByZXR1cm4gbmV3IEFkZEJyYW5jaFJlc3VsdCgKKyAgICAgICAgICBuZXcgQWRkQnJhbmNoUmVzdWx0LkVycm9yKAorICAgICAgICAgICAgICBBZGRCcmFuY2hSZXN1bHQuRXJyb3IuVHlwZS5CUkFOQ0hfQ1JFQVRJT05fTk9UX0FMTE9XRURfVU5ERVJfUkVGTkFNRV9QUkVGSVgsCisgICAgICAgICAgICAgIE1hZ2ljQnJhbmNoLmdldE1hZ2ljUmVmTmFtZVByZWZpeChyZWZuYW1lKSkpOwogICAgIH0KIAogICAgIGZpbmFsIEJyYW5jaC5OYW1lS2V5IG5hbWUgPSBuZXcgQnJhbmNoLk5hbWVLZXkocHJvamVjdE5hbWUsIHJlZm5hbWUpOwpAQCAtMTQ3LDYgKzE0OCwxOSBAQAogICAgICAgICAgICAgcmVmZXJlbmNlVXBkYXRlZC5maXJlKG5hbWUuZ2V0UGFyZW50S2V5KCksIHJlZm5hbWUpOwogICAgICAgICAgICAgaG9va3MuZG9SZWZVcGRhdGVkSG9vayhuYW1lLCB1LCBpZGVudGlmaWVkVXNlci5nZXRBY2NvdW50KCkpOwogICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgY2FzZSBMT0NLX0ZBSUxVUkU6CisgICAgICAgICAgICBpZiAocmVwby5nZXRSZWYocmVmbmFtZSkgIT0gbnVsbCkgeworICAgICAgICAgICAgICByZXR1cm4gbmV3IEFkZEJyYW5jaFJlc3VsdChuZXcgQWRkQnJhbmNoUmVzdWx0LkVycm9yKAorICAgICAgICAgICAgICAgICAgQWRkQnJhbmNoUmVzdWx0LkVycm9yLlR5cGUuQlJBTkNIX0FMUkVBRFlfRVhJU1RTLCByZWZuYW1lKSk7CisgICAgICAgICAgICB9CisgICAgICAgICAgICBTdHJpbmcgcmVmUHJlZml4ID0gZ2V0UmVmUHJlZml4KHJlZm5hbWUpOworICAgICAgICAgICAgd2hpbGUgKCFDb25zdGFudHMuUl9IRUFEUy5lcXVhbHMocmVmUHJlZml4KSkgeworICAgICAgICAgICAgICBpZiAocmVwby5nZXRSZWYocmVmUHJlZml4KSAhPSBudWxsKSB7CisgICAgICAgICAgICAgICAgcmV0dXJuIG5ldyBBZGRCcmFuY2hSZXN1bHQobmV3IEFkZEJyYW5jaFJlc3VsdC5FcnJvcigKKyAgICAgICAgICAgICAgICAgICAgQWRkQnJhbmNoUmVzdWx0LkVycm9yLlR5cGUuQlJBTkNIX0NSRUFUSU9OX0NPTkZMSUNULCByZWZQcmVmaXgpKTsKKyAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICByZWZQcmVmaXggPSBnZXRSZWZQcmVmaXgocmVmUHJlZml4KTsKKyAgICAgICAgICAgIH0KICAgICAgICAgICBkZWZhdWx0OiB7CiAgICAgICAgICAgICB0aHJvdyBuZXcgSU9FeGNlcHRpb24ocmVzdWx0Lm5hbWUoKSk7CiAgICAgICAgICAgfQpAQCAtMTU1LDExICsxNjksMjIgQEAKICAgICAgICAgbG9nLmVycm9yKCJDYW5ub3QgY3JlYXRlIGJyYW5jaCAiICsgbmFtZSwgZXJyKTsKICAgICAgICAgdGhyb3cgZXJyOwogICAgICAgfQorICAgIH0gY2F0Y2ggKEludmFsaWRSZXZpc2lvbkV4Y2VwdGlvbiBlKSB7CisgICAgICByZXR1cm4gbmV3IEFkZEJyYW5jaFJlc3VsdChuZXcgQWRkQnJhbmNoUmVzdWx0LkVycm9yKAorICAgICAgICAgIEFkZEJyYW5jaFJlc3VsdC5FcnJvci5UeXBlLklOVkFMSURfUkVWSVNJT04pKTsKICAgICB9IGZpbmFsbHkgewogICAgICAgcmVwby5jbG9zZSgpOwogICAgIH0KIAotICAgIHJldHVybiBsaXN0QnJhbmNoZXNGYWN0b3J5LmNyZWF0ZShwcm9qZWN0TmFtZSkuY2FsbCgpOworICAgIHJldHVybiBuZXcgQWRkQnJhbmNoUmVzdWx0KGxpc3RCcmFuY2hlc0ZhY3RvcnkuY3JlYXRlKHByb2plY3ROYW1lKS5jYWxsKCkpOworICB9CisKKyAgcHJpdmF0ZSBzdGF0aWMgU3RyaW5nIGdldFJlZlByZWZpeChmaW5hbCBTdHJpbmcgcmVmTmFtZSkgeworICAgIGZpbmFsIGludCBpID0gcmVmTmFtZS5sYXN0SW5kZXhPZignLycpOworICAgIGlmIChpID4gQ29uc3RhbnRzLlJfSEVBRFMubGVuZ3RoKCkgLSAxKSB7CisgICAgICByZXR1cm4gcmVmTmFtZS5zdWJzdHJpbmcoMCwgaSk7CisgICAgfQorICAgIHJldHVybiBDb25zdGFudHMuUl9IRUFEUzsKICAgfQogCiAgIHByaXZhdGUgT2JqZWN0SWQgcGFyc2VTdGFydGluZ1JldmlzaW9uKGZpbmFsIFJlcG9zaXRvcnkgcmVwbykKZGlmZiAtLWdpdCBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9wcm9qZWN0L1Byb2plY3RBZG1pblNlcnZpY2VJbXBsLmphdmEgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvcHJvamVjdC9Qcm9qZWN0QWRtaW5TZXJ2aWNlSW1wbC5qYXZhCmluZGV4IDk4M2YxZmMuLjM1MDE0ZDIgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9wcm9qZWN0L1Byb2plY3RBZG1pblNlcnZpY2VJbXBsLmphdmEKKysrIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL3Byb2plY3QvUHJvamVjdEFkbWluU2VydmljZUltcGwuamF2YQpAQCAtMTUsNiArMTUsNyBAQAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5ycGMucHJvamVjdDsKIAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkFjY2Vzc1NlY3Rpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQWRkQnJhbmNoUmVzdWx0OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkxpc3RCcmFuY2hlc1Jlc3VsdDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5Qcm9qZWN0QWNjZXNzOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLlByb2plY3RBZG1pblNlcnZpY2U7CkBAIC0xMjYsNyArMTI3LDcgQEAKICAgQE92ZXJyaWRlCiAgIHB1YmxpYyB2b2lkIGFkZEJyYW5jaChmaW5hbCBQcm9qZWN0Lk5hbWVLZXkgcHJvamVjdE5hbWUsCiAgICAgICBmaW5hbCBTdHJpbmcgYnJhbmNoTmFtZSwgZmluYWwgU3RyaW5nIHN0YXJ0aW5nUmV2aXNpb24sCi0gICAgICBmaW5hbCBBc3luY0NhbGxiYWNrPExpc3RCcmFuY2hlc1Jlc3VsdD4gY2FsbGJhY2spIHsKKyAgICAgIGZpbmFsIEFzeW5jQ2FsbGJhY2s8QWRkQnJhbmNoUmVzdWx0PiBjYWxsYmFjaykgewogICAgIGFkZEJyYW5jaEZhY3RvcnkuY3JlYXRlKHByb2plY3ROYW1lLCBicmFuY2hOYW1lLCBzdGFydGluZ1JldmlzaW9uKS50bygKICAgICAgICAgY2FsbGJhY2spOwogICB9CmRpZmYgLS1naXQgYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL2F1dGgvYmVjb21lL0JlY29tZUFueUFjY291bnQuaHRtbCBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvYXV0aC9iZWNvbWUvQmVjb21lQW55QWNjb3VudC5odG1sCmluZGV4IGMzYzc1MDMuLmE0ZTNjY2EgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvYXV0aC9iZWNvbWUvQmVjb21lQW55QWNjb3VudC5odG1sCisrKyBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvYXV0aC9iZWNvbWUvQmVjb21lQW55QWNjb3VudC5odG1sCkBAIC0xLDEwICsxLDEwIEBACiA8aHRtbD4KICAgPGhlYWQ+CiAgICAgPHRpdGxlPkdlcnJpdCBDb2RlIFJldmlldzwvdGl0bGU+Ci0gICAgPHNjcmlwdCBpZD0iZ2Vycml0X2d3dGRldm1vZGUiPgorICAgIDxzY3JpcHQgaWQ9Imd3dGRldm1vZGUiPgogICAgICAgKGZ1bmN0aW9uICgpIHsKICAgICAgICAgdmFyIHBuID0gJ2d3dC5jb2Rlc3ZyJzsKLSAgICAgICAgdmFyIGNuID0gJ2dlcnJpdC4nICsgcG47CisgICAgICAgIHZhciBjbiA9ICdnZXJyaXRfdWkuJyArIHBuOwogCiAgICAgICAgIHZhciBwX3N0YXJ0ID0gd2luZG93LmxvY2F0aW9uLnNlYXJjaC5pbmRleE9mKHBuICsgJz0nKTsKICAgICAgICAgaWYgKHBfc3RhcnQgIT0gLTEpIHsKZGlmZiAtLWdpdCBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcmF3L0hvc3RQYWdlLmh0bWwgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3Jhdy9Ib3N0UGFnZS5odG1sCmluZGV4IGZmMDlmNTAuLmFiYzNhNGEgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcmF3L0hvc3RQYWdlLmh0bWwKKysrIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9yYXcvSG9zdFBhZ2UuaHRtbApAQCAtMiwxMCArMiwxMCBAQAogICA8aGVhZD4KICAgICA8dGl0bGU+R2Vycml0IENvZGUgUmV2aWV3PC90aXRsZT4KICAgICA8bWV0YSBuYW1lPSJnd3Q6cHJvcGVydHkiIGNvbnRlbnQ9ImxvY2FsZT1lbl9VUyIgLz4KLSAgICA8c2NyaXB0IGlkPSJnZXJyaXRfZ3d0ZGV2bW9kZSI+CisgICAgPHNjcmlwdCBpZD0iZ3d0ZGV2bW9kZSI+CiAgICAgICAoZnVuY3Rpb24gKCkgewogICAgICAgICB2YXIgcG4gPSAnZ3d0LmNvZGVzdnInOwotICAgICAgICB2YXIgY24gPSAnZ2Vycml0LicgKyBwbjsKKyAgICAgICAgdmFyIGNuID0gJ2dlcnJpdF91aS4nICsgcG47CiAKICAgICAgICAgdmFyIHBfc3RhcnQgPSB3aW5kb3cubG9jYXRpb24uc2VhcmNoLmluZGV4T2YocG4gKyAnPScpOwogICAgICAgICBpZiAocF9zdGFydCAhPSAtMSkgewpkaWZmIC0tZ2l0IGEvZ2Vycml0LWxhdW5jaGVyL3BvbS54bWwgYi9nZXJyaXQtbGF1bmNoZXIvcG9tLnhtbAppbmRleCBlNzAwMzUxLi40ZjMzY2U4IDEwMDY0NAotLS0gYS9nZXJyaXQtbGF1bmNoZXIvcG9tLnhtbAorKysgYi9nZXJyaXQtbGF1bmNoZXIvcG9tLnhtbApAQCAtMjIsNyArMjIsNyBAQAogICA8cGFyZW50PgogICAgIDxncm91cElkPmNvbS5nb29nbGUuZ2Vycml0PC9ncm91cElkPgogICAgIDxhcnRpZmFjdElkPmdlcnJpdC1wYXJlbnQ8L2FydGlmYWN0SWQ+Ci0gICAgPHZlcnNpb24+Mi41LVNOQVBTSE9UPC92ZXJzaW9uPgorICAgIDx2ZXJzaW9uPjIuNi1TTkFQU0hPVDwvdmVyc2lvbj4KICAgPC9wYXJlbnQ+CiAKICAgPGFydGlmYWN0SWQ+Z2Vycml0LWxhdW5jaGVyPC9hcnRpZmFjdElkPgpkaWZmIC0tZ2l0IGEvZ2Vycml0LW1haW4vcG9tLnhtbCBiL2dlcnJpdC1tYWluL3BvbS54bWwKaW5kZXggYmIyZDc2My4uZDE3NGFmMSAxMDA2NDQKLS0tIGEvZ2Vycml0LW1haW4vcG9tLnhtbAorKysgYi9nZXJyaXQtbWFpbi9wb20ueG1sCkBAIC0yMiw3ICsyMiw3IEBACiAgIDxwYXJlbnQ+CiAgICAgPGdyb3VwSWQ+Y29tLmdvb2dsZS5nZXJyaXQ8L2dyb3VwSWQ+CiAgICAgPGFydGlmYWN0SWQ+Z2Vycml0LXBhcmVudDwvYXJ0aWZhY3RJZD4KLSAgICA8dmVyc2lvbj4yLjUtU05BUFNIT1Q8L3ZlcnNpb24+CisgICAgPHZlcnNpb24+Mi42LVNOQVBTSE9UPC92ZXJzaW9uPgogICA8L3BhcmVudD4KIAogICA8YXJ0aWZhY3RJZD5nZXJyaXQtbWFpbjwvYXJ0aWZhY3RJZD4KZGlmZiAtLWdpdCBhL2dlcnJpdC1vcGVuaWQvcG9tLnhtbCBiL2dlcnJpdC1vcGVuaWQvcG9tLnhtbAppbmRleCBmYTRhYjk1Li5iYjhiOTNkIDEwMDY0NAotLS0gYS9nZXJyaXQtb3BlbmlkL3BvbS54bWwKKysrIGIvZ2Vycml0LW9wZW5pZC9wb20ueG1sCkBAIC0yMiw3ICsyMiw3IEBACiAgIDxwYXJlbnQ+CiAgICAgPGdyb3VwSWQ+Y29tLmdvb2dsZS5nZXJyaXQ8L2dyb3VwSWQ+CiAgICAgPGFydGlmYWN0SWQ+Z2Vycml0LXBhcmVudDwvYXJ0aWZhY3RJZD4KLSAgICA8dmVyc2lvbj4yLjUtU05BUFNIT1Q8L3ZlcnNpb24+CisgICAgPHZlcnNpb24+Mi42LVNOQVBTSE9UPC92ZXJzaW9uPgogICA8L3BhcmVudD4KIAogICA8YXJ0aWZhY3RJZD5nZXJyaXQtb3BlbmlkPC9hcnRpZmFjdElkPgpkaWZmIC0tZ2l0IGEvZ2Vycml0LXBhY2thZ2UtcGx1Z2lucy9wb20ueG1sIGIvZ2Vycml0LXBhY2thZ2UtcGx1Z2lucy9wb20ueG1sCmluZGV4IGQzZGRmYzQuLmU5MGJiOGUgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1wYWNrYWdlLXBsdWdpbnMvcG9tLnhtbAorKysgYi9nZXJyaXQtcGFja2FnZS1wbHVnaW5zL3BvbS54bWwKQEAgLTIyLDcgKzIyLDcgQEAKICAgPGdyb3VwSWQ+Y29tLmdvb2dsZS5nZXJyaXQ8L2dyb3VwSWQ+CiAgIDxhcnRpZmFjdElkPmdlcnJpdC1wYWNrYWdlLXBsdWdpbnM8L2FydGlmYWN0SWQ+CiAgIDxwYWNrYWdpbmc+d2FyPC9wYWNrYWdpbmc+Ci0gIDx2ZXJzaW9uPjIuNS1TTkFQU0hPVDwvdmVyc2lvbj4KKyAgPHZlcnNpb24+Mi42LVNOQVBTSE9UPC92ZXJzaW9uPgogCiAgIDxuYW1lPkdlcnJpdCBDb2RlIFJldmlldyAtIFBhY2thZ2UgUGx1Z2luczwvbmFtZT4KICAgPHVybD5odHRwOi8vY29kZS5nb29nbGUuY29tL3AvZ2Vycml0LzwvdXJsPgpkaWZmIC0tZ2l0IGEvZ2Vycml0LXBhdGNoLWNvbW1vbnNuZXQvcG9tLnhtbCBiL2dlcnJpdC1wYXRjaC1jb21tb25zbmV0L3BvbS54bWwKaW5kZXggZjFhOGIzZS4uNzhjYTYxYyAxMDA2NDQKLS0tIGEvZ2Vycml0LXBhdGNoLWNvbW1vbnNuZXQvcG9tLnhtbAorKysgYi9nZXJyaXQtcGF0Y2gtY29tbW9uc25ldC9wb20ueG1sCkBAIC0yMiw3ICsyMiw3IEBACiAgIDxwYXJlbnQ+CiAgICAgPGdyb3VwSWQ+Y29tLmdvb2dsZS5nZXJyaXQ8L2dyb3VwSWQ+CiAgICAgPGFydGlmYWN0SWQ+Z2Vycml0LXBhcmVudDwvYXJ0aWZhY3RJZD4KLSAgICA8dmVyc2lvbj4yLjUtU05BUFNIT1Q8L3ZlcnNpb24+CisgICAgPHZlcnNpb24+Mi42LVNOQVBTSE9UPC92ZXJzaW9uPgogICA8L3BhcmVudD4KIAogICA8YXJ0aWZhY3RJZD5nZXJyaXQtcGF0Y2gtY29tbW9uc25ldDwvYXJ0aWZhY3RJZD4KZGlmZiAtLWdpdCBhL2dlcnJpdC1wYXRjaC1qZ2l0L3BvbS54bWwgYi9nZXJyaXQtcGF0Y2gtamdpdC9wb20ueG1sCmluZGV4IDY1MjIzZmIuLjdlNTBhZjggMTAwNjQ0Ci0tLSBhL2dlcnJpdC1wYXRjaC1qZ2l0L3BvbS54bWwKKysrIGIvZ2Vycml0LXBhdGNoLWpnaXQvcG9tLnhtbApAQCAtMjIsNyArMjIsNyBAQAogICA8cGFyZW50PgogICAgIDxncm91cElkPmNvbS5nb29nbGUuZ2Vycml0PC9ncm91cElkPgogICAgIDxhcnRpZmFjdElkPmdlcnJpdC1wYXJlbnQ8L2FydGlmYWN0SWQ+Ci0gICAgPHZlcnNpb24+Mi41LVNOQVBTSE9UPC92ZXJzaW9uPgorICAgIDx2ZXJzaW9uPjIuNi1TTkFQU0hPVDwvdmVyc2lvbj4KICAgPC9wYXJlbnQ+CiAKICAgPGFydGlmYWN0SWQ+Z2Vycml0LXBhdGNoLWpnaXQ8L2FydGlmYWN0SWQ+CmRpZmYgLS1naXQgYS9nZXJyaXQtcGdtL3BvbS54bWwgYi9nZXJyaXQtcGdtL3BvbS54bWwKaW5kZXggYTAxNTIxOS4uNWUyNTM1MCAxMDA2NDQKLS0tIGEvZ2Vycml0LXBnbS9wb20ueG1sCisrKyBiL2dlcnJpdC1wZ20vcG9tLnhtbApAQCAtMjIsNyArMjIsNyBAQAogICA8cGFyZW50PgogICAgIDxncm91cElkPmNvbS5nb29nbGUuZ2Vycml0PC9ncm91cElkPgogICAgIDxhcnRpZmFjdElkPmdlcnJpdC1wYXJlbnQ8L2FydGlmYWN0SWQ+Ci0gICAgPHZlcnNpb24+Mi41LVNOQVBTSE9UPC92ZXJzaW9uPgorICAgIDx2ZXJzaW9uPjIuNi1TTkFQU0hPVDwvdmVyc2lvbj4KICAgPC9wYXJlbnQ+CiAKICAgPGFydGlmYWN0SWQ+Z2Vycml0LXBnbTwvYXJ0aWZhY3RJZD4KZGlmZiAtLWdpdCBhL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vSW5pdC5qYXZhIGIvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9Jbml0LmphdmEKaW5kZXggOTViODQ4N2YuLmMwZjBjNGIgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vSW5pdC5qYXZhCisrKyBiL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vSW5pdC5qYXZhCkBAIC0xNDAsOCArMTQwLDkgQEAKICAgICAgICAgdGhyb3cgKERpZSkgd2h5OwogICAgICAgfQogCi0gICAgICBmaW5hbCBTdHJpbmdCdWlsZGVyIGJ1ZiA9IG5ldyBTdHJpbmdCdWlsZGVyKCk7CisgICAgICBmaW5hbCBTdHJpbmdCdWlsZGVyIGJ1ZiA9IG5ldyBTdHJpbmdCdWlsZGVyKGNlLmdldE1lc3NhZ2UoKSk7CiAgICAgICB3aGlsZSAod2h5ICE9IG51bGwpIHsKKyAgICAgICAgYnVmLmFwcGVuZCgiXG4iKTsKICAgICAgICAgYnVmLmFwcGVuZCh3aHkuZ2V0TWVzc2FnZSgpKTsKICAgICAgICAgd2h5ID0gd2h5LmdldENhdXNlKCk7CiAgICAgICAgIGlmICh3aHkgIT0gbnVsbCkgewpkaWZmIC0tZ2l0IGEvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9odHRwL2pldHR5L0pldHR5U2VydmVyLmphdmEgYi9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL2h0dHAvamV0dHkvSmV0dHlTZXJ2ZXIuamF2YQppbmRleCA1ODIzOTQwLi5kZGVkNzFiIDEwMDY0NAotLS0gYS9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL2h0dHAvamV0dHkvSmV0dHlTZXJ2ZXIuamF2YQorKysgYi9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL2h0dHAvamV0dHkvSmV0dHlTZXJ2ZXIuamF2YQpAQCAtNDkxLDcgKzQ5MSw3IEBACiAgICAgZm9yIChGaWxlIGUgOiBlbnRyaWVzKSB7CiAgICAgICBpZiAoZS5pc0RpcmVjdG9yeSgpIC8qIG11c3QgYmUgYSBkaXJlY3RvcnkgKi8KICAgICAgICAgICAmJiBlLmdldE5hbWUoKS5zdGFydHNXaXRoKCJnZXJyaXQtZ3d0dWktIikKLSAgICAgICAgICAmJiBuZXcgRmlsZShlLCAiZ2Vycml0L2dlcnJpdC5ub2NhY2hlLmpzIikuaXNGaWxlKCkpIHsKKyAgICAgICAgICAmJiBuZXcgRmlsZShlLCAiZ2Vycml0X3VpL2dlcnJpdF91aS5ub2NhY2hlLmpzIikuaXNGaWxlKCkpIHsKICAgICAgICAgcmV0dXJuIFJlc291cmNlLm5ld1Jlc291cmNlKGUudG9VUkkoKSk7CiAgICAgICB9CiAgICAgfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L0RhdGFiYXNlQ29uZmlnSW5pdGlhbGl6ZXIuamF2YSBiL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9EYXRhYmFzZUNvbmZpZ0luaXRpYWxpemVyLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uN2FjMWVkNgotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9EYXRhYmFzZUNvbmZpZ0luaXRpYWxpemVyLmphdmEKQEAgLTAsMCArMSwyNSBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnBnbS5pbml0OworCisvKiogQWJzdHJhY3Rpb24gb2YgaW5pdGlhbGl6ZXIgZm9yIHRoZSBkYXRhYmFzZSBzZWN0aW9uICovCitpbnRlcmZhY2UgRGF0YWJhc2VDb25maWdJbml0aWFsaXplciB7CisKKyAgLyoqCisgICAqIFBlcmZvcm1zIGRhdGFiYXNlIHBsYXRmb3JtIHNwZWNpZmljIGNvbmZpZ3VyYXRpb24gc3RlcHMgYW5kIHdyaXRlcworICAgKiBjb25maWd1cmF0aW9uIHBhcmFtZXRlcnMgaW50byB0aGUgZ2l2ZW4gZGF0YWJhc2Ugc2VjdGlvbgorICAgKi8KKyAgcHVibGljIHZvaWQgaW5pdENvbmZpZyhTZWN0aW9uIGRhdGFiYXNlU2VjdGlvbik7Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL2luaXQvRGF0YWJhc2VDb25maWdNb2R1bGUuamF2YSBiL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9EYXRhYmFzZUNvbmZpZ01vZHVsZS5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjMyZjhjMmUKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL2luaXQvRGF0YWJhc2VDb25maWdNb2R1bGUuamF2YQpAQCAtMCwwICsxLDQxIEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQucGdtLmluaXQ7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLlNpdGVQYXRoczsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5BYnN0cmFjdE1vZHVsZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5uYW1lLk5hbWVzOworCitwdWJsaWMgY2xhc3MgRGF0YWJhc2VDb25maWdNb2R1bGUgZXh0ZW5kcyBBYnN0cmFjdE1vZHVsZSB7CisKKyAgcHJpdmF0ZSBmaW5hbCBTaXRlUGF0aHMgc2l0ZTsKKworICBwdWJsaWMgRGF0YWJhc2VDb25maWdNb2R1bGUoZmluYWwgU2l0ZVBhdGhzIHNpdGUpIHsKKyAgICB0aGlzLnNpdGUgPSBzaXRlOworICB9CisKKyAgQE92ZXJyaWRlCisgIHByb3RlY3RlZCB2b2lkIGNvbmZpZ3VyZSgpIHsKKyAgICBiaW5kKFNpdGVQYXRocy5jbGFzcykudG9JbnN0YW5jZShzaXRlKTsKKyAgICBiaW5kKERhdGFiYXNlQ29uZmlnSW5pdGlhbGl6ZXIuY2xhc3MpLmFubm90YXRlZFdpdGgoCisgICAgICAgIE5hbWVzLm5hbWVkKCJoMiIpKS50byhIMkluaXRpYWxpemVyLmNsYXNzKTsKKyAgICBiaW5kKERhdGFiYXNlQ29uZmlnSW5pdGlhbGl6ZXIuY2xhc3MpLmFubm90YXRlZFdpdGgoCisgICAgICAgIE5hbWVzLm5hbWVkKCJqZGJjIikpLnRvKEpEQkNJbml0aWFsaXplci5jbGFzcyk7CisgICAgYmluZChEYXRhYmFzZUNvbmZpZ0luaXRpYWxpemVyLmNsYXNzKS5hbm5vdGF0ZWRXaXRoKAorICAgICAgICBOYW1lcy5uYW1lZCgibXlzcWwiKSkudG8oTXlTcWxJbml0aWFsaXplci5jbGFzcyk7CisgICAgYmluZChEYXRhYmFzZUNvbmZpZ0luaXRpYWxpemVyLmNsYXNzKS5hbm5vdGF0ZWRXaXRoKAorICAgICAgICBOYW1lcy5uYW1lZCgicG9zdGdyZXNxbCIpKS50byhQb3N0Z3JlU1FMSW5pdGlhbGl6ZXIuY2xhc3MpOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL2luaXQvSDJJbml0aWFsaXplci5qYXZhIGIvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L0gySW5pdGlhbGl6ZXIuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4wZWEzZmYwCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L0gySW5pdGlhbGl6ZXIuamF2YQpAQCAtMCwwICsxLDQ4IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQucGdtLmluaXQ7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLlNpdGVQYXRoczsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CisKK2ltcG9ydCBqYXZhLmlvLkZpbGU7CisKK2NsYXNzIEgySW5pdGlhbGl6ZXIgaW1wbGVtZW50cyBEYXRhYmFzZUNvbmZpZ0luaXRpYWxpemVyIHsKKworICBwcml2YXRlIGZpbmFsIFNpdGVQYXRocyBzaXRlOworCisgIEBJbmplY3QKKyAgSDJJbml0aWFsaXplcihmaW5hbCBTaXRlUGF0aHMgc2l0ZSkgeworICAgIHRoaXMuc2l0ZSA9IHNpdGU7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIHZvaWQgaW5pdENvbmZpZyhTZWN0aW9uIGRhdGFiYXNlU2VjdGlvbikgeworICAgIFN0cmluZyBwYXRoID0gZGF0YWJhc2VTZWN0aW9uLmdldCgiZGF0YWJhc2UiKTsKKyAgICBpZiAocGF0aCA9PSBudWxsKSB7CisgICAgICBwYXRoID0gImRiL1Jldmlld0RCIjsKKyAgICAgIGRhdGFiYXNlU2VjdGlvbi5zZXQoImRhdGFiYXNlIiwgcGF0aCk7CisgICAgfQorICAgIEZpbGUgZGIgPSBzaXRlLnJlc29sdmUocGF0aCk7CisgICAgaWYgKGRiID09IG51bGwpIHsKKyAgICAgIHRocm93IEluaXRVdGlsLmRpZSgiZGF0YWJhc2UuZGF0YWJhc2UgbXVzdCBiZSBzdXBwbGllZCBmb3IgSDIiKTsKKyAgICB9CisgICAgZGIgPSBkYi5nZXRQYXJlbnRGaWxlKCk7CisgICAgaWYgKCFkYi5leGlzdHMoKSAmJiAhZGIubWtkaXJzKCkpIHsKKyAgICAgIHRocm93IEluaXRVdGlsLmRpZSgiY2Fubm90IGNyZWF0ZSBkYXRhYmFzZS5kYXRhYmFzZSAiCisgICAgICAgICAgKyBkYi5nZXRBYnNvbHV0ZVBhdGgoKSk7CisgICAgfQorICB9Cit9ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L0luaXRBdXRoLmphdmEgYi9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL2luaXQvSW5pdEF1dGguamF2YQppbmRleCBmYTRkYzE0Li5lYTEyMDA4IDEwMDY0NAotLS0gYS9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL2luaXQvSW5pdEF1dGguamF2YQorKysgYi9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL2luaXQvSW5pdEF1dGguamF2YQpAQCAtMzIsOCArMzIsOCBAQAogICBASW5qZWN0CiAgIEluaXRBdXRoKGZpbmFsIENvbnNvbGVVSSB1aSwgZmluYWwgU2VjdGlvbi5GYWN0b3J5IHNlY3Rpb25zKSB7CiAgICAgdGhpcy51aSA9IHVpOwotICAgIHRoaXMuYXV0aCA9IHNlY3Rpb25zLmdldCgiYXV0aCIpOwotICAgIHRoaXMubGRhcCA9IHNlY3Rpb25zLmdldCgibGRhcCIpOworICAgIHRoaXMuYXV0aCA9IHNlY3Rpb25zLmdldCgiYXV0aCIsIG51bGwpOworICAgIHRoaXMubGRhcCA9IHNlY3Rpb25zLmdldCgibGRhcCIsIG51bGwpOwogICB9CiAKICAgcHVibGljIHZvaWQgcnVuKCkgewpkaWZmIC0tZ2l0IGEvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L0luaXRDYWNoZS5qYXZhIGIvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L0luaXRDYWNoZS5qYXZhCmluZGV4IGZiMWE5MjQuLjJiNTcyOWYgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9Jbml0Q2FjaGUuamF2YQorKysgYi9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL2luaXQvSW5pdENhY2hlLmphdmEKQEAgLTMxLDcgKzMxLDcgQEAKICAgQEluamVjdAogICBJbml0Q2FjaGUoZmluYWwgU2l0ZVBhdGhzIHNpdGUsIGZpbmFsIFNlY3Rpb24uRmFjdG9yeSBzZWN0aW9ucykgewogICAgIHRoaXMuc2l0ZSA9IHNpdGU7Ci0gICAgdGhpcy5jYWNoZSA9IHNlY3Rpb25zLmdldCgiY2FjaGUiKTsKKyAgICB0aGlzLmNhY2hlID0gc2VjdGlvbnMuZ2V0KCJjYWNoZSIsIG51bGwpOwogICB9CiAKICAgcHVibGljIHZvaWQgcnVuKCkgewpkaWZmIC0tZ2l0IGEvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L0luaXRDb250YWluZXIuamF2YSBiL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9Jbml0Q29udGFpbmVyLmphdmEKaW5kZXggNzA2M2Y1NC4uZjM0ZTIyZCAxMDA2NDQKLS0tIGEvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L0luaXRDb250YWluZXIuamF2YQorKysgYi9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL2luaXQvSW5pdENvbnRhaW5lci5qYXZhCkBAIC00NCw3ICs0NCw3IEBACiAgICAgICBmaW5hbCBTZWN0aW9uLkZhY3Rvcnkgc2VjdGlvbnMpIHsKICAgICB0aGlzLnVpID0gdWk7CiAgICAgdGhpcy5zaXRlID0gc2l0ZTsKLSAgICB0aGlzLmNvbnRhaW5lciA9IHNlY3Rpb25zLmdldCgiY29udGFpbmVyIik7CisgICAgdGhpcy5jb250YWluZXIgPSBzZWN0aW9ucy5nZXQoImNvbnRhaW5lciIsIG51bGwpOwogICB9CiAKICAgcHVibGljIHZvaWQgcnVuKCkgdGhyb3dzIEZpbGVOb3RGb3VuZEV4Y2VwdGlvbiwgSU9FeGNlcHRpb24gewpkaWZmIC0tZ2l0IGEvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L0luaXREYXRhYmFzZS5qYXZhIGIvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L0luaXREYXRhYmFzZS5qYXZhCmluZGV4IGQ1MDFlYTUuLjRjZTk2M2EgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9Jbml0RGF0YWJhc2UuamF2YQorKysgYi9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL2luaXQvSW5pdERhdGFiYXNlLmphdmEKQEAgLTE0LDE3ICsxNCwyNCBAQAogCiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnBnbS5pbml0OwogCi1pbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LnBnbS5pbml0LkluaXRVdGlsLmRpZTsKLWltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQucGdtLmluaXQuSW5pdFV0aWwudXNlcm5hbWU7Ci1pbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5zY2hlbWEuRGF0YVNvdXJjZVByb3ZpZGVyLlR5cGUuSDI7CitpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuaW5qZWN0LlN0YWdlLlBST0RVQ1RJT047CiAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5wZ20udXRpbC5Db25zb2xlVUk7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5TaXRlUGF0aHM7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnNjaGVtYS5EYXRhU291cmNlUHJvdmlkZXI7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuQmluZGluZzsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5HdWljZTsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0b3I7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuS2V5OwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlNpbmdsZXRvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5UeXBlTGl0ZXJhbDsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5uYW1lLk5hbWVkOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0Lm5hbWUuTmFtZXM7CiAKLWltcG9ydCBqYXZhLmlvLkZpbGU7CitpbXBvcnQgamF2YS5sYW5nLmFubm90YXRpb24uQW5ub3RhdGlvbjsKK2ltcG9ydCBqYXZhLnV0aWwuTGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuU2V0OworaW1wb3J0IGphdmEudXRpbC5UcmVlU2V0OwogCiAvKiogSW5pdGlhbGl6ZSB0aGUge0Bjb2RlIGRhdGFiYXNlfSBjb25maWd1cmF0aW9uIHNlY3Rpb24uICovCiBAU2luZ2xldG9uCkBAIC00MCw2NSArNDcsMzQgQEAKICAgICB0aGlzLnVpID0gdWk7CiAgICAgdGhpcy5zaXRlID0gc2l0ZTsKICAgICB0aGlzLmxpYnJhcmllcyA9IGxpYnJhcmllczsKLSAgICB0aGlzLmRhdGFiYXNlID0gc2VjdGlvbnMuZ2V0KCJkYXRhYmFzZSIpOworICAgIHRoaXMuZGF0YWJhc2UgPSBzZWN0aW9ucy5nZXQoImRhdGFiYXNlIiwgbnVsbCk7CiAgIH0KIAogICBwdWJsaWMgdm9pZCBydW4oKSB7CiAgICAgdWkuaGVhZGVyKCJTUUwgRGF0YWJhc2UiKTsKIAotICAgIGZpbmFsIERhdGFTb3VyY2VQcm92aWRlci5UeXBlIGRiX3R5cGUgPQotICAgICAgICBkYXRhYmFzZS5zZWxlY3QoIkRhdGFiYXNlIHNlcnZlciB0eXBlIiwgInR5cGUiLCBIMik7CisgICAgU2V0PFN0cmluZz4gYWxsb3dlZFZhbHVlcyA9IG5ldyBUcmVlU2V0PFN0cmluZz4oKTsKKyAgICBJbmplY3RvciBpID0gR3VpY2UuY3JlYXRlSW5qZWN0b3IoUFJPRFVDVElPTiwgbmV3IERhdGFiYXNlQ29uZmlnTW9kdWxlKHNpdGUpKTsKKyAgICBMaXN0PEJpbmRpbmc8RGF0YWJhc2VDb25maWdJbml0aWFsaXplcj4+IGRiQ29uZmlnQmluZGluZ3MgPQorICAgICAgICBpLmZpbmRCaW5kaW5nc0J5VHlwZShuZXcgVHlwZUxpdGVyYWw8RGF0YWJhc2VDb25maWdJbml0aWFsaXplcj4oKSB7fSk7CisgICAgZm9yIChCaW5kaW5nPERhdGFiYXNlQ29uZmlnSW5pdGlhbGl6ZXI+IGJpbmRpbmcgOiBkYkNvbmZpZ0JpbmRpbmdzKSB7CisgICAgICBBbm5vdGF0aW9uIGFubm90YXRpb24gPSBiaW5kaW5nLmdldEtleSgpLmdldEFubm90YXRpb24oKTsKKyAgICAgIGlmIChhbm5vdGF0aW9uIGluc3RhbmNlb2YgTmFtZWQpIHsKKyAgICAgICAgYWxsb3dlZFZhbHVlcy5hZGQoKChOYW1lZCkgYW5ub3RhdGlvbikudmFsdWUoKSk7CisgICAgICB9CisgICAgfQogCi0gICAgc3dpdGNoIChkYl90eXBlKSB7Ci0gICAgICBjYXNlIE1ZU1FMOgorICAgIFN0cmluZyBkYlR5cGUgPQorICAgICAgICBkYXRhYmFzZS5zZWxlY3QoIkRhdGFiYXNlIHNlcnZlciB0eXBlIiwgInR5cGUiLCAiaDIiLCBhbGxvd2VkVmFsdWVzKTsKKworICAgIERhdGFiYXNlQ29uZmlnSW5pdGlhbGl6ZXIgZGNpID0KKyAgICAgICAgaS5nZXRJbnN0YW5jZShLZXkuZ2V0KERhdGFiYXNlQ29uZmlnSW5pdGlhbGl6ZXIuY2xhc3MsCisgICAgICAgICAgICBOYW1lcy5uYW1lZChkYlR5cGUudG9Mb3dlckNhc2UoKSkpKTsKKworICAgIGlmIChkY2kgaW5zdGFuY2VvZiBNeVNxbEluaXRpYWxpemVyKSB7CiAgICAgICAgIGxpYnJhcmllcy5teXNxbERyaXZlci5kb3dubG9hZFJlcXVpcmVkKCk7Ci0gICAgICAgIGJyZWFrOwogICAgIH0KIAotICAgIGZpbmFsIGJvb2xlYW4gdXNlclBhc3NBdXRoOwotICAgIHN3aXRjaCAoZGJfdHlwZSkgewotICAgICAgY2FzZSBIMjogewotICAgICAgICB1c2VyUGFzc0F1dGggPSBmYWxzZTsKLSAgICAgICAgU3RyaW5nIHBhdGggPSBkYXRhYmFzZS5nZXQoImRhdGFiYXNlIik7Ci0gICAgICAgIGlmIChwYXRoID09IG51bGwpIHsKLSAgICAgICAgICBwYXRoID0gImRiL1Jldmlld0RCIjsKLSAgICAgICAgICBkYXRhYmFzZS5zZXQoImRhdGFiYXNlIiwgcGF0aCk7Ci0gICAgICAgIH0KLSAgICAgICAgRmlsZSBkYiA9IHNpdGUucmVzb2x2ZShwYXRoKTsKLSAgICAgICAgaWYgKGRiID09IG51bGwpIHsKLSAgICAgICAgICB0aHJvdyBkaWUoImRhdGFiYXNlLmRhdGFiYXNlIG11c3QgYmUgc3VwcGxpZWQgZm9yIEgyIik7Ci0gICAgICAgIH0KLSAgICAgICAgZGIgPSBkYi5nZXRQYXJlbnRGaWxlKCk7Ci0gICAgICAgIGlmICghZGIuZXhpc3RzKCkgJiYgIWRiLm1rZGlycygpKSB7Ci0gICAgICAgICAgdGhyb3cgZGllKCJjYW5ub3QgY3JlYXRlIGRhdGFiYXNlLmRhdGFiYXNlICIgKyBkYi5nZXRBYnNvbHV0ZVBhdGgoKSk7Ci0gICAgICAgIH0KLSAgICAgICAgYnJlYWs7Ci0gICAgICB9Ci0KLSAgICAgIGNhc2UgSkRCQzogewotICAgICAgICB1c2VyUGFzc0F1dGggPSB0cnVlOwotICAgICAgICBkYXRhYmFzZS5zdHJpbmcoIkRyaXZlciBjbGFzcyBuYW1lIiwgImRyaXZlciIsIG51bGwpOwotICAgICAgICBkYXRhYmFzZS5zdHJpbmcoIlVSTCIsICJ1cmwiLCBudWxsKTsKLSAgICAgICAgYnJlYWs7Ci0gICAgICB9Ci0KLSAgICAgIGNhc2UgUE9TVEdSRVNRTDoKLSAgICAgIGNhc2UgTVlTUUw6IHsKLSAgICAgICAgdXNlclBhc3NBdXRoID0gdHJ1ZTsKLSAgICAgICAgZmluYWwgU3RyaW5nIGRlZlBvcnQgPSAiKCIgKyBkYl90eXBlLnRvU3RyaW5nKCkgKyAiIGRlZmF1bHQpIjsKLSAgICAgICAgZGF0YWJhc2Uuc3RyaW5nKCJTZXJ2ZXIgaG9zdG5hbWUiLCAiaG9zdG5hbWUiLCAibG9jYWxob3N0Iik7Ci0gICAgICAgIGRhdGFiYXNlLnN0cmluZygiU2VydmVyIHBvcnQiLCAicG9ydCIsIGRlZlBvcnQsIHRydWUpOwotICAgICAgICBkYXRhYmFzZS5zdHJpbmcoIkRhdGFiYXNlIG5hbWUiLCAiZGF0YWJhc2UiLCAicmV2aWV3ZGIiKTsKLSAgICAgICAgYnJlYWs7Ci0gICAgICB9Ci0KLSAgICAgIGRlZmF1bHQ6Ci0gICAgICAgIHRocm93IGRpZSgiaW50ZXJuYWwgYnVnLCBkYXRhYmFzZSAiICsgZGJfdHlwZSArICIgbm90IHN1cHBvcnRlZCIpOwotICAgIH0KLQotICAgIGlmICh1c2VyUGFzc0F1dGgpIHsKLSAgICAgIGRhdGFiYXNlLnN0cmluZygiRGF0YWJhc2UgdXNlcm5hbWUiLCAidXNlcm5hbWUiLCB1c2VybmFtZSgpKTsKLSAgICAgIGRhdGFiYXNlLnBhc3N3b3JkKCJ1c2VybmFtZSIsICJwYXNzd29yZCIpOwotICAgIH0KKyAgICBkY2kuaW5pdENvbmZpZyhkYXRhYmFzZSk7CiAgIH0KIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9Jbml0R2l0TWFuYWdlci5qYXZhIGIvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L0luaXRHaXRNYW5hZ2VyLmphdmEKaW5kZXggZjBjZDMxZi4uYjZmODUxOSAxMDA2NDQKLS0tIGEvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L0luaXRHaXRNYW5hZ2VyLmphdmEKKysrIGIvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L0luaXRHaXRNYW5hZ2VyLmphdmEKQEAgLTMxLDcgKzMxLDcgQEAKICAgQEluamVjdAogICBJbml0R2l0TWFuYWdlcihmaW5hbCBDb25zb2xlVUkgdWksIGZpbmFsIFNlY3Rpb24uRmFjdG9yeSBzZWN0aW9ucykgewogICAgIHRoaXMudWkgPSB1aTsKLSAgICB0aGlzLmdlcnJpdCA9IHNlY3Rpb25zLmdldCgiZ2Vycml0Iik7CisgICAgdGhpcy5nZXJyaXQgPSBzZWN0aW9ucy5nZXQoImdlcnJpdCIsIG51bGwpOwogICB9CiAKICAgcHVibGljIHZvaWQgcnVuKCkgewpkaWZmIC0tZ2l0IGEvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L0luaXRIdHRwZC5qYXZhIGIvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L0luaXRIdHRwZC5qYXZhCmluZGV4IDk4ZDJlNDcuLmZlYjAwZTEgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9Jbml0SHR0cGQuamF2YQorKysgYi9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL2luaXQvSW5pdEh0dHBkLmphdmEKQEAgLTQ4LDggKzQ4LDggQEAKICAgICB0aGlzLnVpID0gdWk7CiAgICAgdGhpcy5zaXRlID0gc2l0ZTsKICAgICB0aGlzLmZsYWdzID0gZmxhZ3M7Ci0gICAgdGhpcy5odHRwZCA9IHNlY3Rpb25zLmdldCgiaHR0cGQiKTsKLSAgICB0aGlzLmdlcnJpdCA9IHNlY3Rpb25zLmdldCgiZ2Vycml0Iik7CisgICAgdGhpcy5odHRwZCA9IHNlY3Rpb25zLmdldCgiaHR0cGQiLCBudWxsKTsKKyAgICB0aGlzLmdlcnJpdCA9IHNlY3Rpb25zLmdldCgiZ2Vycml0IiwgbnVsbCk7CiAgIH0KIAogICBwdWJsaWMgdm9pZCBydW4oKSB0aHJvd3MgSU9FeGNlcHRpb24sIEludGVycnVwdGVkRXhjZXB0aW9uIHsKZGlmZiAtLWdpdCBhL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9Jbml0UGx1Z2luU3RlcHNMb2FkZXIuamF2YSBiL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9Jbml0UGx1Z2luU3RlcHNMb2FkZXIuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4wODQyMmZhCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L0luaXRQbHVnaW5TdGVwc0xvYWRlci5qYXZhCkBAIC0wLDAgKzEsMTMyIEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQucGdtLmluaXQ7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLmFubm90YXRpb25zLlBsdWdpbk5hbWU7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucGdtLnV0aWwuQ29uc29sZVVJOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuU2l0ZVBhdGhzOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkFic3RyYWN0TW9kdWxlOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3RvcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5TaW5nbGV0b247CisKK2ltcG9ydCBvcmcuc2xmNGouTG9nZ2VyOworaW1wb3J0IG9yZy5zbGY0ai5Mb2dnZXJGYWN0b3J5OworCitpbXBvcnQgamF2YS5pby5GaWxlOworaW1wb3J0IGphdmEuaW8uRmlsZUZpbHRlcjsKK2ltcG9ydCBqYXZhLm5ldC5VUkw7CitpbXBvcnQgamF2YS5uZXQuVVJMQ2xhc3NMb2FkZXI7CitpbXBvcnQgamF2YS51dGlsLkFycmF5TGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuQXJyYXlzOworaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uOworaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uczsKK2ltcG9ydCBqYXZhLnV0aWwuQ29tcGFyYXRvcjsKK2ltcG9ydCBqYXZhLnV0aWwuTGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuamFyLkF0dHJpYnV0ZXM7CitpbXBvcnQgamF2YS51dGlsLmphci5KYXJGaWxlOworCitAU2luZ2xldG9uCitwdWJsaWMgY2xhc3MgSW5pdFBsdWdpblN0ZXBzTG9hZGVyIHsKKyAgcHJpdmF0ZSBmaW5hbCBGaWxlIHBsdWdpbnNEaXI7CisgIHByaXZhdGUgZmluYWwgSW5qZWN0b3IgaW5pdEluamVjdG9yOworICBmaW5hbCBDb25zb2xlVUkgdWk7CisKKyAgQEluamVjdAorICBwdWJsaWMgSW5pdFBsdWdpblN0ZXBzTG9hZGVyKGZpbmFsIENvbnNvbGVVSSB1aSwgZmluYWwgU2l0ZVBhdGhzIHNpdGVQYXRocywKKyAgICAgIGZpbmFsIEluamVjdG9yIGluaXRJbmplY3RvcikgeworICAgIHRoaXMucGx1Z2luc0RpciA9IHNpdGVQYXRocy5wbHVnaW5zX2RpcjsKKyAgICB0aGlzLmluaXRJbmplY3RvciA9IGluaXRJbmplY3RvcjsKKyAgICB0aGlzLnVpID0gdWk7CisgIH0KKworICBwdWJsaWMgQ29sbGVjdGlvbjxJbml0U3RlcD4gZ2V0SW5pdFN0ZXBzKCkgeworICAgIExpc3Q8RmlsZT4gamFycyA9IHNjYW5KYXJzSW5QbHVnaW5zRGlyZWN0b3J5KCk7CisgICAgQXJyYXlMaXN0PEluaXRTdGVwPiBwbHVnaW5zSW5pdFN0ZXBzID0gbmV3IEFycmF5TGlzdDxJbml0U3RlcD4oKTsKKworICAgIGZvciAoRmlsZSBqYXIgOiBqYXJzKSB7CisgICAgICBJbml0U3RlcCBpbml0ID0gbG9hZEluaXRTdGVwKGphcik7CisgICAgICBpZiAoaW5pdCAhPSBudWxsKSB7CisgICAgICAgIHBsdWdpbnNJbml0U3RlcHMuYWRkKGluaXQpOworICAgICAgfQorICAgIH0KKyAgICByZXR1cm4gcGx1Z2luc0luaXRTdGVwczsKKyAgfQorCisgIHByaXZhdGUgSW5pdFN0ZXAgbG9hZEluaXRTdGVwKEZpbGUgamFyKSB7CisgICAgdHJ5IHsKKyAgICAgIENsYXNzTG9hZGVyIHBsdWdpbkxvYWRlciA9CisgICAgICAgICAgbmV3IFVSTENsYXNzTG9hZGVyKG5ldyBVUkxbXSB7amFyLnRvVVJJKCkudG9VUkwoKX0sCisgICAgICAgICAgICAgIEluaXRQbHVnaW5TdGVwc0xvYWRlci5jbGFzcy5nZXRDbGFzc0xvYWRlcigpKTsKKyAgICAgIEphckZpbGUgamFyRmlsZSA9IG5ldyBKYXJGaWxlKGphcik7CisgICAgICBBdHRyaWJ1dGVzIGphckZpbGVBdHRyaWJ1dGVzID0gamFyRmlsZS5nZXRNYW5pZmVzdCgpLmdldE1haW5BdHRyaWJ1dGVzKCk7CisgICAgICBTdHJpbmcgaW5pdENsYXNzTmFtZSA9IGphckZpbGVBdHRyaWJ1dGVzLmdldFZhbHVlKCJHZXJyaXQtSW5pdFN0ZXAiKTsKKyAgICAgIGlmIChpbml0Q2xhc3NOYW1lID09IG51bGwpIHsKKyAgICAgICAgcmV0dXJuIG51bGw7CisgICAgICB9CisgICAgICBAU3VwcHJlc3NXYXJuaW5ncygidW5jaGVja2VkIikKKyAgICAgIENsYXNzPD8gZXh0ZW5kcyBJbml0U3RlcD4gaW5pdFN0ZXBDbGFzcyA9CisgICAgICAgICAgKENsYXNzPD8gZXh0ZW5kcyBJbml0U3RlcD4pIHBsdWdpbkxvYWRlci5sb2FkQ2xhc3MoaW5pdENsYXNzTmFtZSk7CisgICAgICByZXR1cm4gZ2V0UGx1Z2luSW5qZWN0b3IoamFyKS5nZXRJbnN0YW5jZShpbml0U3RlcENsYXNzKTsKKyAgICB9IGNhdGNoIChDbGFzc0Nhc3RFeGNlcHRpb24gZSkgeworICAgICAgdWkubWVzc2FnZSgKKyAgICAgICAgICAiV0FSTjogSW5pdFN0ZXAgZnJvbSBwbHVnaW4gJXMgZG9lcyBub3QgaW1wbGVtZW50ICVzIChFeGNlcHRpb246ICVzKSIsCisgICAgICAgICAgamFyLmdldE5hbWUoKSwgSW5pdFN0ZXAuY2xhc3MuZ2V0TmFtZSgpLCBlLmdldE1lc3NhZ2UoKSk7CisgICAgICByZXR1cm4gbnVsbDsKKyAgICB9IGNhdGNoIChFeGNlcHRpb24gZSkgeworICAgICAgdWkubWVzc2FnZSgKKyAgICAgICAgICAiV0FSTjogQ2Fubm90IGxvYWQgYW5kIGdldCBwbHVnaW4gaW5pdCBzdGVwIGZvciAlcyAoRXhjZXB0aW9uOiAlcykiLAorICAgICAgICAgIGphciwgZS5nZXRNZXNzYWdlKCkpOworICAgICAgcmV0dXJuIG51bGw7CisgICAgfQorICB9CisKKyAgcHJpdmF0ZSBJbmplY3RvciBnZXRQbHVnaW5JbmplY3RvcihGaWxlIGphckZpbGUpIHsKKyAgICBTdHJpbmcgamFyRmlsZU5hbWUgPSBqYXJGaWxlLmdldE5hbWUoKTsKKyAgICBmaW5hbCBTdHJpbmcgcGx1Z2luTmFtZSA9CisgICAgICAgIGphckZpbGVOYW1lLnN1YnN0cmluZygwLCBqYXJGaWxlTmFtZS5sYXN0SW5kZXhPZignLicpKTsKKyAgICByZXR1cm4gaW5pdEluamVjdG9yLmNyZWF0ZUNoaWxkSW5qZWN0b3IobmV3IEFic3RyYWN0TW9kdWxlKCkgeworICAgICAgQE92ZXJyaWRlCisgICAgICBwcm90ZWN0ZWQgdm9pZCBjb25maWd1cmUoKSB7CisgICAgICAgIGJpbmQoU3RyaW5nLmNsYXNzKS5hbm5vdGF0ZWRXaXRoKFBsdWdpbk5hbWUuY2xhc3MpLnRvSW5zdGFuY2UoCisgICAgICAgICAgICBwbHVnaW5OYW1lKTsKKyAgICAgIH0KKyAgICB9KTsKKyAgfQorCisgIHByaXZhdGUgTGlzdDxGaWxlPiBzY2FuSmFyc0luUGx1Z2luc0RpcmVjdG9yeSgpIHsKKyAgICBpZiAocGx1Z2luc0RpciA9PSBudWxsIHx8ICFwbHVnaW5zRGlyLmV4aXN0cygpKSB7CisgICAgICByZXR1cm4gQ29sbGVjdGlvbnMuZW1wdHlMaXN0KCk7CisgICAgfQorICAgIEZpbGVbXSBtYXRjaGVzID0gcGx1Z2luc0Rpci5saXN0RmlsZXMobmV3IEZpbGVGaWx0ZXIoKSB7CisgICAgICBAT3ZlcnJpZGUKKyAgICAgIHB1YmxpYyBib29sZWFuIGFjY2VwdChGaWxlIHBhdGhuYW1lKSB7CisgICAgICAgIFN0cmluZyBuID0gcGF0aG5hbWUuZ2V0TmFtZSgpOworICAgICAgICByZXR1cm4gKG4uZW5kc1dpdGgoIi5qYXIiKSAmJiBwYXRobmFtZS5pc0ZpbGUoKSk7CisgICAgICB9CisgICAgfSk7CisgICAgaWYgKG1hdGNoZXMgPT0gbnVsbCkgeworICAgICAgdWkubWVzc2FnZSgiV0FSTjogQ2Fubm90IGxpc3QgJXMiLCBwbHVnaW5zRGlyLmdldEFic29sdXRlUGF0aCgpKTsKKyAgICAgIHJldHVybiBDb2xsZWN0aW9ucy5lbXB0eUxpc3QoKTsKKyAgICB9CisgICAgQXJyYXlzLnNvcnQobWF0Y2hlcywgbmV3IENvbXBhcmF0b3I8RmlsZT4oKSB7CisgICAgICBAT3ZlcnJpZGUKKyAgICAgIHB1YmxpYyBpbnQgY29tcGFyZShGaWxlIG8xLCBGaWxlIG8yKSB7CisgICAgICAgIHJldHVybiBvMS5nZXROYW1lKCkuY29tcGFyZVRvKG8yLmdldE5hbWUoKSk7CisgICAgICB9CisgICAgfSk7CisgICAgcmV0dXJuIEFycmF5cy5hc0xpc3QobWF0Y2hlcyk7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9Jbml0UGx1Z2lucy5qYXZhIGIvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L0luaXRQbHVnaW5zLmphdmEKaW5kZXggMTU1ZmU0Yy4uYWVjYjgwOCAxMDA2NDQKLS0tIGEvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L0luaXRQbHVnaW5zLmphdmEKKysrIGIvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L0luaXRQbHVnaW5zLmphdmEKQEAgLTI1LDYgKzI1LDcgQEAKIGltcG9ydCBqYXZhLmlvLkZpbGVOb3RGb3VuZEV4Y2VwdGlvbjsKIGltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOwogaW1wb3J0IGphdmEuaW8uSW5wdXRTdHJlYW07CitpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb247CiBpbXBvcnQgamF2YS51dGlsLkVudW1lcmF0aW9uOwogaW1wb3J0IGphdmEudXRpbC5qYXIuQXR0cmlidXRlczsKIGltcG9ydCBqYXZhLnV0aWwuamFyLkphckZpbGU7CkBAIC0zOSwxNyArNDAsMjQgQEAKIAogICBwcml2YXRlIGZpbmFsIENvbnNvbGVVSSB1aTsKICAgcHJpdmF0ZSBmaW5hbCBTaXRlUGF0aHMgc2l0ZTsKKyAgcHJpdmF0ZSBJbml0UGx1Z2luU3RlcHNMb2FkZXIgcGx1Z2luTG9hZGVyOwogCiAgIEBJbmplY3QKLSAgSW5pdFBsdWdpbnMoZmluYWwgQ29uc29sZVVJIHVpLCBmaW5hbCBTaXRlUGF0aHMgc2l0ZSkgeworICBJbml0UGx1Z2lucyhmaW5hbCBDb25zb2xlVUkgdWksIGZpbmFsIFNpdGVQYXRocyBzaXRlLCBJbml0UGx1Z2luU3RlcHNMb2FkZXIgcGx1Z2luTG9hZGVyKSB7CiAgICAgdGhpcy51aSA9IHVpOwogICAgIHRoaXMuc2l0ZSA9IHNpdGU7CisgICAgdGhpcy5wbHVnaW5Mb2FkZXIgPSBwbHVnaW5Mb2FkZXI7CiAgIH0KIAogICBAT3ZlcnJpZGUKICAgcHVibGljIHZvaWQgcnVuKCkgdGhyb3dzIEV4Y2VwdGlvbiB7CiAgICAgdWkuaGVhZGVyKCJQbHVnaW5zIik7CiAKKyAgICBpbnN0YWxsUGx1Z2lucygpOworICAgIGluaXRQbHVnaW5zKCk7CisgIH0KKworICBwcml2YXRlIHZvaWQgaW5zdGFsbFBsdWdpbnMoKSB0aHJvd3MgSU9FeGNlcHRpb24gewogICAgIGZpbmFsIEZpbGUgbXlXYXI7CiAgICAgdHJ5IHsKICAgICAgIG15V2FyID0gR2Vycml0TGF1bmNoZXIuZ2V0RGlzdHJpYnV0aW9uQXJjaGl2ZSgpOwpAQCAtMTI3LDYgKzEzNSwxMiBAQAogICAgIH0KICAgfQogCisgIHByaXZhdGUgdm9pZCBpbml0UGx1Z2lucygpIHRocm93cyBFeGNlcHRpb24geworICAgIGZvciAoSW5pdFN0ZXAgaW5pdFN0ZXAgOiBwbHVnaW5Mb2FkZXIuZ2V0SW5pdFN0ZXBzKCkpIHsKKyAgICAgIGluaXRTdGVwLnJ1bigpOworICAgIH0KKyAgfQorCiAgIHByaXZhdGUgc3RhdGljIFN0cmluZyBnZXRWZXJzaW9uKGZpbmFsIEZpbGUgcGx1Z2luKSB0aHJvd3MgSU9FeGNlcHRpb24gewogICAgIGZpbmFsIEphckZpbGUgamFyRmlsZSA9IG5ldyBKYXJGaWxlKHBsdWdpbik7CiAgICAgdHJ5IHsKZGlmZiAtLWdpdCBhL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9Jbml0U2VuZEVtYWlsLmphdmEgYi9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL2luaXQvSW5pdFNlbmRFbWFpbC5qYXZhCmluZGV4IGM1NzMyZTkuLmU0YjgyN2QxIDEwMDY0NAotLS0gYS9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL2luaXQvSW5pdFNlbmRFbWFpbC5qYXZhCisrKyBiL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9Jbml0U2VuZEVtYWlsLmphdmEKQEAgLTM0LDcgKzM0LDcgQEAKICAgSW5pdFNlbmRFbWFpbChmaW5hbCBDb25zb2xlVUkgdWksIGZpbmFsIFNpdGVQYXRocyBzaXRlLAogICAgICAgZmluYWwgU2VjdGlvbi5GYWN0b3J5IHNlY3Rpb25zKSB7CiAgICAgdGhpcy51aSA9IHVpOwotICAgIHRoaXMuc2VuZGVtYWlsID0gc2VjdGlvbnMuZ2V0KCJzZW5kZW1haWwiKTsKKyAgICB0aGlzLnNlbmRlbWFpbCA9IHNlY3Rpb25zLmdldCgic2VuZGVtYWlsIiwgbnVsbCk7CiAgICAgdGhpcy5zaXRlID0gc2l0ZTsKICAgfQogCmRpZmYgLS1naXQgYS9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL2luaXQvSW5pdFNzaGQuamF2YSBiL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9Jbml0U3NoZC5qYXZhCmluZGV4IGJmYzBlYWYuLjBjMmEzYzYgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9Jbml0U3NoZC5qYXZhCisrKyBiL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9Jbml0U3NoZC5qYXZhCkBAIC00NSw3ICs0NSw3IEBACiAgICAgdGhpcy51aSA9IHVpOwogICAgIHRoaXMuc2l0ZSA9IHNpdGU7CiAgICAgdGhpcy5saWJyYXJpZXMgPSBsaWJyYXJpZXM7Ci0gICAgdGhpcy5zc2hkID0gc2VjdGlvbnMuZ2V0KCJzc2hkIik7CisgICAgdGhpcy5zc2hkID0gc2VjdGlvbnMuZ2V0KCJzc2hkIiwgbnVsbCk7CiAgIH0KIAogICBwdWJsaWMgdm9pZCBydW4oKSB0aHJvd3MgRXhjZXB0aW9uIHsKZGlmZiAtLWdpdCBhL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9KREJDSW5pdGlhbGl6ZXIuamF2YSBiL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9KREJDSW5pdGlhbGl6ZXIuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi45NDQyNWFjMQotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9KREJDSW5pdGlhbGl6ZXIuamF2YQpAQCAtMCwwICsxLDI4IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQucGdtLmluaXQ7CisKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQucGdtLmluaXQuSW5pdFV0aWwudXNlcm5hbWU7CisKK2NsYXNzIEpEQkNJbml0aWFsaXplciBpbXBsZW1lbnRzIERhdGFiYXNlQ29uZmlnSW5pdGlhbGl6ZXIgeworCisgIEBPdmVycmlkZQorICBwdWJsaWMgdm9pZCBpbml0Q29uZmlnKFNlY3Rpb24gZGF0YWJhc2VTZWN0aW9uKSB7CisgICAgZGF0YWJhc2VTZWN0aW9uLnN0cmluZygiRHJpdmVyIGNsYXNzIG5hbWUiLCAiZHJpdmVyIiwgbnVsbCk7CisgICAgZGF0YWJhc2VTZWN0aW9uLnN0cmluZygiVVJMIiwgInVybCIsIG51bGwpOworICAgIGRhdGFiYXNlU2VjdGlvbi5zdHJpbmcoIkRhdGFiYXNlIHVzZXJuYW1lIiwgInVzZXJuYW1lIiwgdXNlcm5hbWUoKSk7CisgICAgZGF0YWJhc2VTZWN0aW9uLnBhc3N3b3JkKCJ1c2VybmFtZSIsICJwYXNzd29yZCIpOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL2luaXQvTXlTcWxJbml0aWFsaXplci5qYXZhIGIvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L015U3FsSW5pdGlhbGl6ZXIuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5mZTZhNGQ5Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L015U3FsSW5pdGlhbGl6ZXIuamF2YQpAQCAtMCwwICsxLDMwIEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQucGdtLmluaXQ7CisKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQucGdtLmluaXQuSW5pdFV0aWwudXNlcm5hbWU7CisKK2NsYXNzIE15U3FsSW5pdGlhbGl6ZXIgaW1wbGVtZW50cyBEYXRhYmFzZUNvbmZpZ0luaXRpYWxpemVyIHsKKworICBAT3ZlcnJpZGUKKyAgcHVibGljIHZvaWQgaW5pdENvbmZpZyhTZWN0aW9uIGRhdGFiYXNlU2VjdGlvbikgeworICAgIGZpbmFsIFN0cmluZyBkZWZQb3J0ID0gIihteXNxbCBkZWZhdWx0KSI7CisgICAgZGF0YWJhc2VTZWN0aW9uLnN0cmluZygiU2VydmVyIGhvc3RuYW1lIiwgImhvc3RuYW1lIiwgImxvY2FsaG9zdCIpOworICAgIGRhdGFiYXNlU2VjdGlvbi5zdHJpbmcoIlNlcnZlciBwb3J0IiwgInBvcnQiLCBkZWZQb3J0LCB0cnVlKTsKKyAgICBkYXRhYmFzZVNlY3Rpb24uc3RyaW5nKCJEYXRhYmFzZSBuYW1lIiwgImRhdGFiYXNlIiwgInJldmlld2RiIik7CisgICAgZGF0YWJhc2VTZWN0aW9uLnN0cmluZygiRGF0YWJhc2UgdXNlcm5hbWUiLCAidXNlcm5hbWUiLCB1c2VybmFtZSgpKTsKKyAgICBkYXRhYmFzZVNlY3Rpb24ucGFzc3dvcmQoInVzZXJuYW1lIiwgInBhc3N3b3JkIik7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9Qb3N0Z3JlU1FMSW5pdGlhbGl6ZXIuamF2YSBiL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9Qb3N0Z3JlU1FMSW5pdGlhbGl6ZXIuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4xNDI1NjYzCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L1Bvc3RncmVTUUxJbml0aWFsaXplci5qYXZhCkBAIC0wLDAgKzEsMzAgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5wZ20uaW5pdDsKKworaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5wZ20uaW5pdC5Jbml0VXRpbC51c2VybmFtZTsKKworY2xhc3MgUG9zdGdyZVNRTEluaXRpYWxpemVyIGltcGxlbWVudHMgRGF0YWJhc2VDb25maWdJbml0aWFsaXplciB7CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyB2b2lkIGluaXRDb25maWcoU2VjdGlvbiBkYXRhYmFzZVNlY3Rpb24pIHsKKyAgICBmaW5hbCBTdHJpbmcgZGVmUG9ydCA9ICIocG9zdGdyZXNxbCBkZWZhdWx0KSI7CisgICAgZGF0YWJhc2VTZWN0aW9uLnN0cmluZygiU2VydmVyIGhvc3RuYW1lIiwgImhvc3RuYW1lIiwgImxvY2FsaG9zdCIpOworICAgIGRhdGFiYXNlU2VjdGlvbi5zdHJpbmcoIlNlcnZlciBwb3J0IiwgInBvcnQiLCBkZWZQb3J0LCB0cnVlKTsKKyAgICBkYXRhYmFzZVNlY3Rpb24uc3RyaW5nKCJEYXRhYmFzZSBuYW1lIiwgImRhdGFiYXNlIiwgInJldmlld2RiIik7CisgICAgZGF0YWJhc2VTZWN0aW9uLnN0cmluZygiRGF0YWJhc2UgdXNlcm5hbWUiLCAidXNlcm5hbWUiLCB1c2VybmFtZSgpKTsKKyAgICBkYXRhYmFzZVNlY3Rpb24ucGFzc3dvcmQoInVzZXJuYW1lIiwgInBhc3N3b3JkIik7CisgIH0KK30KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL2luaXQvU2VjdGlvbi5qYXZhIGIvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L1NlY3Rpb24uamF2YQppbmRleCAwMmVkOTkxLi4zODdiOTNhIDEwMDY0NAotLS0gYS9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL2luaXQvU2VjdGlvbi5qYXZhCisrKyBiL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9TZWN0aW9uLmphdmEKQEAgLTIzLDUzICsyMyw2MCBAQAogaW1wb3J0IGphdmEuaW8uRmlsZTsKIGltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OwogaW1wb3J0IGphdmEudXRpbC5BcnJheXM7CitpbXBvcnQgamF2YS51dGlsLlNldDsKKworaW1wb3J0IGphdmF4LmFubm90YXRpb24uTnVsbGFibGU7CiAKIC8qKiBIZWxwZXIgdG8gZWRpdCBhIHNlY3Rpb24gb2YgdGhlIGNvbmZpZ3VyYXRpb24gZmlsZXMuICovCi1jbGFzcyBTZWN0aW9uIHsKLSAgaW50ZXJmYWNlIEZhY3RvcnkgewotICAgIFNlY3Rpb24gZ2V0KFN0cmluZyBuYW1lKTsKK3B1YmxpYyBjbGFzcyBTZWN0aW9uIHsKKyAgcHVibGljIGludGVyZmFjZSBGYWN0b3J5IHsKKyAgICBTZWN0aW9uIGdldChAQXNzaXN0ZWQoInNlY3Rpb24iKSBTdHJpbmcgc2VjdGlvbiwKKyAgICAgICAgQEFzc2lzdGVkKCJzdWJzZWN0aW9uIikgU3RyaW5nIHN1YnNlY3Rpb24pOwogICB9CiAKICAgcHJpdmF0ZSBmaW5hbCBJbml0RmxhZ3MgZmxhZ3M7CiAgIHByaXZhdGUgZmluYWwgU2l0ZVBhdGhzIHNpdGU7CiAgIHByaXZhdGUgZmluYWwgQ29uc29sZVVJIHVpOwogICBwcml2YXRlIGZpbmFsIFN0cmluZyBzZWN0aW9uOworICBwcml2YXRlIGZpbmFsIFN0cmluZyBzdWJzZWN0aW9uOwogCiAgIEBJbmplY3QKLSAgU2VjdGlvbihmaW5hbCBJbml0RmxhZ3MgZmxhZ3MsIGZpbmFsIFNpdGVQYXRocyBzaXRlLCBmaW5hbCBDb25zb2xlVUkgdWksCi0gICAgICBAQXNzaXN0ZWQgZmluYWwgU3RyaW5nIHNlY3Rpb24pIHsKKyAgcHVibGljIFNlY3Rpb24oZmluYWwgSW5pdEZsYWdzIGZsYWdzLCBmaW5hbCBTaXRlUGF0aHMgc2l0ZSwKKyAgICAgIGZpbmFsIENvbnNvbGVVSSB1aSwgQEFzc2lzdGVkKCJzZWN0aW9uIikgZmluYWwgU3RyaW5nIHNlY3Rpb24sCisgICAgICBAQXNzaXN0ZWQoInN1YnNlY3Rpb24iKSBATnVsbGFibGUgZmluYWwgU3RyaW5nIHN1YnNlY3Rpb24pIHsKICAgICB0aGlzLmZsYWdzID0gZmxhZ3M7CiAgICAgdGhpcy5zaXRlID0gc2l0ZTsKICAgICB0aGlzLnVpID0gdWk7CiAgICAgdGhpcy5zZWN0aW9uID0gc2VjdGlvbjsKKyAgICB0aGlzLnN1YnNlY3Rpb24gPSBzdWJzZWN0aW9uOwogICB9CiAKICAgU3RyaW5nIGdldChTdHJpbmcgbmFtZSkgewogICAgIHJldHVybiBmbGFncy5jZmcuZ2V0U3RyaW5nKHNlY3Rpb24sIG51bGwsIG5hbWUpOwogICB9CiAKLSAgdm9pZCBzZXQoZmluYWwgU3RyaW5nIG5hbWUsIGZpbmFsIFN0cmluZyB2YWx1ZSkgeworICBwdWJsaWMgdm9pZCBzZXQoZmluYWwgU3RyaW5nIG5hbWUsIGZpbmFsIFN0cmluZyB2YWx1ZSkgewogICAgIGZpbmFsIEFycmF5TGlzdDxTdHJpbmc+IGFsbCA9IG5ldyBBcnJheUxpc3Q8U3RyaW5nPigpOwotICAgIGFsbC5hZGRBbGwoQXJyYXlzLmFzTGlzdChmbGFncy5jZmcuZ2V0U3RyaW5nTGlzdChzZWN0aW9uLCBudWxsLCBuYW1lKSkpOworICAgIGFsbC5hZGRBbGwoQXJyYXlzLmFzTGlzdChmbGFncy5jZmcuZ2V0U3RyaW5nTGlzdChzZWN0aW9uLCBzdWJzZWN0aW9uLCBuYW1lKSkpOwogCiAgICAgaWYgKHZhbHVlICE9IG51bGwpIHsKICAgICAgIGlmIChhbGwuc2l6ZSgpID09IDAgfHwgYWxsLnNpemUoKSA9PSAxKSB7Ci0gICAgICAgIGZsYWdzLmNmZy5zZXRTdHJpbmcoc2VjdGlvbiwgbnVsbCwgbmFtZSwgdmFsdWUpOworICAgICAgICBmbGFncy5jZmcuc2V0U3RyaW5nKHNlY3Rpb24sIHN1YnNlY3Rpb24sIG5hbWUsIHZhbHVlKTsKICAgICAgIH0gZWxzZSB7CiAgICAgICAgIGFsbC5zZXQoMCwgdmFsdWUpOwotICAgICAgICBmbGFncy5jZmcuc2V0U3RyaW5nTGlzdChzZWN0aW9uLCBudWxsLCBuYW1lLCBhbGwpOworICAgICAgICBmbGFncy5jZmcuc2V0U3RyaW5nTGlzdChzZWN0aW9uLCBzdWJzZWN0aW9uLCBuYW1lLCBhbGwpOwogICAgICAgfQogCiAgICAgfSBlbHNlIGlmIChhbGwuc2l6ZSgpID09IDApIHsKICAgICB9IGVsc2UgaWYgKGFsbC5zaXplKCkgPT0gMSkgewotICAgICAgZmxhZ3MuY2ZnLnVuc2V0KHNlY3Rpb24sIG51bGwsIG5hbWUpOworICAgICAgZmxhZ3MuY2ZnLnVuc2V0KHNlY3Rpb24sIHN1YnNlY3Rpb24sIG5hbWUpOwogICAgIH0gZWxzZSB7CiAgICAgICBhbGwucmVtb3ZlKDApOwotICAgICAgZmxhZ3MuY2ZnLnNldFN0cmluZ0xpc3Qoc2VjdGlvbiwgbnVsbCwgbmFtZSwgYWxsKTsKKyAgICAgIGZsYWdzLmNmZy5zZXRTdHJpbmdMaXN0KHNlY3Rpb24sIHN1YnNlY3Rpb24sIG5hbWUsIGFsbCk7CiAgICAgfQogICB9CiAKLSAgPFQgZXh0ZW5kcyBFbnVtPD8+PiB2b2lkIHNldChmaW5hbCBTdHJpbmcgbmFtZSwgZmluYWwgVCB2YWx1ZSkgeworICBwdWJsaWMgPFQgZXh0ZW5kcyBFbnVtPD8+PiB2b2lkIHNldChmaW5hbCBTdHJpbmcgbmFtZSwgZmluYWwgVCB2YWx1ZSkgewogICAgIGlmICh2YWx1ZSAhPSBudWxsKSB7CiAgICAgICBzZXQobmFtZSwgdmFsdWUubmFtZSgpKTsKICAgICB9IGVsc2UgewpAQCAtNzcsMTUgKzg0LDE1IEBACiAgICAgfQogICB9CiAKLSAgdm9pZCB1bnNldChTdHJpbmcgbmFtZSkgeworICBwdWJsaWMgdm9pZCB1bnNldChTdHJpbmcgbmFtZSkgewogICAgIHNldChuYW1lLCAoU3RyaW5nKSBudWxsKTsKICAgfQogCi0gIFN0cmluZyBzdHJpbmcoZmluYWwgU3RyaW5nIHRpdGxlLCBmaW5hbCBTdHJpbmcgbmFtZSwgZmluYWwgU3RyaW5nIGR2KSB7CisgIHB1YmxpYyBTdHJpbmcgc3RyaW5nKGZpbmFsIFN0cmluZyB0aXRsZSwgZmluYWwgU3RyaW5nIG5hbWUsIGZpbmFsIFN0cmluZyBkdikgewogICAgIHJldHVybiBzdHJpbmcodGl0bGUsIG5hbWUsIGR2LCBmYWxzZSk7CiAgIH0KIAotICBTdHJpbmcgc3RyaW5nKGZpbmFsIFN0cmluZyB0aXRsZSwgZmluYWwgU3RyaW5nIG5hbWUsIGZpbmFsIFN0cmluZyBkdiwKKyAgcHVibGljIFN0cmluZyBzdHJpbmcoZmluYWwgU3RyaW5nIHRpdGxlLCBmaW5hbCBTdHJpbmcgbmFtZSwgZmluYWwgU3RyaW5nIGR2LAogICAgICAgZmluYWwgYm9vbGVhbiBudWxsSWZEZWZhdWx0KSB7CiAgICAgZmluYWwgU3RyaW5nIG92ID0gZ2V0KG5hbWUpOwogICAgIFN0cmluZyBudiA9IHVpLnJlYWRTdHJpbmcob3YgIT0gbnVsbCA/IG92IDogZHYsICIlcyIsIHRpdGxlKTsKQEAgLTk4LDE5ICsxMDUsMTkgQEAKICAgICByZXR1cm4gbnY7CiAgIH0KIAotICBGaWxlIHBhdGgoZmluYWwgU3RyaW5nIHRpdGxlLCBmaW5hbCBTdHJpbmcgbmFtZSwgZmluYWwgU3RyaW5nIGRlZlZhbHVlKSB7CisgIHB1YmxpYyBGaWxlIHBhdGgoZmluYWwgU3RyaW5nIHRpdGxlLCBmaW5hbCBTdHJpbmcgbmFtZSwgZmluYWwgU3RyaW5nIGRlZlZhbHVlKSB7CiAgICAgcmV0dXJuIHNpdGUucmVzb2x2ZShzdHJpbmcodGl0bGUsIG5hbWUsIGRlZlZhbHVlKSk7CiAgIH0KIAotICA8VCBleHRlbmRzIEVudW08Pz4+IFQgc2VsZWN0KGZpbmFsIFN0cmluZyB0aXRsZSwgZmluYWwgU3RyaW5nIG5hbWUsCisgIHB1YmxpYyA8VCBleHRlbmRzIEVudW08Pz4+IFQgc2VsZWN0KGZpbmFsIFN0cmluZyB0aXRsZSwgZmluYWwgU3RyaW5nIG5hbWUsCiAgICAgICBmaW5hbCBUIGRlZlZhbHVlKSB7CiAgICAgcmV0dXJuIHNlbGVjdCh0aXRsZSwgbmFtZSwgZGVmVmFsdWUsIGZhbHNlKTsKICAgfQogCi0gIDxUIGV4dGVuZHMgRW51bTw/Pj4gVCBzZWxlY3QoZmluYWwgU3RyaW5nIHRpdGxlLCBmaW5hbCBTdHJpbmcgbmFtZSwKKyAgcHVibGljIDxUIGV4dGVuZHMgRW51bTw/Pj4gVCBzZWxlY3QoZmluYWwgU3RyaW5nIHRpdGxlLCBmaW5hbCBTdHJpbmcgbmFtZSwKICAgICAgIGZpbmFsIFQgZGVmVmFsdWUsIGZpbmFsIGJvb2xlYW4gbnVsbElmRGVmYXVsdCkgewogICAgIGZpbmFsIGJvb2xlYW4gc2V0ID0gZ2V0KG5hbWUpICE9IG51bGw7Ci0gICAgVCBvbGRWYWx1ZSA9IENvbmZpZ1V0aWwuZ2V0RW51bShmbGFncy5jZmcsIHNlY3Rpb24sIG51bGwsIG5hbWUsIGRlZlZhbHVlKTsKKyAgICBUIG9sZFZhbHVlID0gQ29uZmlnVXRpbC5nZXRFbnVtKGZsYWdzLmNmZywgc2VjdGlvbiwgc3Vic2VjdGlvbiwgbmFtZSwgZGVmVmFsdWUpOwogICAgIFQgbmV3VmFsdWUgPSB1aS5yZWFkRW51bShvbGRWYWx1ZSwgIiVzIiwgdGl0bGUpOwogICAgIGlmIChudWxsSWZEZWZhdWx0ICYmIG5ld1ZhbHVlID09IGRlZlZhbHVlKSB7CiAgICAgICBuZXdWYWx1ZSA9IG51bGw7CkBAIC0xMjUsMTYgKzEzMiwyNiBAQAogICAgIHJldHVybiBuZXdWYWx1ZTsKICAgfQogCi0gIFN0cmluZyBwYXNzd29yZChmaW5hbCBTdHJpbmcgdXNlcm5hbWUsIGZpbmFsIFN0cmluZyBwYXNzd29yZCkgeworICBwdWJsaWMgU3RyaW5nIHNlbGVjdChmaW5hbCBTdHJpbmcgdGl0bGUsIGZpbmFsIFN0cmluZyBuYW1lLCBmaW5hbCBTdHJpbmcgZHYsCisgICAgICBTZXQ8U3RyaW5nPiBhbGxvd2VkVmFsdWVzKSB7CisgICAgZmluYWwgU3RyaW5nIG92ID0gZ2V0KG5hbWUpOworICAgIFN0cmluZyBudiA9IHVpLnJlYWRTdHJpbmcob3YgIT0gbnVsbCA/IG92IDogZHYsIGFsbG93ZWRWYWx1ZXMsICIlcyIsIHRpdGxlKTsKKyAgICBpZiAoIWVxKG92LCBudikpIHsKKyAgICAgIHNldChuYW1lLCBudik7CisgICAgfQorICAgIHJldHVybiBudjsKKyAgfQorCisgIHB1YmxpYyBTdHJpbmcgcGFzc3dvcmQoZmluYWwgU3RyaW5nIHVzZXJuYW1lLCBmaW5hbCBTdHJpbmcgcGFzc3dvcmQpIHsKICAgICBmaW5hbCBTdHJpbmcgb3YgPSBnZXRTZWN1cmUocGFzc3dvcmQpOwogCi0gICAgU3RyaW5nIHVzZXIgPSBmbGFncy5zZWMuZ2V0U3RyaW5nKHNlY3Rpb24sIG51bGwsIHVzZXJuYW1lKTsKKyAgICBTdHJpbmcgdXNlciA9IGZsYWdzLnNlYy5nZXRTdHJpbmcoc2VjdGlvbiwgc3Vic2VjdGlvbiwgdXNlcm5hbWUpOwogICAgIGlmICh1c2VyID09IG51bGwpIHsKICAgICAgIHVzZXIgPSBnZXQodXNlcm5hbWUpOwogICAgIH0KIAogICAgIGlmICh1c2VyID09IG51bGwpIHsKLSAgICAgIGZsYWdzLnNlYy51bnNldChzZWN0aW9uLCBudWxsLCBwYXNzd29yZCk7CisgICAgICBmbGFncy5zZWMudW5zZXQoc2VjdGlvbiwgc3Vic2VjdGlvbiwgcGFzc3dvcmQpOwogICAgICAgcmV0dXJuIG51bGw7CiAgICAgfQogCkBAIC0xNTQsMTggKzE3MSwyMiBAQAogICAgIHJldHVybiBudjsKICAgfQogCi0gIFN0cmluZyBnZXRTZWN1cmUoU3RyaW5nIG5hbWUpIHsKLSAgICByZXR1cm4gZmxhZ3Muc2VjLmdldFN0cmluZyhzZWN0aW9uLCBudWxsLCBuYW1lKTsKKyAgcHVibGljIFN0cmluZyBnZXRTZWN1cmUoU3RyaW5nIG5hbWUpIHsKKyAgICByZXR1cm4gZmxhZ3Muc2VjLmdldFN0cmluZyhzZWN0aW9uLCBzdWJzZWN0aW9uLCBuYW1lKTsKICAgfQogCi0gIHZvaWQgc2V0U2VjdXJlKFN0cmluZyBuYW1lLCBTdHJpbmcgdmFsdWUpIHsKKyAgcHVibGljIHZvaWQgc2V0U2VjdXJlKFN0cmluZyBuYW1lLCBTdHJpbmcgdmFsdWUpIHsKICAgICBpZiAodmFsdWUgIT0gbnVsbCkgewotICAgICAgZmxhZ3Muc2VjLnNldFN0cmluZyhzZWN0aW9uLCBudWxsLCBuYW1lLCB2YWx1ZSk7CisgICAgICBmbGFncy5zZWMuc2V0U3RyaW5nKHNlY3Rpb24sIHN1YnNlY3Rpb24sIG5hbWUsIHZhbHVlKTsKICAgICB9IGVsc2UgewotICAgICAgZmxhZ3Muc2VjLnVuc2V0KHNlY3Rpb24sIG51bGwsIG5hbWUpOworICAgICAgZmxhZ3Muc2VjLnVuc2V0KHNlY3Rpb24sIHN1YnNlY3Rpb24sIG5hbWUpOwogICAgIH0KICAgfQogCisgIFN0cmluZyBnZXROYW1lKCkgeworICAgIHJldHVybiBzZWN0aW9uOworICB9CisKICAgcHJpdmF0ZSBzdGF0aWMgYm9vbGVhbiBlcShmaW5hbCBTdHJpbmcgYSwgZmluYWwgU3RyaW5nIGIpIHsKICAgICBpZiAoYSA9PSBudWxsICYmIGIgPT0gbnVsbCkgewogICAgICAgcmV0dXJuIHRydWU7CmRpZmYgLS1naXQgYS9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL2luaXQvU2l0ZVBhdGhJbml0aWFsaXplci5qYXZhIGIvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L1NpdGVQYXRoSW5pdGlhbGl6ZXIuamF2YQppbmRleCBmOGVmNjM3Li5jYTNiZjg0IDEwMDY0NAotLS0gYS9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL2luaXQvU2l0ZVBhdGhJbml0aWFsaXplci5qYXZhCisrKyBiL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9TaXRlUGF0aEluaXRpYWxpemVyLmphdmEKQEAgLTg5LDYgKzg5LDcgQEAKICAgICBleHRyYWN0TWFpbEV4YW1wbGUoIkNoYW5nZUZvb3Rlci52bSIpOwogICAgIGV4dHJhY3RNYWlsRXhhbXBsZSgiQ2hhbmdlU3ViamVjdC52bSIpOwogICAgIGV4dHJhY3RNYWlsRXhhbXBsZSgiQ29tbWVudC52bSIpOworICAgIGV4dHJhY3RNYWlsRXhhbXBsZSgiQ29tbWVudEZvb3Rlci52bSIpOwogICAgIGV4dHJhY3RNYWlsRXhhbXBsZSgiTWVyZ2VkLnZtIik7CiAgICAgZXh0cmFjdE1haWxFeGFtcGxlKCJNZXJnZUZhaWwudm0iKTsKICAgICBleHRyYWN0TWFpbEV4YW1wbGUoIk5ld0NoYW5nZS52bSIpOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L1VwZ3JhZGVGcm9tMl8wX3guamF2YSBiL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9VcGdyYWRlRnJvbTJfMF94LmphdmEKaW5kZXggOWY2MmZjNS4uYjk4MmFlMSAxMDA2NDQKLS0tIGEvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L1VwZ3JhZGVGcm9tMl8wX3guamF2YQorKysgYi9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL2luaXQvVXBncmFkZUZyb20yXzBfeC5qYXZhCkBAIC0yMCw3ICsyMCw2IEBACiAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5wZ20udXRpbC5Db25zb2xlVUk7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5TaXRlUGF0aHM7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnNjaGVtYS5EYXRhU291cmNlUHJvdmlkZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnV0aWwuU29ja2V0VXRpbDsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuU2luZ2xldG9uOwpAQCAtMTE4LDExICsxMTcsMTEgQEAKIAogICAgIGZpbmFsIFByb3BlcnRpZXMgb2xkcHJvcCA9IHJlYWRHZXJyaXRTZXJ2ZXJQcm9wZXJ0aWVzKCk7CiAgICAgaWYgKG9sZHByb3AgIT0gbnVsbCkgewotICAgICAgZmluYWwgU2VjdGlvbiBkYXRhYmFzZSA9IHNlY3Rpb25zLmdldCgiZGF0YWJhc2UiKTsKKyAgICAgIGZpbmFsIFNlY3Rpb24gZGF0YWJhc2UgPSBzZWN0aW9ucy5nZXQoImRhdGFiYXNlIiwgbnVsbCk7CiAKICAgICAgIFN0cmluZyB1cmwgPSBvbGRwcm9wLmdldFByb3BlcnR5KCJ1cmwiKTsKICAgICAgIGlmICh1cmwgIT0gbnVsbCAmJiAhY29udmVydFVybChkYXRhYmFzZSwgdXJsKSkgewotICAgICAgICBkYXRhYmFzZS5zZXQoInR5cGUiLCBEYXRhU291cmNlUHJvdmlkZXIuVHlwZS5KREJDKTsKKyAgICAgICAgZGF0YWJhc2Uuc2V0KCJ0eXBlIiwgImpkYmMiKTsKICAgICAgICAgZGF0YWJhc2Uuc2V0KCJkcml2ZXIiLCBvbGRwcm9wLmdldFByb3BlcnR5KCJkcml2ZXIiKSk7CiAgICAgICAgIGRhdGFiYXNlLnNldCgidXJsIiwgdXJsKTsKICAgICAgIH0KQEAgLTE4OSw3ICsxODgsNyBAQAogCiAgICAgaWYgKHVybC5zdGFydHNXaXRoKCJqZGJjOmgyOmZpbGU6IikpIHsKICAgICAgIHVybCA9IHVybC5zdWJzdHJpbmcoImpkYmM6aDI6ZmlsZToiLmxlbmd0aCgpKTsKLSAgICAgIGRhdGFiYXNlLnNldCgidHlwZSIsIERhdGFTb3VyY2VQcm92aWRlci5UeXBlLkgyKTsKKyAgICAgIGRhdGFiYXNlLnNldCgidHlwZSIsICJoMiIpOwogICAgICAgZGF0YWJhc2Uuc2V0KCJkYXRhYmFzZSIsIHVybCk7CiAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CkBAIC0yMDIsNyArMjAxLDcgQEAKICAgICAgIH0KIAogICAgICAgZmluYWwgSW5ldFNvY2tldEFkZHJlc3MgYWRkciA9IFNvY2tldFV0aWwucGFyc2UodXJsLnN1YnN0cmluZygwLCBzbCksIDApOwotICAgICAgZGF0YWJhc2Uuc2V0KCJ0eXBlIiwgRGF0YVNvdXJjZVByb3ZpZGVyLlR5cGUuUE9TVEdSRVNRTCk7CisgICAgICBkYXRhYmFzZS5zZXQoInR5cGUiLCAicG9zdGdyZXNxbCIpOwogICAgICAgc2V0aG9zdChkYXRhYmFzZSwgYWRkcik7CiAgICAgICBkYXRhYmFzZS5zZXQoImRhdGFiYXNlIiwgdXJsLnN1YnN0cmluZyhzbCArIDEpKTsKICAgICAgIHNldHVzZXIoZGF0YWJhc2UsIHVzZXJuYW1lLCBwYXNzd29yZCk7CkBAIC0yMTEsNyArMjEwLDcgQEAKIAogICAgIGlmICh1cmwuc3RhcnRzV2l0aCgiamRiYzpwb3N0Z3Jlc3FsOiIpKSB7CiAgICAgICB1cmwgPSB1cmwuc3Vic3RyaW5nKCJqZGJjOnBvc3RncmVzcWw6Ii5sZW5ndGgoKSk7Ci0gICAgICBkYXRhYmFzZS5zZXQoInR5cGUiLCBEYXRhU291cmNlUHJvdmlkZXIuVHlwZS5QT1NUR1JFU1FMKTsKKyAgICAgIGRhdGFiYXNlLnNldCgidHlwZSIsICJwb3N0Z3Jlc3FsIik7CiAgICAgICBkYXRhYmFzZS5zZXQoImhvc3RuYW1lIiwgImxvY2FsaG9zdCIpOwogICAgICAgZGF0YWJhc2Uuc2V0KCJkYXRhYmFzZSIsIHVybCk7CiAgICAgICBzZXR1c2VyKGRhdGFiYXNlLCB1c2VybmFtZSwgcGFzc3dvcmQpOwpAQCAtMjI2LDcgKzIyNSw3IEBACiAgICAgICB9CiAKICAgICAgIGZpbmFsIEluZXRTb2NrZXRBZGRyZXNzIGFkZHIgPSBTb2NrZXRVdGlsLnBhcnNlKHVybC5zdWJzdHJpbmcoMCwgc2wpLCAwKTsKLSAgICAgIGRhdGFiYXNlLnNldCgidHlwZSIsIERhdGFTb3VyY2VQcm92aWRlci5UeXBlLk1ZU1FMKTsKKyAgICAgIGRhdGFiYXNlLnNldCgidHlwZSIsICJteXNxbCIpOwogICAgICAgc2V0aG9zdChkYXRhYmFzZSwgYWRkcik7CiAgICAgICBkYXRhYmFzZS5zZXQoImRhdGFiYXNlIiwgdXJsLnN1YnN0cmluZyhzbCArIDEpKTsKICAgICAgIHNldHVzZXIoZGF0YWJhc2UsIHVzZXJuYW1lLCBwYXNzd29yZCk7CmRpZmYgLS1naXQgYS9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL3V0aWwvQ29uc29sZVVJLmphdmEgYi9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL3V0aWwvQ29uc29sZVVJLmphdmEKaW5kZXggYjRlMGZhZC4uZThjZjBhYiAxMDA2NDQKLS0tIGEvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS91dGlsL0NvbnNvbGVVSS5qYXZhCisrKyBiL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vdXRpbC9Db25zb2xlVUkuamF2YQpAQCAtMTgsNiArMTgsNyBAQAogCiBpbXBvcnQgamF2YS5pby5Db25zb2xlOwogaW1wb3J0IGphdmEubGFuZy5yZWZsZWN0Lkludm9jYXRpb25UYXJnZXRFeGNlcHRpb247CitpbXBvcnQgamF2YS51dGlsLlNldDsKIAogLyoqIENvbnNvbGUgYmFzZWQgaW50ZXJhY3Rpb24gd2l0aCB0aGUgaW52b2tpbmcgdXNlci4gKi8KIHB1YmxpYyBhYnN0cmFjdCBjbGFzcyBDb25zb2xlVUkgewpAQCAtNzMsNiArNzQsMTAgQEAKICAgLyoqIFByb21wdCB0aGUgdXNlciBmb3IgYSBzdHJpbmcsIHN1Z2dlc3RpbmcgYSBkZWZhdWx0LCBhbmQgcmV0dXJuaW5nIGNob2ljZS4gKi8KICAgcHVibGljIGFic3RyYWN0IFN0cmluZyByZWFkU3RyaW5nKFN0cmluZyBkZWYsIFN0cmluZyBmbXQsIE9iamVjdC4uLiBhcmdzKTsKIAorICAvKiogUHJvbXB0IHRoZSB1c2VyIHRvIG1ha2UgYSBjaG9pY2UgZnJvbSBhbiBhbGxvd2VkIGxpc3Qgb2YgdmFsdWVzLiAqLworICBwdWJsaWMgYWJzdHJhY3QgU3RyaW5nIHJlYWRTdHJpbmcoU3RyaW5nIGRlZiwgU2V0PFN0cmluZz4gYWxsb3dlZFZhbHVlcywKKyAgICAgIFN0cmluZyBmbXQsIE9iamVjdC4uLiBhcmdzKTsKKwogICAvKiogUHJvbXB0IHRoZSB1c2VyIGZvciBhbiBpbnRlZ2VyIHZhbHVlLCBzdWdnZXN0aW5nIGEgZGVmYXVsdC4gKi8KICAgcHVibGljIGludCByZWFkSW50KGludCBkZWYsIFN0cmluZyBmbXQsIE9iamVjdC4uLiBhcmdzKSB7CiAgICAgZm9yICg7OykgewpAQCAtMTYyLDYgKzE2NywyNCBAQAogICAgIH0KIAogICAgIEBPdmVycmlkZQorICAgIHB1YmxpYyBTdHJpbmcgcmVhZFN0cmluZyhTdHJpbmcgZGVmLCBTZXQ8U3RyaW5nPiBhbGxvd2VkVmFsdWVzLCBTdHJpbmcgZm10LAorICAgICAgICBPYmplY3QuLi4gYXJncykgeworICAgICAgZm9yICg7OykgeworICAgICAgICBTdHJpbmcgciA9IHJlYWRTdHJpbmcoZGVmLCBmbXQsIGFyZ3MpOworICAgICAgICBpZiAoYWxsb3dlZFZhbHVlcy5jb250YWlucyhyLnRvTG93ZXJDYXNlKCkpKSB7CisgICAgICAgICAgcmV0dXJuIHIudG9Mb3dlckNhc2UoKTsKKyAgICAgICAgfQorICAgICAgICBpZiAoISI/Ii5lcXVhbHMocikpIHsKKyAgICAgICAgICBjb25zb2xlLnByaW50ZigiZXJyb3I6ICclcycgaXMgbm90IGEgdmFsaWQgY2hvaWNlXG4iLCByKTsKKyAgICAgICAgfQorICAgICAgICBjb25zb2xlLnByaW50ZigiICAgICAgIFN1cHBvcnRlZCBvcHRpb25zIGFyZTpcbiIpOworICAgICAgICBmb3IgKGZpbmFsIFN0cmluZyB2IDogYWxsb3dlZFZhbHVlcykgeworICAgICAgICAgIGNvbnNvbGUucHJpbnRmKCIgICAgICAgICAlc1xuIiwgdi50b1N0cmluZygpLnRvTG93ZXJDYXNlKCkpOworICAgICAgICB9CisgICAgICB9CisgICAgfQorCisgICAgQE92ZXJyaWRlCiAgICAgcHVibGljIFN0cmluZyBwYXNzd29yZChTdHJpbmcgZm10LCBPYmplY3QuLi4gYXJncykgewogICAgICAgZmluYWwgU3RyaW5nIHByb21wdCA9IFN0cmluZy5mb3JtYXQoZm10LCBhcmdzKTsKICAgICAgIGZvciAoOzspIHsKQEAgLTI0Miw2ICsyNjUsMTIgQEAKICAgICB9CiAKICAgICBAT3ZlcnJpZGUKKyAgICBwdWJsaWMgU3RyaW5nIHJlYWRTdHJpbmcoU3RyaW5nIGRlZiwgU2V0PFN0cmluZz4gYWxsb3dlZFZhbHVlcywgU3RyaW5nIGZtdCwKKyAgICAgICAgT2JqZWN0Li4uIGFyZ3MpIHsKKyAgICAgIHJldHVybiBkZWY7CisgICAgfQorCisgICAgQE92ZXJyaWRlCiAgICAgcHVibGljIHZvaWQgd2FpdEZvclVzZXIoKSB7CiAgICAgfQogCmRpZmYgLS1naXQgYS9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL3V0aWwvU2l0ZVByb2dyYW0uamF2YSBiL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vdXRpbC9TaXRlUHJvZ3JhbS5qYXZhCmluZGV4IDQ4OTM1NzkuLjI0MmNhMjggMTAwNjQ0Ci0tLSBhL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vdXRpbC9TaXRlUHJvZ3JhbS5qYXZhCisrKyBiL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vdXRpbC9TaXRlUHJvZ3JhbS5qYXZhCkBAIC0xOCwxMCArMTgsMTMgQEAKIGltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5pbmplY3QuU3RhZ2UuUFJPRFVDVElPTjsKIAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmxpZmVjeWNsZS5MaWZlY3ljbGVNb2R1bGU7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5HZXJyaXRTZXJ2ZXJDb25maWc7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5HZXJyaXRTZXJ2ZXJDb25maWdNb2R1bGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5TaXRlUGF0aDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LkxvY2FsRGlza1JlcG9zaXRvcnlNYW5hZ2VyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5zY2hlbWEuRGF0YVNvdXJjZU1vZHVsZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuc2NoZW1hLkRhdGFTb3VyY2VQcm92aWRlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuc2NoZW1hLkRhdGFTb3VyY2VUeXBlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5zY2hlbWEuRGF0YWJhc2VNb2R1bGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnNjaGVtYS5TY2hlbWFNb2R1bGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLk9ybUV4Y2VwdGlvbjsKQEAgLTM0LDYgKzM3LDcgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5uYW1lLk5hbWVzOwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LnNwaS5NZXNzYWdlOwogCitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuQ29uZmlnOwogaW1wb3J0IG9yZy5rb2hzdWtlLmFyZ3M0ai5PcHRpb247CiAKIGltcG9ydCBqYXZhLmlvLkZpbGU7CkBAIC0xNDcsMTIgKzE1MSwxNSBAQAogCiAgICAgZmluYWwgRmlsZSBzaXRlUGF0aCA9IGdldFNpdGVQYXRoKCk7CiAgICAgZmluYWwgTGlzdDxNb2R1bGU+IG1vZHVsZXMgPSBuZXcgQXJyYXlMaXN0PE1vZHVsZT4oKTsKLSAgICBtb2R1bGVzLmFkZChuZXcgQWJzdHJhY3RNb2R1bGUoKSB7CisKKyAgICBNb2R1bGUgc2l0ZVBhdGhNb2R1bGUgPSBuZXcgQWJzdHJhY3RNb2R1bGUoKSB7CiAgICAgICBAT3ZlcnJpZGUKICAgICAgIHByb3RlY3RlZCB2b2lkIGNvbmZpZ3VyZSgpIHsKICAgICAgICAgYmluZChGaWxlLmNsYXNzKS5hbm5vdGF0ZWRXaXRoKFNpdGVQYXRoLmNsYXNzKS50b0luc3RhbmNlKHNpdGVQYXRoKTsKICAgICAgIH0KLSAgICB9KTsKKyAgICB9OworICAgIG1vZHVsZXMuYWRkKHNpdGVQYXRoTW9kdWxlKTsKKwogICAgIG1vZHVsZXMuYWRkKG5ldyBMaWZlY3ljbGVNb2R1bGUoKSB7CiAgICAgICBAT3ZlcnJpZGUKICAgICAgIHByb3RlY3RlZCB2b2lkIGNvbmZpZ3VyZSgpIHsKQEAgLTE2Miw3ICsxNjksMjEgQEAKICAgICAgICAgbGlzdGVuZXIoKS50byhEYXRhU291cmNlUHJvdmlkZXIuY2xhc3MpOwogICAgICAgfQogICAgIH0pOwotICAgIG1vZHVsZXMuYWRkKG5ldyBHZXJyaXRTZXJ2ZXJDb25maWdNb2R1bGUoKSk7CisgICAgTW9kdWxlIGNvbmZpZ01vZHVsZSA9IG5ldyBHZXJyaXRTZXJ2ZXJDb25maWdNb2R1bGUoKTsKKyAgICBtb2R1bGVzLmFkZChjb25maWdNb2R1bGUpOworICAgIEluamVjdG9yIGNmZ0luamVjdG9yID0gR3VpY2UuY3JlYXRlSW5qZWN0b3Ioc2l0ZVBhdGhNb2R1bGUsIGNvbmZpZ01vZHVsZSk7CisgICAgQ29uZmlnIGNmZyA9IGNmZ0luamVjdG9yLmdldEluc3RhbmNlKEtleS5nZXQoQ29uZmlnLmNsYXNzLCBHZXJyaXRTZXJ2ZXJDb25maWcuY2xhc3MpKTsKKyAgICBTdHJpbmcgZGJUeXBlID0gY2ZnLmdldFN0cmluZygiZGF0YWJhc2UiLCBudWxsLCAidHlwZSIpOworCisgICAgZmluYWwgRGF0YVNvdXJjZVR5cGUgZHN0ID0gR3VpY2UuY3JlYXRlSW5qZWN0b3IobmV3IERhdGFTb3VyY2VNb2R1bGUoKSwgY29uZmlnTW9kdWxlLAorICAgICAgICAgICAgc2l0ZVBhdGhNb2R1bGUpLmdldEluc3RhbmNlKAorICAgICAgICAgICAgS2V5LmdldChEYXRhU291cmNlVHlwZS5jbGFzcywgTmFtZXMubmFtZWQoZGJUeXBlLnRvTG93ZXJDYXNlKCkpKSk7CisKKyAgICBtb2R1bGVzLmFkZChuZXcgQWJzdHJhY3RNb2R1bGUoKSB7CisgICAgICBAT3ZlcnJpZGUKKyAgICAgIHByb3RlY3RlZCB2b2lkIGNvbmZpZ3VyZSgpIHsKKyAgICAgICAgYmluZChEYXRhU291cmNlVHlwZS5jbGFzcykudG9JbnN0YW5jZShkc3QpOworICAgICAgfX0pOwogICAgIG1vZHVsZXMuYWRkKG5ldyBEYXRhYmFzZU1vZHVsZSgpKTsKICAgICBtb2R1bGVzLmFkZChuZXcgU2NoZW1hTW9kdWxlKCkpOwogICAgIG1vZHVsZXMuYWRkKG5ldyBMb2NhbERpc2tSZXBvc2l0b3J5TWFuYWdlci5Nb2R1bGUoKSk7CmRpZmYgLS1naXQgYS9nZXJyaXQtcGdtL3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vZ2Vycml0LnNoIGIvZ2Vycml0LXBnbS9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvcGdtL2dlcnJpdC5zaAppbmRleCAzODU3ZWJkLi5mMDZiZDMyIDEwMDc1NQotLS0gYS9nZXJyaXQtcGdtL3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vZ2Vycml0LnNoCisrKyBiL2dlcnJpdC1wZ20vc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9nZXJyaXQuc2gKQEAgLTEyNiw3ICsxMjYsNyBAQAogR0VSUklUX0lOU1RBTExfVFJBQ0VfRklMRT1ldGMvZ2Vycml0LmNvbmZpZwogCiAjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIwotIyBObyBnaXQgaW4gUEFUSD8gTmVlZGVkIGZvciBnZXJyaXQuY29uZmcgcGFyc2luZworIyBObyBnaXQgaW4gUEFUSD8gTmVlZGVkIGZvciBnZXJyaXQuY29uZmlnIHBhcnNpbmcKICMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjCiBpZiB0eXBlIGdpdCA+L2Rldi9udWxsIDI+JjEgOyB0aGVuCiAgIDogT0sKQEAgLTE0MCw3ICsxNDAsMTcgQEAKICMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjCiBpZiB0ZXN0IC16ICIkR0VSUklUX1NJVEUiIDsgdGhlbgogICBHRVJSSVRfU0lURV8xPWBkaXJuYW1lICIkMCJgCisKKyAgIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMKKyAgIyBBcyBsYXN0IHJlc29ydCBhc3N1bWUgd2Ugc3RhcnRlZCB0aGUgc2NyaXB0IGZyb20KKyAgIyB0aGUgYmluIGRpcmVjdG9yeSBvZiB0aGUgR2Vycml0IGluc3RhbGxhdGlvbgorICAjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIworICBpZiBbICIkR0VSUklUX1NJVEVfMSIgPSAiLiIgXTsgdGhlbgorICAgICAgR0VSUklUX1NJVEVfMT1gcHdkYAorICBmaQorCiAgIEdFUlJJVF9TSVRFXzE9YGRpcm5hbWUgIiRHRVJSSVRfU0lURV8xImAKKwogICBpZiB0ZXN0IC1mICIke0dFUlJJVF9TSVRFXzF9LyR7R0VSUklUX0lOU1RBTExfVFJBQ0VfRklMRX0iIDsgdGhlbiAKICAgICBHRVJSSVRfU0lURT0ke0dFUlJJVF9TSVRFXzF9IAogICBmaQpAQCAtMjQxLDcgKzI1MSw5IEBACiBmaQogCiBpZiB0ZXN0IC16ICIkSkFWQSIgOyB0aGVuCi0gIGVjaG8gPiYyICJDYW5ub3QgZmluZCBhIEpSRSBvciBKREsuIFBsZWFzZSBzZXQgSkFWQV9IT01FIHRvIGEgPj0xLjYgSlJFIgorICBlY2hvID4mMiAiQ2Fubm90IGZpbmQgYSBKUkUgb3IgSkRLLiBQbGVhc2Ugc2V0IEpBVkFfSE9NRSBvciIKKyAgZWNobyA+JjIgImNvbnRhaW5lci5qYXZhSG9tZSBpbiAkR0VSUklUX1NJVEUvZXRjL2dlcnJpdC5jb25maWciCisgIGVjaG8gPiYyICJ0byBhID49MS42IEpSRSIKICAgZXhpdCAxCiBmaQogCmRpZmYgLS1naXQgYS9nZXJyaXQtcGdtL3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vbGlicmFyaWVzLmNvbmZpZyBiL2dlcnJpdC1wZ20vc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9saWJyYXJpZXMuY29uZmlnCmluZGV4IGI5OTI2N2MuLmY0YzU4MDggMTAwNjQ0Ci0tLSBhL2dlcnJpdC1wZ20vc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9saWJyYXJpZXMuY29uZmlnCisrKyBiL2dlcnJpdC1wZ20vc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9saWJyYXJpZXMuY29uZmlnCkBAIC0xOSw2ICsxOSw2IEBACiAgIHNoYTEgPSA2MzI3YTVmN2EzZGM0NWUwZmQ3MzVhZGI1ZDA4YzVhNzRjMDVjMjBjCiAKIFtsaWJyYXJ5ICJteXNxbERyaXZlciJdCi0gIG5hbWUgPSBNeVNRTCBDb25uZWN0b3IvSiA1LjEuMTAKLSAgdXJsID0gaHR0cDovL3JlcG8yLm1hdmVuLm9yZy9tYXZlbjIvbXlzcWwvbXlzcWwtY29ubmVjdG9yLWphdmEvNS4xLjEwL215c3FsLWNvbm5lY3Rvci1qYXZhLTUuMS4xMC5qYXIKLSAgc2hhMSA9IGI4MzU3NDEyNGYxYTAwZDZmNzBkNTZiYTY0YWE1MmI4ZTE1ODhlNmQKKyAgbmFtZSA9IE15U1FMIENvbm5lY3Rvci9KIDUuMS4yMQorICB1cmwgPSBodHRwOi8vcmVwbzIubWF2ZW4ub3JnL21hdmVuMi9teXNxbC9teXNxbC1jb25uZWN0b3ItamF2YS81LjEuMjEvbXlzcWwtY29ubmVjdG9yLWphdmEtNS4xLjIxLmphcgorICBzaGExID0gN2FiYmQxOWZjMmUyZDViOTJjMDg5NWFmODUyMGY3ZmEzMDI2NmJlOQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXBnbS9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L1VwZ3JhZGVGcm9tMl8wX3hUZXN0LmphdmEgYi9nZXJyaXQtcGdtL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL2luaXQvVXBncmFkZUZyb20yXzBfeFRlc3QuamF2YQppbmRleCA0OTNhNDQwLi44NmYwMjYwIDEwMDY0NAotLS0gYS9nZXJyaXQtcGdtL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL2luaXQvVXBncmFkZUZyb20yXzBfeFRlc3QuamF2YQorKysgYi9nZXJyaXQtcGdtL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL2luaXQvVXBncmFkZUZyb20yXzBfeFRlc3QuamF2YQpAQCAtNzIsOCArNzIsOCBAQAogICAgIGZpbmFsIENvbnNvbGVVSSB1aSA9IGNyZWF0ZVN0cmljdE1vY2soQ29uc29sZVVJLmNsYXNzKTsKICAgICBTZWN0aW9uLkZhY3Rvcnkgc2VjdGlvbnMgPSBuZXcgU2VjdGlvbi5GYWN0b3J5KCkgewogICAgICAgQE92ZXJyaWRlCi0gICAgICBwdWJsaWMgU2VjdGlvbiBnZXQoU3RyaW5nIG5hbWUpIHsKLSAgICAgICAgcmV0dXJuIG5ldyBTZWN0aW9uKGZsYWdzLCBzaXRlLCB1aSwgbmFtZSk7CisgICAgICBwdWJsaWMgU2VjdGlvbiBnZXQoU3RyaW5nIG5hbWUsIFN0cmluZyBzdWJzZWN0aW9uKSB7CisgICAgICAgIHJldHVybiBuZXcgU2VjdGlvbihmbGFncywgc2l0ZSwgdWksIG5hbWUsIHN1YnNlY3Rpb24pOwogICAgICAgfQogICAgIH07CiAKZGlmZiAtLWdpdCBhL2dlcnJpdC1wbHVnaW4tYXBpL3BvbS54bWwgYi9nZXJyaXQtcGx1Z2luLWFwaS9wb20ueG1sCmluZGV4IDg0ZjZmN2IuLjgxYTUwOTg0IDEwMDY0NAotLS0gYS9nZXJyaXQtcGx1Z2luLWFwaS9wb20ueG1sCisrKyBiL2dlcnJpdC1wbHVnaW4tYXBpL3BvbS54bWwKQEAgLTIyLDcgKzIyLDcgQEAKICAgPHBhcmVudD4KICAgICA8Z3JvdXBJZD5jb20uZ29vZ2xlLmdlcnJpdDwvZ3JvdXBJZD4KICAgICA8YXJ0aWZhY3RJZD5nZXJyaXQtcGFyZW50PC9hcnRpZmFjdElkPgotICAgIDx2ZXJzaW9uPjIuNS1TTkFQU0hPVDwvdmVyc2lvbj4KKyAgICA8dmVyc2lvbj4yLjYtU05BUFNIT1Q8L3ZlcnNpb24+CiAgIDwvcGFyZW50PgogCiAgIDxhcnRpZmFjdElkPmdlcnJpdC1wbHVnaW4tYXBpPC9hcnRpZmFjdElkPgpAQCAtNDYsNiArNDYsMTggQEAKICAgICA8L2RlcGVuZGVuY3k+CiAKICAgICA8ZGVwZW5kZW5jeT4KKyAgICAgIDxncm91cElkPmNvbS5nb29nbGUuZ2Vycml0PC9ncm91cElkPgorICAgICAgPGFydGlmYWN0SWQ+Z2Vycml0LXBnbTwvYXJ0aWZhY3RJZD4KKyAgICAgIDx2ZXJzaW9uPiR7cHJvamVjdC52ZXJzaW9ufTwvdmVyc2lvbj4KKyAgICAgIDxleGNsdXNpb25zPgorICAgICAgICA8ZXhjbHVzaW9uPgorICAgICAgICAgIDxncm91cElkPm9yZy5lY2xpcHNlLmpldHR5PC9ncm91cElkPgorICAgICAgICAgIDxhcnRpZmFjdElkPmpldHR5LXNlcnZsZXQ8L2FydGlmYWN0SWQ+CisgICAgICAgIDwvZXhjbHVzaW9uPgorICAgICAgPC9leGNsdXNpb25zPgorICAgIDwvZGVwZW5kZW5jeT4KKworICAgIDxkZXBlbmRlbmN5PgogICAgICAgPGdyb3VwSWQ+b3JnLmFwYWNoZS50b21jYXQ8L2dyb3VwSWQ+CiAgICAgICA8YXJ0aWZhY3RJZD5zZXJ2bGV0LWFwaTwvYXJ0aWZhY3RJZD4KICAgICA8L2RlcGVuZGVuY3k+CkBAIC02Niw4ICs3OCw4IEBACiAgICAgICAgICAgICAgIDxleGNsdWRlPmNvbS5nb29nbGUuZ2Vycml0OmdlcnJpdC1wYXRjaC1jb21tb25zbmV0PC9leGNsdWRlPgogICAgICAgICAgICAgICA8ZXhjbHVkZT5jb20uZ29vZ2xlLmdlcnJpdDpnZXJyaXQtcGF0Y2gtamdpdDwvZXhjbHVkZT4KICAgICAgICAgICAgICAgPGV4Y2x1ZGU+Y29tLmdvb2dsZS5nZXJyaXQ6Z2Vycml0LXV0aWwtc3NsPC9leGNsdWRlPgotICAgICAgICAgICAgICA8ZXhjbHVkZT5jb20uZ29vZ2xlLmdlcnJpdDpqdW5pdmVyc2FsY2hhcmRldDwvZXhjbHVkZT4KIAorICAgICAgICAgICAgICA8ZXhjbHVkZT5jb20uZ29vZ2xlY29kZS5qdW5pdmVyc2FsY2hhcmRldDpqdW5pdmVyc2FsY2hhcmRldDwvZXhjbHVkZT4KICAgICAgICAgICAgICAgPGV4Y2x1ZGU+Y29tLmdvb2dsZWNvZGUucHJvbG9nLWNhZmU6UHJvbG9nQ2FmZTwvZXhjbHVkZT4KICAgICAgICAgICAgICAgPGV4Y2x1ZGU+b3JnLnNsZjRqOnNsZjRqLWxvZzRqMTI8L2V4Y2x1ZGU+CiAgICAgICAgICAgICAgIDxleGNsdWRlPmxvZzRqOmxvZzRqPC9leGNsdWRlPgpkaWZmIC0tZ2l0IGEvZ2Vycml0LXBsdWdpbi1hcmNoZXR5cGUvcG9tLnhtbCBiL2dlcnJpdC1wbHVnaW4tYXJjaGV0eXBlL3BvbS54bWwKaW5kZXggZGQxNzk0Yi4uNzFmZWFiYyAxMDA2NDQKLS0tIGEvZ2Vycml0LXBsdWdpbi1hcmNoZXR5cGUvcG9tLnhtbAorKysgYi9nZXJyaXQtcGx1Z2luLWFyY2hldHlwZS9wb20ueG1sCkBAIC0yMSw3ICsyMSw3IEBACiAgIDxwYXJlbnQ+CiAgICAgPGdyb3VwSWQ+Y29tLmdvb2dsZS5nZXJyaXQ8L2dyb3VwSWQ+CiAgICAgPGFydGlmYWN0SWQ+Z2Vycml0LXBhcmVudDwvYXJ0aWZhY3RJZD4KLSAgICA8dmVyc2lvbj4yLjUtU05BUFNIT1Q8L3ZlcnNpb24+CisgICAgPHZlcnNpb24+Mi42LVNOQVBTSE9UPC92ZXJzaW9uPgogICA8L3BhcmVudD4KIAogICA8YXJ0aWZhY3RJZD5nZXJyaXQtcGx1Z2luLWFyY2hldHlwZTwvYXJ0aWZhY3RJZD4KZGlmZiAtLWdpdCBhL2dlcnJpdC1wbHVnaW4tZ3d0LWFyY2hldHlwZS8uZ2l0aWdub3JlIGIvZ2Vycml0LXBsdWdpbi1nd3QtYXJjaGV0eXBlLy5naXRpZ25vcmUKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uODBkNjI1NwotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1wbHVnaW4tZ3d0LWFyY2hldHlwZS8uZ2l0aWdub3JlCkBAIC0wLDAgKzEsNSBAQAorL3RhcmdldAorLy5jbGFzc3BhdGgKKy8ucHJvamVjdAorLy5zZXR0aW5ncy9vcmcubWF2ZW4uaWRlLmVjbGlwc2UucHJlZnMKKy8uc2V0dGluZ3Mvb3JnLmVjbGlwc2UubTJlLmNvcmUucHJlZnMKZGlmZiAtLWdpdCBhL2dlcnJpdC1wbHVnaW4tZ3d0LWFyY2hldHlwZS9wb20ueG1sIGIvZ2Vycml0LXBsdWdpbi1nd3QtYXJjaGV0eXBlL3BvbS54bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uOTFjZDE0MgotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1wbHVnaW4tZ3d0LWFyY2hldHlwZS9wb20ueG1sCkBAIC0wLDAgKzEsNTMgQEAKKzw/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+CmRpZmYgLS1naXQgYS9nZXJyaXQtcGx1Z2luLWd3dC1hcmNoZXR5cGUvc3JjL21haW4vcmVzb3VyY2VzL2FyY2hldHlwZS1yZXNvdXJjZXMvLmdpdGlnbm9yZSBiL2dlcnJpdC1wbHVnaW4tZ3d0LWFyY2hldHlwZS9zcmMvbWFpbi9yZXNvdXJjZXMvYXJjaGV0eXBlLXJlc291cmNlcy8uZ2l0aWdub3JlCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjgwZDYyNTcKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtcGx1Z2luLWd3dC1hcmNoZXR5cGUvc3JjL21haW4vcmVzb3VyY2VzL2FyY2hldHlwZS1yZXNvdXJjZXMvLmdpdGlnbm9yZQpAQCAtMCwwICsxLDUgQEAKKy90YXJnZXQKKy8uY2xhc3NwYXRoCisvLnByb2plY3QKKy8uc2V0dGluZ3Mvb3JnLm1hdmVuLmlkZS5lY2xpcHNlLnByZWZzCisvLnNldHRpbmdzL29yZy5lY2xpcHNlLm0yZS5jb3JlLnByZWZzCmRpZmYgLS1naXQgYS9nZXJyaXQtcGx1Z2luLWd3dC1hcmNoZXR5cGUvc3JjL21haW4vcmVzb3VyY2VzL2FyY2hldHlwZS1yZXNvdXJjZXMvTElDRU5TRSBiL2dlcnJpdC1wbHVnaW4tZ3d0LWFyY2hldHlwZS9zcmMvbWFpbi9yZXNvdXJjZXMvYXJjaGV0eXBlLXJlc291cmNlcy9MSUNFTlNFCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjExMDY5ZWQKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtcGx1Z2luLWd3dC1hcmNoZXR5cGUvc3JjL21haW4vcmVzb3VyY2VzL2FyY2hldHlwZS1yZXNvdXJjZXMvTElDRU5TRQpAQCAtMCwwICsxLDIwMSBAQAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgQXBhY2hlIExpY2Vuc2UKKyAgICAgICAgICAgICAgICAgICAgICAgIFZlcnNpb24gMi4wLCBKYW51YXJ5IDIwMDQKKyAgICAgICAgICAgICAgICAgICAgIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy8KKworVEVSTVMgQU5EIENPTkRJVElPTlMgRk9SIFVTRSwgUkVQUk9EVUNUSU9OLCBBTkQgRElTVFJJQlVUSU9OCisKKzEuIERlZmluaXRpb25zLgorCisgICAiTGljZW5zZSIgc2hhbGwgbWVhbiB0aGUgdGVybXMgYW5kIGNvbmRpdGlvbnMgZm9yIHVzZSwgcmVwcm9kdWN0aW9uLAorICAgYW5kIGRpc3RyaWJ1dGlvbiBhcyBkZWZpbmVkIGJ5IFNlY3Rpb25zIDEgdGhyb3VnaCA5IG9mIHRoaXMgZG9jdW1lbnQuCisKKyAgICJMaWNlbnNvciIgc2hhbGwgbWVhbiB0aGUgY29weXJpZ2h0IG93bmVyIG9yIGVudGl0eSBhdXRob3JpemVkIGJ5CisgICB0aGUgY29weXJpZ2h0IG93bmVyIHRoYXQgaXMgZ3JhbnRpbmcgdGhlIExpY2Vuc2UuCisKKyAgICJMZWdhbCBFbnRpdHkiIHNoYWxsIG1lYW4gdGhlIHVuaW9uIG9mIHRoZSBhY3RpbmcgZW50aXR5IGFuZCBhbGwKKyAgIG90aGVyIGVudGl0aWVzIHRoYXQgY29udHJvbCwgYXJlIGNvbnRyb2xsZWQgYnksIG9yIGFyZSB1bmRlciBjb21tb24KKyAgIGNvbnRyb2wgd2l0aCB0aGF0IGVudGl0eS4gRm9yIHRoZSBwdXJwb3NlcyBvZiB0aGlzIGRlZmluaXRpb24sCisgICAiY29udHJvbCIgbWVhbnMgKGkpIHRoZSBwb3dlciwgZGlyZWN0IG9yIGluZGlyZWN0LCB0byBjYXVzZSB0aGUKKyAgIGRpcmVjdGlvbiBvciBtYW5hZ2VtZW50IG9mIHN1Y2ggZW50aXR5LCB3aGV0aGVyIGJ5IGNvbnRyYWN0IG9yCisgICBvdGhlcndpc2UsIG9yIChpaSkgb3duZXJzaGlwIG9mIGZpZnR5IHBlcmNlbnQgKDUwJSkgb3IgbW9yZSBvZiB0aGUKKyAgIG91dHN0YW5kaW5nIHNoYXJlcywgb3IgKGlpaSkgYmVuZWZpY2lhbCBvd25lcnNoaXAgb2Ygc3VjaCBlbnRpdHkuCisKKyAgICJZb3UiIChvciAiWW91ciIpIHNoYWxsIG1lYW4gYW4gaW5kaXZpZHVhbCBvciBMZWdhbCBFbnRpdHkKKyAgIGV4ZXJjaXNpbmcgcGVybWlzc2lvbnMgZ3JhbnRlZCBieSB0aGlzIExpY2Vuc2UuCisKKyAgICJTb3VyY2UiIGZvcm0gc2hhbGwgbWVhbiB0aGUgcHJlZmVycmVkIGZvcm0gZm9yIG1ha2luZyBtb2RpZmljYXRpb25zLAorICAgaW5jbHVkaW5nIGJ1dCBub3QgbGltaXRlZCB0byBzb2Z0d2FyZSBzb3VyY2UgY29kZSwgZG9jdW1lbnRhdGlvbgorICAgc291cmNlLCBhbmQgY29uZmlndXJhdGlvbiBmaWxlcy4KKworICAgIk9iamVjdCIgZm9ybSBzaGFsbCBtZWFuIGFueSBmb3JtIHJlc3VsdGluZyBmcm9tIG1lY2hhbmljYWwKKyAgIHRyYW5zZm9ybWF0aW9uIG9yIHRyYW5zbGF0aW9uIG9mIGEgU291cmNlIGZvcm0sIGluY2x1ZGluZyBidXQKKyAgIG5vdCBsaW1pdGVkIHRvIGNvbXBpbGVkIG9iamVjdCBjb2RlLCBnZW5lcmF0ZWQgZG9jdW1lbnRhdGlvbiwKKyAgIGFuZCBjb252ZXJzaW9ucyB0byBvdGhlciBtZWRpYSB0eXBlcy4KKworICAgIldvcmsiIHNoYWxsIG1lYW4gdGhlIHdvcmsgb2YgYXV0aG9yc2hpcCwgd2hldGhlciBpbiBTb3VyY2Ugb3IKKyAgIE9iamVjdCBmb3JtLCBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgTGljZW5zZSwgYXMgaW5kaWNhdGVkIGJ5IGEKKyAgIGNvcHlyaWdodCBub3RpY2UgdGhhdCBpcyBpbmNsdWRlZCBpbiBvciBhdHRhY2hlZCB0byB0aGUgd29yaworICAgKGFuIGV4YW1wbGUgaXMgcHJvdmlkZWQgaW4gdGhlIEFwcGVuZGl4IGJlbG93KS4KKworICAgIkRlcml2YXRpdmUgV29ya3MiIHNoYWxsIG1lYW4gYW55IHdvcmssIHdoZXRoZXIgaW4gU291cmNlIG9yIE9iamVjdAorICAgZm9ybSwgdGhhdCBpcyBiYXNlZCBvbiAob3IgZGVyaXZlZCBmcm9tKSB0aGUgV29yayBhbmQgZm9yIHdoaWNoIHRoZQorICAgZWRpdG9yaWFsIHJldmlzaW9ucywgYW5ub3RhdGlvbnMsIGVsYWJvcmF0aW9ucywgb3Igb3RoZXIgbW9kaWZpY2F0aW9ucworICAgcmVwcmVzZW50LCBhcyBhIHdob2xlLCBhbiBvcmlnaW5hbCB3b3JrIG9mIGF1dGhvcnNoaXAuIEZvciB0aGUgcHVycG9zZXMKKyAgIG9mIHRoaXMgTGljZW5zZSwgRGVyaXZhdGl2ZSBXb3JrcyBzaGFsbCBub3QgaW5jbHVkZSB3b3JrcyB0aGF0IHJlbWFpbgorICAgc2VwYXJhYmxlIGZyb20sIG9yIG1lcmVseSBsaW5rIChvciBiaW5kIGJ5IG5hbWUpIHRvIHRoZSBpbnRlcmZhY2VzIG9mLAorICAgdGhlIFdvcmsgYW5kIERlcml2YXRpdmUgV29ya3MgdGhlcmVvZi4KKworICAgIkNvbnRyaWJ1dGlvbiIgc2hhbGwgbWVhbiBhbnkgd29yayBvZiBhdXRob3JzaGlwLCBpbmNsdWRpbmcKKyAgIHRoZSBvcmlnaW5hbCB2ZXJzaW9uIG9mIHRoZSBXb3JrIGFuZCBhbnkgbW9kaWZpY2F0aW9ucyBvciBhZGRpdGlvbnMKKyAgIHRvIHRoYXQgV29yayBvciBEZXJpdmF0aXZlIFdvcmtzIHRoZXJlb2YsIHRoYXQgaXMgaW50ZW50aW9uYWxseQorICAgc3VibWl0dGVkIHRvIExpY2Vuc29yIGZvciBpbmNsdXNpb24gaW4gdGhlIFdvcmsgYnkgdGhlIGNvcHlyaWdodCBvd25lcgorICAgb3IgYnkgYW4gaW5kaXZpZHVhbCBvciBMZWdhbCBFbnRpdHkgYXV0aG9yaXplZCB0byBzdWJtaXQgb24gYmVoYWxmIG9mCisgICB0aGUgY29weXJpZ2h0IG93bmVyLiBGb3IgdGhlIHB1cnBvc2VzIG9mIHRoaXMgZGVmaW5pdGlvbiwgInN1Ym1pdHRlZCIKKyAgIG1lYW5zIGFueSBmb3JtIG9mIGVsZWN0cm9uaWMsIHZlcmJhbCwgb3Igd3JpdHRlbiBjb21tdW5pY2F0aW9uIHNlbnQKKyAgIHRvIHRoZSBMaWNlbnNvciBvciBpdHMgcmVwcmVzZW50YXRpdmVzLCBpbmNsdWRpbmcgYnV0IG5vdCBsaW1pdGVkIHRvCisgICBjb21tdW5pY2F0aW9uIG9uIGVsZWN0cm9uaWMgbWFpbGluZyBsaXN0cywgc291cmNlIGNvZGUgY29udHJvbCBzeXN0ZW1zLAorICAgYW5kIGlzc3VlIHRyYWNraW5nIHN5c3RlbXMgdGhhdCBhcmUgbWFuYWdlZCBieSwgb3Igb24gYmVoYWxmIG9mLCB0aGUKKyAgIExpY2Vuc29yIGZvciB0aGUgcHVycG9zZSBvZiBkaXNjdXNzaW5nIGFuZCBpbXByb3ZpbmcgdGhlIFdvcmssIGJ1dAorICAgZXhjbHVkaW5nIGNvbW11bmljYXRpb24gdGhhdCBpcyBjb25zcGljdW91c2x5IG1hcmtlZCBvciBvdGhlcndpc2UKKyAgIGRlc2lnbmF0ZWQgaW4gd3JpdGluZyBieSB0aGUgY29weXJpZ2h0IG93bmVyIGFzICJOb3QgYSBDb250cmlidXRpb24uIgorCisgICAiQ29udHJpYnV0b3IiIHNoYWxsIG1lYW4gTGljZW5zb3IgYW5kIGFueSBpbmRpdmlkdWFsIG9yIExlZ2FsIEVudGl0eQorICAgb24gYmVoYWxmIG9mIHdob20gYSBDb250cmlidXRpb24gaGFzIGJlZW4gcmVjZWl2ZWQgYnkgTGljZW5zb3IgYW5kCisgICBzdWJzZXF1ZW50bHkgaW5jb3Jwb3JhdGVkIHdpdGhpbiB0aGUgV29yay4KKworMi4gR3JhbnQgb2YgQ29weXJpZ2h0IExpY2Vuc2UuIFN1YmplY3QgdG8gdGhlIHRlcm1zIGFuZCBjb25kaXRpb25zIG9mCisgICB0aGlzIExpY2Vuc2UsIGVhY2ggQ29udHJpYnV0b3IgaGVyZWJ5IGdyYW50cyB0byBZb3UgYSBwZXJwZXR1YWwsCisgICB3b3JsZHdpZGUsIG5vbi1leGNsdXNpdmUsIG5vLWNoYXJnZSwgcm95YWx0eS1mcmVlLCBpcnJldm9jYWJsZQorICAgY29weXJpZ2h0IGxpY2Vuc2UgdG8gcmVwcm9kdWNlLCBwcmVwYXJlIERlcml2YXRpdmUgV29ya3Mgb2YsCisgICBwdWJsaWNseSBkaXNwbGF5LCBwdWJsaWNseSBwZXJmb3JtLCBzdWJsaWNlbnNlLCBhbmQgZGlzdHJpYnV0ZSB0aGUKKyAgIFdvcmsgYW5kIHN1Y2ggRGVyaXZhdGl2ZSBXb3JrcyBpbiBTb3VyY2Ugb3IgT2JqZWN0IGZvcm0uCisKKzMuIEdyYW50IG9mIFBhdGVudCBMaWNlbnNlLiBTdWJqZWN0IHRvIHRoZSB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZgorICAgdGhpcyBMaWNlbnNlLCBlYWNoIENvbnRyaWJ1dG9yIGhlcmVieSBncmFudHMgdG8gWW91IGEgcGVycGV0dWFsLAorICAgd29ybGR3aWRlLCBub24tZXhjbHVzaXZlLCBuby1jaGFyZ2UsIHJveWFsdHktZnJlZSwgaXJyZXZvY2FibGUKKyAgIChleGNlcHQgYXMgc3RhdGVkIGluIHRoaXMgc2VjdGlvbikgcGF0ZW50IGxpY2Vuc2UgdG8gbWFrZSwgaGF2ZSBtYWRlLAorICAgdXNlLCBvZmZlciB0byBzZWxsLCBzZWxsLCBpbXBvcnQsIGFuZCBvdGhlcndpc2UgdHJhbnNmZXIgdGhlIFdvcmssCisgICB3aGVyZSBzdWNoIGxpY2Vuc2UgYXBwbGllcyBvbmx5IHRvIHRob3NlIHBhdGVudCBjbGFpbXMgbGljZW5zYWJsZQorICAgYnkgc3VjaCBDb250cmlidXRvciB0aGF0IGFyZSBuZWNlc3NhcmlseSBpbmZyaW5nZWQgYnkgdGhlaXIKKyAgIENvbnRyaWJ1dGlvbihzKSBhbG9uZSBvciBieSBjb21iaW5hdGlvbiBvZiB0aGVpciBDb250cmlidXRpb24ocykKKyAgIHdpdGggdGhlIFdvcmsgdG8gd2hpY2ggc3VjaCBDb250cmlidXRpb24ocykgd2FzIHN1Ym1pdHRlZC4gSWYgWW91CisgICBpbnN0aXR1dGUgcGF0ZW50IGxpdGlnYXRpb24gYWdhaW5zdCBhbnkgZW50aXR5IChpbmNsdWRpbmcgYQorICAgY3Jvc3MtY2xhaW0gb3IgY291bnRlcmNsYWltIGluIGEgbGF3c3VpdCkgYWxsZWdpbmcgdGhhdCB0aGUgV29yaworICAgb3IgYSBDb250cmlidXRpb24gaW5jb3Jwb3JhdGVkIHdpdGhpbiB0aGUgV29yayBjb25zdGl0dXRlcyBkaXJlY3QKKyAgIG9yIGNvbnRyaWJ1dG9yeSBwYXRlbnQgaW5mcmluZ2VtZW50LCB0aGVuIGFueSBwYXRlbnQgbGljZW5zZXMKKyAgIGdyYW50ZWQgdG8gWW91IHVuZGVyIHRoaXMgTGljZW5zZSBmb3IgdGhhdCBXb3JrIHNoYWxsIHRlcm1pbmF0ZQorICAgYXMgb2YgdGhlIGRhdGUgc3VjaCBsaXRpZ2F0aW9uIGlzIGZpbGVkLgorCis0LiBSZWRpc3RyaWJ1dGlvbi4gWW91IG1heSByZXByb2R1Y2UgYW5kIGRpc3RyaWJ1dGUgY29waWVzIG9mIHRoZQorICAgV29yayBvciBEZXJpdmF0aXZlIFdvcmtzIHRoZXJlb2YgaW4gYW55IG1lZGl1bSwgd2l0aCBvciB3aXRob3V0CisgICBtb2RpZmljYXRpb25zLCBhbmQgaW4gU291cmNlIG9yIE9iamVjdCBmb3JtLCBwcm92aWRlZCB0aGF0IFlvdQorICAgbWVldCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnM6CisKKyAgIChhKSBZb3UgbXVzdCBnaXZlIGFueSBvdGhlciByZWNpcGllbnRzIG9mIHRoZSBXb3JrIG9yCisgICAgICAgRGVyaXZhdGl2ZSBXb3JrcyBhIGNvcHkgb2YgdGhpcyBMaWNlbnNlOyBhbmQKKworICAgKGIpIFlvdSBtdXN0IGNhdXNlIGFueSBtb2RpZmllZCBmaWxlcyB0byBjYXJyeSBwcm9taW5lbnQgbm90aWNlcworICAgICAgIHN0YXRpbmcgdGhhdCBZb3UgY2hhbmdlZCB0aGUgZmlsZXM7IGFuZAorCisgICAoYykgWW91IG11c3QgcmV0YWluLCBpbiB0aGUgU291cmNlIGZvcm0gb2YgYW55IERlcml2YXRpdmUgV29ya3MKKyAgICAgICB0aGF0IFlvdSBkaXN0cmlidXRlLCBhbGwgY29weXJpZ2h0LCBwYXRlbnQsIHRyYWRlbWFyaywgYW5kCisgICAgICAgYXR0cmlidXRpb24gbm90aWNlcyBmcm9tIHRoZSBTb3VyY2UgZm9ybSBvZiB0aGUgV29yaywKKyAgICAgICBleGNsdWRpbmcgdGhvc2Ugbm90aWNlcyB0aGF0IGRvIG5vdCBwZXJ0YWluIHRvIGFueSBwYXJ0IG9mCisgICAgICAgdGhlIERlcml2YXRpdmUgV29ya3M7IGFuZAorCisgICAoZCkgSWYgdGhlIFdvcmsgaW5jbHVkZXMgYSAiTk9USUNFIiB0ZXh0IGZpbGUgYXMgcGFydCBvZiBpdHMKKyAgICAgICBkaXN0cmlidXRpb24sIHRoZW4gYW55IERlcml2YXRpdmUgV29ya3MgdGhhdCBZb3UgZGlzdHJpYnV0ZSBtdXN0CisgICAgICAgaW5jbHVkZSBhIHJlYWRhYmxlIGNvcHkgb2YgdGhlIGF0dHJpYnV0aW9uIG5vdGljZXMgY29udGFpbmVkCisgICAgICAgd2l0aGluIHN1Y2ggTk9USUNFIGZpbGUsIGV4Y2x1ZGluZyB0aG9zZSBub3RpY2VzIHRoYXQgZG8gbm90CisgICAgICAgcGVydGFpbiB0byBhbnkgcGFydCBvZiB0aGUgRGVyaXZhdGl2ZSBXb3JrcywgaW4gYXQgbGVhc3Qgb25lCisgICAgICAgb2YgdGhlIGZvbGxvd2luZyBwbGFjZXM6IHdpdGhpbiBhIE5PVElDRSB0ZXh0IGZpbGUgZGlzdHJpYnV0ZWQKKyAgICAgICBhcyBwYXJ0IG9mIHRoZSBEZXJpdmF0aXZlIFdvcmtzOyB3aXRoaW4gdGhlIFNvdXJjZSBmb3JtIG9yCisgICAgICAgZG9jdW1lbnRhdGlvbiwgaWYgcHJvdmlkZWQgYWxvbmcgd2l0aCB0aGUgRGVyaXZhdGl2ZSBXb3Jrczsgb3IsCisgICAgICAgd2l0aGluIGEgZGlzcGxheSBnZW5lcmF0ZWQgYnkgdGhlIERlcml2YXRpdmUgV29ya3MsIGlmIGFuZAorICAgICAgIHdoZXJldmVyIHN1Y2ggdGhpcmQtcGFydHkgbm90aWNlcyBub3JtYWxseSBhcHBlYXIuIFRoZSBjb250ZW50cworICAgICAgIG9mIHRoZSBOT1RJQ0UgZmlsZSBhcmUgZm9yIGluZm9ybWF0aW9uYWwgcHVycG9zZXMgb25seSBhbmQKKyAgICAgICBkbyBub3QgbW9kaWZ5IHRoZSBMaWNlbnNlLiBZb3UgbWF5IGFkZCBZb3VyIG93biBhdHRyaWJ1dGlvbgorICAgICAgIG5vdGljZXMgd2l0aGluIERlcml2YXRpdmUgV29ya3MgdGhhdCBZb3UgZGlzdHJpYnV0ZSwgYWxvbmdzaWRlCisgICAgICAgb3IgYXMgYW4gYWRkZW5kdW0gdG8gdGhlIE5PVElDRSB0ZXh0IGZyb20gdGhlIFdvcmssIHByb3ZpZGVkCisgICAgICAgdGhhdCBzdWNoIGFkZGl0aW9uYWwgYXR0cmlidXRpb24gbm90aWNlcyBjYW5ub3QgYmUgY29uc3RydWVkCisgICAgICAgYXMgbW9kaWZ5aW5nIHRoZSBMaWNlbnNlLgorCisgICBZb3UgbWF5IGFkZCBZb3VyIG93biBjb3B5cmlnaHQgc3RhdGVtZW50IHRvIFlvdXIgbW9kaWZpY2F0aW9ucyBhbmQKKyAgIG1heSBwcm92aWRlIGFkZGl0aW9uYWwgb3IgZGlmZmVyZW50IGxpY2Vuc2UgdGVybXMgYW5kIGNvbmRpdGlvbnMKKyAgIGZvciB1c2UsIHJlcHJvZHVjdGlvbiwgb3IgZGlzdHJpYnV0aW9uIG9mIFlvdXIgbW9kaWZpY2F0aW9ucywgb3IKKyAgIGZvciBhbnkgc3VjaCBEZXJpdmF0aXZlIFdvcmtzIGFzIGEgd2hvbGUsIHByb3ZpZGVkIFlvdXIgdXNlLAorICAgcmVwcm9kdWN0aW9uLCBhbmQgZGlzdHJpYnV0aW9uIG9mIHRoZSBXb3JrIG90aGVyd2lzZSBjb21wbGllcyB3aXRoCisgICB0aGUgY29uZGl0aW9ucyBzdGF0ZWQgaW4gdGhpcyBMaWNlbnNlLgorCis1LiBTdWJtaXNzaW9uIG9mIENvbnRyaWJ1dGlvbnMuIFVubGVzcyBZb3UgZXhwbGljaXRseSBzdGF0ZSBvdGhlcndpc2UsCisgICBhbnkgQ29udHJpYnV0aW9uIGludGVudGlvbmFsbHkgc3VibWl0dGVkIGZvciBpbmNsdXNpb24gaW4gdGhlIFdvcmsKKyAgIGJ5IFlvdSB0byB0aGUgTGljZW5zb3Igc2hhbGwgYmUgdW5kZXIgdGhlIHRlcm1zIGFuZCBjb25kaXRpb25zIG9mCisgICB0aGlzIExpY2Vuc2UsIHdpdGhvdXQgYW55IGFkZGl0aW9uYWwgdGVybXMgb3IgY29uZGl0aW9ucy4KKyAgIE5vdHdpdGhzdGFuZGluZyB0aGUgYWJvdmUsIG5vdGhpbmcgaGVyZWluIHNoYWxsIHN1cGVyc2VkZSBvciBtb2RpZnkKKyAgIHRoZSB0ZXJtcyBvZiBhbnkgc2VwYXJhdGUgbGljZW5zZSBhZ3JlZW1lbnQgeW91IG1heSBoYXZlIGV4ZWN1dGVkCisgICB3aXRoIExpY2Vuc29yIHJlZ2FyZGluZyBzdWNoIENvbnRyaWJ1dGlvbnMuCisKKzYuIFRyYWRlbWFya3MuIFRoaXMgTGljZW5zZSBkb2VzIG5vdCBncmFudCBwZXJtaXNzaW9uIHRvIHVzZSB0aGUgdHJhZGUKKyAgIG5hbWVzLCB0cmFkZW1hcmtzLCBzZXJ2aWNlIG1hcmtzLCBvciBwcm9kdWN0IG5hbWVzIG9mIHRoZSBMaWNlbnNvciwKKyAgIGV4Y2VwdCBhcyByZXF1aXJlZCBmb3IgcmVhc29uYWJsZSBhbmQgY3VzdG9tYXJ5IHVzZSBpbiBkZXNjcmliaW5nIHRoZQorICAgb3JpZ2luIG9mIHRoZSBXb3JrIGFuZCByZXByb2R1Y2luZyB0aGUgY29udGVudCBvZiB0aGUgTk9USUNFIGZpbGUuCisKKzcuIERpc2NsYWltZXIgb2YgV2FycmFudHkuIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvcgorICAgYWdyZWVkIHRvIGluIHdyaXRpbmcsIExpY2Vuc29yIHByb3ZpZGVzIHRoZSBXb3JrIChhbmQgZWFjaAorICAgQ29udHJpYnV0b3IgcHJvdmlkZXMgaXRzIENvbnRyaWJ1dGlvbnMpIG9uIGFuICJBUyBJUyIgQkFTSVMsCisgICBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IKKyAgIGltcGxpZWQsIGluY2x1ZGluZywgd2l0aG91dCBsaW1pdGF0aW9uLCBhbnkgd2FycmFudGllcyBvciBjb25kaXRpb25zCisgICBvZiBUSVRMRSwgTk9OLUlORlJJTkdFTUVOVCwgTUVSQ0hBTlRBQklMSVRZLCBvciBGSVRORVNTIEZPUiBBCisgICBQQVJUSUNVTEFSIFBVUlBPU0UuIFlvdSBhcmUgc29sZWx5IHJlc3BvbnNpYmxlIGZvciBkZXRlcm1pbmluZyB0aGUKKyAgIGFwcHJvcHJpYXRlbmVzcyBvZiB1c2luZyBvciByZWRpc3RyaWJ1dGluZyB0aGUgV29yayBhbmQgYXNzdW1lIGFueQorICAgcmlza3MgYXNzb2NpYXRlZCB3aXRoIFlvdXIgZXhlcmNpc2Ugb2YgcGVybWlzc2lvbnMgdW5kZXIgdGhpcyBMaWNlbnNlLgorCis4LiBMaW1pdGF0aW9uIG9mIExpYWJpbGl0eS4gSW4gbm8gZXZlbnQgYW5kIHVuZGVyIG5vIGxlZ2FsIHRoZW9yeSwKKyAgIHdoZXRoZXIgaW4gdG9ydCAoaW5jbHVkaW5nIG5lZ2xpZ2VuY2UpLCBjb250cmFjdCwgb3Igb3RoZXJ3aXNlLAorICAgdW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IChzdWNoIGFzIGRlbGliZXJhdGUgYW5kIGdyb3NzbHkKKyAgIG5lZ2xpZ2VudCBhY3RzKSBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc2hhbGwgYW55IENvbnRyaWJ1dG9yIGJlCisgICBsaWFibGUgdG8gWW91IGZvciBkYW1hZ2VzLCBpbmNsdWRpbmcgYW55IGRpcmVjdCwgaW5kaXJlY3QsIHNwZWNpYWwsCisgICBpbmNpZGVudGFsLCBvciBjb25zZXF1ZW50aWFsIGRhbWFnZXMgb2YgYW55IGNoYXJhY3RlciBhcmlzaW5nIGFzIGEKKyAgIHJlc3VsdCBvZiB0aGlzIExpY2Vuc2Ugb3Igb3V0IG9mIHRoZSB1c2Ugb3IgaW5hYmlsaXR5IHRvIHVzZSB0aGUKKyAgIFdvcmsgKGluY2x1ZGluZyBidXQgbm90IGxpbWl0ZWQgdG8gZGFtYWdlcyBmb3IgbG9zcyBvZiBnb29kd2lsbCwKKyAgIHdvcmsgc3RvcHBhZ2UsIGNvbXB1dGVyIGZhaWx1cmUgb3IgbWFsZnVuY3Rpb24sIG9yIGFueSBhbmQgYWxsCisgICBvdGhlciBjb21tZXJjaWFsIGRhbWFnZXMgb3IgbG9zc2VzKSwgZXZlbiBpZiBzdWNoIENvbnRyaWJ1dG9yCisgICBoYXMgYmVlbiBhZHZpc2VkIG9mIHRoZSBwb3NzaWJpbGl0eSBvZiBzdWNoIGRhbWFnZXMuCisKKzkuIEFjY2VwdGluZyBXYXJyYW50eSBvciBBZGRpdGlvbmFsIExpYWJpbGl0eS4gV2hpbGUgcmVkaXN0cmlidXRpbmcKKyAgIHRoZSBXb3JrIG9yIERlcml2YXRpdmUgV29ya3MgdGhlcmVvZiwgWW91IG1heSBjaG9vc2UgdG8gb2ZmZXIsCisgICBhbmQgY2hhcmdlIGEgZmVlIGZvciwgYWNjZXB0YW5jZSBvZiBzdXBwb3J0LCB3YXJyYW50eSwgaW5kZW1uaXR5LAorICAgb3Igb3RoZXIgbGlhYmlsaXR5IG9ibGlnYXRpb25zIGFuZC9vciByaWdodHMgY29uc2lzdGVudCB3aXRoIHRoaXMKKyAgIExpY2Vuc2UuIEhvd2V2ZXIsIGluIGFjY2VwdGluZyBzdWNoIG9ibGlnYXRpb25zLCBZb3UgbWF5IGFjdCBvbmx5CisgICBvbiBZb3VyIG93biBiZWhhbGYgYW5kIG9uIFlvdXIgc29sZSByZXNwb25zaWJpbGl0eSwgbm90IG9uIGJlaGFsZgorICAgb2YgYW55IG90aGVyIENvbnRyaWJ1dG9yLCBhbmQgb25seSBpZiBZb3UgYWdyZWUgdG8gaW5kZW1uaWZ5LAorICAgZGVmZW5kLCBhbmQgaG9sZCBlYWNoIENvbnRyaWJ1dG9yIGhhcm1sZXNzIGZvciBhbnkgbGlhYmlsaXR5CisgICBpbmN1cnJlZCBieSwgb3IgY2xhaW1zIGFzc2VydGVkIGFnYWluc3QsIHN1Y2ggQ29udHJpYnV0b3IgYnkgcmVhc29uCisgICBvZiB5b3VyIGFjY2VwdGluZyBhbnkgc3VjaCB3YXJyYW50eSBvciBhZGRpdGlvbmFsIGxpYWJpbGl0eS4KKworRU5EIE9GIFRFUk1TIEFORCBDT05ESVRJT05TCisKK0FQUEVORElYOiBIb3cgdG8gYXBwbHkgdGhlIEFwYWNoZSBMaWNlbnNlIHRvIHlvdXIgd29yay4KKworICAgVG8gYXBwbHkgdGhlIEFwYWNoZSBMaWNlbnNlIHRvIHlvdXIgd29yaywgYXR0YWNoIHRoZSBmb2xsb3dpbmcKKyAgIGJvaWxlcnBsYXRlIG5vdGljZSwgd2l0aCB0aGUgZmllbGRzIGVuY2xvc2VkIGJ5IGJyYWNrZXRzICJbXSIKKyAgIHJlcGxhY2VkIHdpdGggeW91ciBvd24gaWRlbnRpZnlpbmcgaW5mb3JtYXRpb24uIChEb24ndCBpbmNsdWRlCisgICB0aGUgYnJhY2tldHMhKSAgVGhlIHRleHQgc2hvdWxkIGJlIGVuY2xvc2VkIGluIHRoZSBhcHByb3ByaWF0ZQorICAgY29tbWVudCBzeW50YXggZm9yIHRoZSBmaWxlIGZvcm1hdC4gV2UgYWxzbyByZWNvbW1lbmQgdGhhdCBhCisgICBmaWxlIG9yIGNsYXNzIG5hbWUgYW5kIGRlc2NyaXB0aW9uIG9mIHB1cnBvc2UgYmUgaW5jbHVkZWQgb24gdGhlCisgICBzYW1lICJwcmludGVkIHBhZ2UiIGFzIHRoZSBjb3B5cmlnaHQgbm90aWNlIGZvciBlYXNpZXIKKyAgIGlkZW50aWZpY2F0aW9uIHdpdGhpbiB0aGlyZC1wYXJ0eSBhcmNoaXZlcy4KKworQ29weXJpZ2h0IFt5eXl5XSBbbmFtZSBvZiBjb3B5cmlnaHQgb3duZXJdCisKK0xpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworeW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisKKyAgICBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKworVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKK1dJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCmRpZmYgLS1naXQgYS9nZXJyaXQtcGx1Z2luLWd3dC1hcmNoZXR5cGUvc3JjL21haW4vcmVzb3VyY2VzL2FyY2hldHlwZS1yZXNvdXJjZXMvcG9tLnhtbCBiL2dlcnJpdC1wbHVnaW4tZ3d0LWFyY2hldHlwZS9zcmMvbWFpbi9yZXNvdXJjZXMvYXJjaGV0eXBlLXJlc291cmNlcy9wb20ueG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjM5MDRlMmIKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtcGx1Z2luLWd3dC1hcmNoZXR5cGUvc3JjL21haW4vcmVzb3VyY2VzL2FyY2hldHlwZS1yZXNvdXJjZXMvcG9tLnhtbApAQCAtMCwwICsxLDEzMSBAQAorPCEtLQorQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKworTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7Cit5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCitZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKworaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisKK1VubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKK2Rpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCitXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KK1NlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKK2xpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorLS0+Cis8cHJvamVjdCB4bWxucz0iaHR0cDovL21hdmVuLmFwYWNoZS5vcmcvUE9NLzQuMC4wIgorICB4bWxuczp4c2k9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hLWluc3RhbmNlIgorICB4c2k6c2NoZW1hTG9jYXRpb249Imh0dHA6Ly9tYXZlbi5hcGFjaGUub3JnL1BPTS80LjAuMCBodHRwOi8vbWF2ZW4uYXBhY2hlLm9yZy9tYXZlbi12NF8wXzAueHNkIj4KKyAgPG1vZGVsVmVyc2lvbj40LjAuMDwvbW9kZWxWZXJzaW9uPgorCisgIDxncm91cElkPiR7Z3JvdXBJZH08L2dyb3VwSWQ+CisgIDxhcnRpZmFjdElkPiR7YXJ0aWZhY3RJZH08L2FydGlmYWN0SWQ+CisgIDxwYWNrYWdpbmc+amFyPC9wYWNrYWdpbmc+CisgIDx2ZXJzaW9uPiR7dmVyc2lvbn08L3ZlcnNpb24+CisgIDxuYW1lPiR7cGx1Z2luTmFtZX08L25hbWU+CisKKyAgPHByb3BlcnRpZXM+CisgICAgPEdlcnJpdC1BcGlUeXBlPmV4dGVuc2lvbjwvR2Vycml0LUFwaVR5cGU+CisgICAgPEdlcnJpdC1BcGlWZXJzaW9uPiR7Z2Vycml0QXBpVmVyc2lvbn08L0dlcnJpdC1BcGlWZXJzaW9uPgorICA8L3Byb3BlcnRpZXM+CisKKyAgPGJ1aWxkPgorICAgIDxwbHVnaW5zPgorICAgICAgPHBsdWdpbj4KKyAgICAgICAgPGdyb3VwSWQ+b3JnLmFwYWNoZS5tYXZlbi5wbHVnaW5zPC9ncm91cElkPgorICAgICAgICA8YXJ0aWZhY3RJZD5tYXZlbi1qYXItcGx1Z2luPC9hcnRpZmFjdElkPgorICAgICAgICA8dmVyc2lvbj4yLjQ8L3ZlcnNpb24+CisgICAgICAgIDxjb25maWd1cmF0aW9uPgorICAgICAgICAgIDxpbmNsdWRlcz4KKyAgICAgICAgICAgIDxpbmNsdWRlPioqLyouKjwvaW5jbHVkZT4KKyAgICAgICAgICA8L2luY2x1ZGVzPgorICAgICAgICAgIDxhcmNoaXZlPgorICAgICAgICAgICAgPG1hbmlmZXN0RW50cmllcz4KKyAgICAgICAgICAgICAgPEdlcnJpdC1Nb2R1bGU+JHtwYWNrYWdlfS5Nb2R1bGU8L0dlcnJpdC1Nb2R1bGU+CisKKyAgICAgICAgICAgICAgPEltcGxlbWVudGF0aW9uLVZlbmRvcj4ke0ltcGxlbWVudGF0aW9uLVZlbmRvcn08L0ltcGxlbWVudGF0aW9uLVZlbmRvcj4KKyAgICAgICAgICAgICAgPEltcGxlbWVudGF0aW9uLVVSTD4ke0ltcGxlbWVudGF0aW9uLVVybH08L0ltcGxlbWVudGF0aW9uLVVSTD4KKworICAgICAgICAgICAgICA8SW1wbGVtZW50YXRpb24tVGl0bGU+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+CmRpZmYgLS1naXQgYS9nZXJyaXQtcGx1Z2luLWd3dC1hcmNoZXR5cGUvc3JjL21haW4vcmVzb3VyY2VzL2FyY2hldHlwZS1yZXNvdXJjZXMvc3JjL21haW4vamF2YS9Nb2R1bGUuamF2YSBiL2dlcnJpdC1wbHVnaW4tZ3d0LWFyY2hldHlwZS9zcmMvbWFpbi9yZXNvdXJjZXMvYXJjaGV0eXBlLXJlc291cmNlcy9zcmMvbWFpbi9qYXZhL01vZHVsZS5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmQ0MjU0NWEKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtcGx1Z2luLWd3dC1hcmNoZXR5cGUvc3JjL21haW4vcmVzb3VyY2VzL2FyY2hldHlwZS1yZXNvdXJjZXMvc3JjL21haW4vamF2YS9Nb2R1bGUuamF2YQpAQCAtMCwwICsxLDI2IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgR29vZ2xlCisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSAke3BhY2thZ2V9OworCitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuQWJzdHJhY3RNb2R1bGU7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy53ZWJ1aS5XZWJVaVBsdWdpbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLndlYnVpLkd3dFBsdWdpbjsKKworY2xhc3MgTW9kdWxlIGV4dGVuZHMgQWJzdHJhY3RNb2R1bGUgeworICBAT3ZlcnJpZGUKKyAgcHJvdGVjdGVkIHZvaWQgY29uZmlndXJlKCkgeworICAgIGJpbmQoV2ViVWlQbHVnaW4uY2xhc3MpLnRvSW5zdGFuY2UobmV3IEd3dFBsdWdpbigiaGVsbG9fZ3d0X3BsdWdpbnMiKSk7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1wbHVnaW4tZ3d0LWFyY2hldHlwZS9zcmMvbWFpbi9yZXNvdXJjZXMvYXJjaGV0eXBlLXJlc291cmNlcy9zcmMvbWFpbi9qYXZhL2NsaWVudC9IZWxsb1BsdWdpbnMuamF2YSBiL2dlcnJpdC1wbHVnaW4tZ3d0LWFyY2hldHlwZS9zcmMvbWFpbi9yZXNvdXJjZXMvYXJjaGV0eXBlLXJlc291cmNlcy9zcmMvbWFpbi9qYXZhL2NsaWVudC9IZWxsb1BsdWdpbnMuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi41NTg0ZDg1Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXBsdWdpbi1nd3QtYXJjaGV0eXBlL3NyYy9tYWluL3Jlc291cmNlcy9hcmNoZXR5cGUtcmVzb3VyY2VzL3NyYy9tYWluL2phdmEvY2xpZW50L0hlbGxvUGx1Z2lucy5qYXZhCkBAIC0wLDAgKzEsNzIgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBHb29nbGUgSW5jCisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSAke3BhY2thZ2V9LmNsaWVudDsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5QbHVnaW47CitpbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuZG9tLmNsaWVudC5DbGlja0V2ZW50OworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LmRvbS5jbGllbnQuQ2xpY2tIYW5kbGVyOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkJ1dHRvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5EaWFsb2dCb3g7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuSW1hZ2U7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuUm9vdFBhbmVsOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLlZlcnRpY2FsUGFuZWw7CisKKy8qKgorICogSGVsbG9Xb3JsZCBQbHVnaW5zLgorICovCitwdWJsaWMgY2xhc3MgSGVsbG9QbHVnaW5zIGV4dGVuZHMgUGx1Z2luIHsKKworICBAT3ZlcnJpZGUKKyAgcHVibGljIHZvaWQgb25Nb2R1bGVMb2FkKCkgeworICAgIEltYWdlIGltZyA9IG5ldyBJbWFnZSgiaHR0cDovL2NvZGUuZ29vZ2xlLmNvbS93ZWJ0b29sa2l0L2xvZ28tMTg1eDE3NS5wbmciKTsKKyAgICBCdXR0b24gYnV0dG9uID0gbmV3IEJ1dHRvbigiQ2xpY2sgbWUiKTsKKworICAgIFZlcnRpY2FsUGFuZWwgdlBhbmVsID0gbmV3IFZlcnRpY2FsUGFuZWwoKTsKKyAgICB2UGFuZWwuc2V0V2lkdGgoIjEwMCUiKTsKKyAgICB2UGFuZWwuc2V0SG9yaXpvbnRhbEFsaWdubWVudChWZXJ0aWNhbFBhbmVsLkFMSUdOX0NFTlRFUik7CisgICAgdlBhbmVsLmFkZChpbWcpOworICAgIHZQYW5lbC5hZGQoYnV0dG9uKTsKKworICAgIFJvb3RQYW5lbC5nZXQoKS5hZGQodlBhbmVsKTsKKworICAgIC8vIENyZWF0ZSB0aGUgZGlhbG9nIGJveAorICAgIGZpbmFsIERpYWxvZ0JveCBkaWFsb2dCb3ggPSBuZXcgRGlhbG9nQm94KCk7CisKKyAgICAvLyBUaGUgY29udGVudCBvZiB0aGUgZGlhbG9nIGNvbWVzIGZyb20gYSBVc2VyIHNwZWNpZmllZCBQcmVmZXJlbmNlCisgICAgZGlhbG9nQm94LnNldFRleHQoIkhlbGxvIGZyb20gR1dUIEdlcnJpdCBVSSBwbHVnaW4iKTsKKyAgICBkaWFsb2dCb3guc2V0QW5pbWF0aW9uRW5hYmxlZCh0cnVlKTsKKyAgICBCdXR0b24gY2xvc2VCdXR0b24gPSBuZXcgQnV0dG9uKCJDbG9zZSIpOworICAgIFZlcnRpY2FsUGFuZWwgZGlhbG9nVlBhbmVsID0gbmV3IFZlcnRpY2FsUGFuZWwoKTsKKyAgICBkaWFsb2dWUGFuZWwuc2V0V2lkdGgoIjEwMCUiKTsKKyAgICBkaWFsb2dWUGFuZWwuc2V0SG9yaXpvbnRhbEFsaWdubWVudChWZXJ0aWNhbFBhbmVsLkFMSUdOX0NFTlRFUik7CisgICAgZGlhbG9nVlBhbmVsLmFkZChjbG9zZUJ1dHRvbik7CisKKyAgICBjbG9zZUJ1dHRvbi5hZGRDbGlja0hhbmRsZXIobmV3IENsaWNrSGFuZGxlcigpIHsKKyAgICAgIHB1YmxpYyB2b2lkIG9uQ2xpY2soQ2xpY2tFdmVudCBldmVudCkgeworICAgICAgICBkaWFsb2dCb3guaGlkZSgpOworICAgICAgfQorICAgIH0pOworCisgICAgLy8gU2V0IHRoZSBjb250ZW50cyBvZiB0aGUgV2lkZ2V0CisgICAgZGlhbG9nQm94LnNldFdpZGdldChkaWFsb2dWUGFuZWwpOworCisgICAgYnV0dG9uLmFkZENsaWNrSGFuZGxlcihuZXcgQ2xpY2tIYW5kbGVyKCkgeworICAgICAgcHVibGljIHZvaWQgb25DbGljayhDbGlja0V2ZW50IGV2ZW50KSB7CisgICAgICAgIGRpYWxvZ0JveC5jZW50ZXIoKTsKKyAgICAgICAgZGlhbG9nQm94LnNob3coKTsKKyAgICAgIH0KKyAgICB9KTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXBsdWdpbi1nd3QtYXJjaGV0eXBlL3NyYy9tYWluL3Jlc291cmNlcy9hcmNoZXR5cGUtcmVzb3VyY2VzL3NyYy9tYWluL2phdmEvcHVibGljL2d3dC1oZWxsby1nYWRnZXRzLWlnb29nbGUtdGh1bWIucG5nIGIvZ2Vycml0LXBsdWdpbi1nd3QtYXJjaGV0eXBlL3NyYy9tYWluL3Jlc291cmNlcy9hcmNoZXR5cGUtcmVzb3VyY2VzL3NyYy9tYWluL2phdmEvcHVibGljL2d3dC1oZWxsby1nYWRnZXRzLWlnb29nbGUtdGh1bWIucG5nCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmU5NzA3NzQKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtcGx1Z2luLWd3dC1hcmNoZXR5cGUvc3JjL21haW4vcmVzb3VyY2VzL2FyY2hldHlwZS1yZXNvdXJjZXMvc3JjL21haW4vamF2YS9wdWJsaWMvZ3d0LWhlbGxvLWdhZGdldHMtaWdvb2dsZS10aHVtYi5wbmcKQmluYXJ5IGZpbGVzIGRpZmZlcgpkaWZmIC0tZ2l0IGEvZ2Vycml0LXBsdWdpbi1nd3QtYXJjaGV0eXBlL3NyYy9tYWluL3Jlc291cmNlcy9hcmNoZXR5cGUtcmVzb3VyY2VzL3NyYy9tYWluL2phdmEvcHVibGljL2d3dC1oZWxsby1nYWRnZXRzLWlnb29nbGUucG5nIGIvZ2Vycml0LXBsdWdpbi1nd3QtYXJjaGV0eXBlL3NyYy9tYWluL3Jlc291cmNlcy9hcmNoZXR5cGUtcmVzb3VyY2VzL3NyYy9tYWluL2phdmEvcHVibGljL2d3dC1oZWxsby1nYWRnZXRzLWlnb29nbGUucG5nCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmMwNDExNDkKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtcGx1Z2luLWd3dC1hcmNoZXR5cGUvc3JjL21haW4vcmVzb3VyY2VzL2FyY2hldHlwZS1yZXNvdXJjZXMvc3JjL21haW4vamF2YS9wdWJsaWMvZ3d0LWhlbGxvLWdhZGdldHMtaWdvb2dsZS5wbmcKQmluYXJ5IGZpbGVzIGRpZmZlcgpkaWZmIC0tZ2l0IGEvZ2Vycml0LXBsdWdpbi1nd3QtYXJjaGV0eXBlL3NyYy9tYWluL3Jlc291cmNlcy9hcmNoZXR5cGUtcmVzb3VyY2VzL3NyYy9tYWluL2phdmEvcHVibGljL2hlbGxvLmNzcyBiL2dlcnJpdC1wbHVnaW4tZ3d0LWFyY2hldHlwZS9zcmMvbWFpbi9yZXNvdXJjZXMvYXJjaGV0eXBlLXJlc291cmNlcy9zcmMvbWFpbi9qYXZhL3B1YmxpYy9oZWxsby5jc3MKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYTg4MDU5ZAotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1wbHVnaW4tZ3d0LWFyY2hldHlwZS9zcmMvbWFpbi9yZXNvdXJjZXMvYXJjaGV0eXBlLXJlc291cmNlcy9zcmMvbWFpbi9qYXZhL3B1YmxpYy9oZWxsby5jc3MKQEAgLTAsMCArMSwxMDMgQEAKKy8qKgorICogVGhlIGZpbGUgY29udGFpbnMgc3R5bGVzIGZvciBhIHNhbXBsZSBwbHVnaW4gZGVyaXZlZCBmcm9tIHRoZQorICogR1dUIHN0YW5kYXJkIHRoZW1lLgorICogSW1hZ2VzIGluIHRoZSBzdHlsZXNoZWV0IGhhdmUgYmVlbiByZW1vdmVkLCBhcyB3ZWxsIGFzIHN0eWxlcyBmb3Igd2lkZ2V0cworICogbm90IGN1cnJlbnRseSBpbiB1c2UuCisgKi8KKworYm9keSwgdGFibGUgdGQsIHNlbGVjdCB7CisgIGZvbnQtZmFtaWx5OiBBcmlhbCBVbmljb2RlIE1TLCBBcmlhbCwgc2Fucy1zZXJpZjsKKyAgZm9udC1zaXplOiBzbWFsbDsKK30KK3ByZSB7CisgIGZvbnQtZmFtaWx5OiAiY291cmllciBuZXciLCBjb3VyaWVyOworICBmb250LXNpemU6IHNtYWxsOworfQorYm9keSB7CisgIGNvbG9yOiBibGFjazsKKyAgbWFyZ2luOiAwcHg7CisgIGJvcmRlcjogMHB4OworICBwYWRkaW5nOiAwcHg7CisgIGJhY2tncm91bmQ6ICNmZmY7CisgIGRpcmVjdGlvbjogbHRyOworfQorYSwgYTp2aXNpdGVkLCBhOmhvdmVyIHsKKyAgY29sb3I6ICMwMDAwQUE7Cit9CisKKy8qKgorICogVGhlIHJlZmVyZW5jZSB0aGVtZSBjYW4gYmUgdXNlZCB0byBkZXRlcm1pbmUgd2hlbiB0aGlzIHN0eWxlIHNoZWV0IGhhcworICogbG9hZGVkLiAgQ3JlYXRlIGEgaGlkZGVuIGRpdiBlbGVtZW50IHdpdGggYWJzb2x1dGUgcG9zaXRpb24sIGFzc2lnbiB0aGUgc3R5bGUKKyAqIG5hbWUgYmVsb3csIGFuZCBhdHRhY2ggaXQgdG8gdGhlIERPTS4gIFVzZSBhIHRpbWVyIHRvIGRldGVjdCB3aGVuIHRoZQorICogZWxlbWVudCdzIGhlaWdodCBhbmQgd2lkdGggYXJlIHNldCB0byA1cHguCisgKi8KKy5nd3QtUmVmZXJlbmNlLXN0YW5kYXJkIHsKKyAgaGVpZ2h0OiA1cHg7CisgIHdpZHRoOiA1cHg7CisgIHpvb206IDE7Cit9CisKKy5nd3QtQnV0dG9uIHsKKyAgbWFyZ2luOiAwOworICBwYWRkaW5nOiAzcHggNXB4OworICB0ZXh0LWRlY29yYXRpb246IG5vbmU7CisgIGZvbnQtc2l6ZTogc21hbGw7CisgIGN1cnNvcjogcG9pbnRlcjsKKyAgY3Vyc29yOiBoYW5kOworICBib3JkZXI6IDFweCBvdXRzZXQgI2NjYzsKK30KKy5nd3QtQnV0dG9uOmFjdGl2ZSB7CisgIGJvcmRlcjogMXB4IGluc2V0ICNjY2M7Cit9CisuZ3d0LUJ1dHRvbjpob3ZlciB7CisgIGJvcmRlci1jb2xvcjogIzljZiAjNjllICM2OWUgIzdhZjsKK30KKy5nd3QtQnV0dG9uW2Rpc2FibGVkXSB7CisgIGN1cnNvcjogZGVmYXVsdDsKKyAgY29sb3I6ICM4ODg7Cit9CisuZ3d0LUJ1dHRvbltkaXNhYmxlZF06aG92ZXIgeworICBib3JkZXI6IDFweCBvdXRzZXQgI2NjYzsKK30KKworLmd3dC1EaWFsb2dCb3ggLkNhcHRpb24geworICBiYWNrZ3JvdW5kOiAjZTNlOGYzOworICBwYWRkaW5nOiA0cHggNHB4IDRweCA4cHg7CisgIGN1cnNvcjogZGVmYXVsdDsKKyAgYm9yZGVyLWJvdHRvbTogMXB4IHNvbGlkICNiYmJiYmI7CisgIGJvcmRlci10b3A6IDVweCBzb2xpZCAjZDBlNGY2OworICBib3JkZXItbGVmdDogNXB4IHNvbGlkICNkMGU0ZjY7CisgIGJvcmRlci1yaWdodDogNXB4IHNvbGlkICNkMGU0ZjY7Cit9CisKKy5nd3QtRGlhbG9nQm94IC5kaWFsb2dDb250ZW50IHsKK30KKworLmd3dC1EaWFsb2dCb3ggLmRpYWxvZ01pZGRsZUNlbnRlciB7CisgIHBhZGRpbmc6IDNweDsKKyAgYmFja2dyb3VuZDogd2hpdGU7CisgIGJvcmRlci1sZWZ0OiA1cHggc29saWQgI2QwZTRmNjsKKyAgYm9yZGVyLXJpZ2h0OiA1cHggc29saWQgI2QwZTRmNjsKKyAgYm9yZGVyLWJvdHRvbTogNXB4IHNvbGlkICNkMGU0ZjY7Cit9CisKKy5nd3QtRGlhbG9nQm94IC5kaWFsb2dUb3BMZWZ0SW5uZXIgeworICB3aWR0aDogNXB4OworICB6b29tOiAxOworfQorLmd3dC1EaWFsb2dCb3ggLmRpYWxvZ1RvcFJpZ2h0SW5uZXIgeworICB3aWR0aDogOHB4OworICB6b29tOiAxOworfQorLmd3dC1EaWFsb2dCb3ggLmRpYWxvZ0JvdHRvbUxlZnRJbm5lciB7CisgIHdpZHRoOiA1cHg7CisgIGhlaWdodDogOHB4OworICB6b29tOiAxOworfQorCisuZ3d0LURpYWxvZ0JveCAuZGlhbG9nQm90dG9tUmlnaHRJbm5lciB7CisgIHdpZHRoOiA1cHg7CisgIGhlaWdodDogOHB4OworICB6b29tOiAxOworfQorCmRpZmYgLS1naXQgYS9nZXJyaXQtcGx1Z2luLWd3dHVpLy5naXRpZ25vcmUgYi9nZXJyaXQtcGx1Z2luLWd3dHVpLy5naXRpZ25vcmUKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMmRjZjFlZAotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1wbHVnaW4tZ3d0dWkvLmdpdGlnbm9yZQpAQCAtMCwwICsxLDYgQEAKKy90YXJnZXQKKy8uY2xhc3NwYXRoCisvLnByb2plY3QKKy8uc2V0dGluZ3Mvb3JnLm1hdmVuLmlkZS5lY2xpcHNlLnByZWZzCisvLnNldHRpbmdzL29yZy5lY2xpcHNlLm0yZS5jb3JlLnByZWZzCisvZ2Vycml0LWd3dHVpLXBsdWdpbi5pbWwKZGlmZiAtLWdpdCBhL2dlcnJpdC1wbHVnaW4tZ3d0dWkvLnNldHRpbmdzL29yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLnByZWZzIGIvZ2Vycml0LXBsdWdpbi1nd3R1aS8uc2V0dGluZ3Mvb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMucHJlZnMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uODM5ZDY0NwotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1wbHVnaW4tZ3d0dWkvLnNldHRpbmdzL29yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLnByZWZzCkBAIC0wLDAgKzEsNSBAQAorZWNsaXBzZS5wcmVmZXJlbmNlcy52ZXJzaW9uPTEKK2VuY29kaW5nLy9zcmMvbWFpbi9qYXZhPVVURi04CitlbmNvZGluZy8vc3JjL21haW4vcmVzb3VyY2VzPVVURi04CitlbmNvZGluZy8vc3JjL3Rlc3QvamF2YT1VVEYtOAorZW5jb2RpbmcvPHByb2plY3Q+PVVURi04CmRpZmYgLS1naXQgYS9nZXJyaXQtcGx1Z2luLWd3dHVpLy5zZXR0aW5ncy9vcmcuZWNsaXBzZS5qZHQuY29yZS5wcmVmcyBiL2dlcnJpdC1wbHVnaW4tZ3d0dWkvLnNldHRpbmdzL29yZy5lY2xpcHNlLmpkdC5jb3JlLnByZWZzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjk1NWUyMDgKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtcGx1Z2luLWd3dHVpLy5zZXR0aW5ncy9vcmcuZWNsaXBzZS5qZHQuY29yZS5wcmVmcwpAQCAtMCwwICsxLDI5NSBAQAorZWNsaXBzZS5wcmVmZXJlbmNlcy52ZXJzaW9uPTEKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvZGVDb21wbGV0ZS5hcmd1bWVudFByZWZpeGVzPQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29kZUNvbXBsZXRlLmFyZ3VtZW50U3VmZml4ZXM9CitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb2RlQ29tcGxldGUuZmllbGRQcmVmaXhlcz0KK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvZGVDb21wbGV0ZS5maWVsZFN1ZmZpeGVzPQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29kZUNvbXBsZXRlLmxvY2FsUHJlZml4ZXM9CitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb2RlQ29tcGxldGUubG9jYWxTdWZmaXhlcz0KK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvZGVDb21wbGV0ZS5zdGF0aWNGaWVsZFByZWZpeGVzPQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29kZUNvbXBsZXRlLnN0YXRpY0ZpZWxkU3VmZml4ZXM9CitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb2RlQ29tcGxldGUuc3RhdGljRmluYWxGaWVsZFByZWZpeGVzPQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29kZUNvbXBsZXRlLnN0YXRpY0ZpbmFsRmllbGRTdWZmaXhlcz0KK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmNvZGVnZW4udGFyZ2V0UGxhdGZvcm09MS42CitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5jb21wbGlhbmNlPTEuNgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5mb3JiaWRkZW5SZWZlcmVuY2U9d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuc291cmNlPTEuNgorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmFsaWduX3R5cGVfbWVtYmVyc19vbl9jb2x1bW5zPWZhbHNlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuYWxpZ25tZW50X2Zvcl9hcmd1bWVudHNfaW5fYWxsb2NhdGlvbl9leHByZXNzaW9uPTE2CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuYWxpZ25tZW50X2Zvcl9hcmd1bWVudHNfaW5fYW5ub3RhdGlvbj0wCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuYWxpZ25tZW50X2Zvcl9hcmd1bWVudHNfaW5fZW51bV9jb25zdGFudD0xNgorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmFsaWdubWVudF9mb3JfYXJndW1lbnRzX2luX2V4cGxpY2l0X2NvbnN0cnVjdG9yX2NhbGw9MTYKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5hbGlnbm1lbnRfZm9yX2FyZ3VtZW50c19pbl9tZXRob2RfaW52b2NhdGlvbj0xNgorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmFsaWdubWVudF9mb3JfYXJndW1lbnRzX2luX3F1YWxpZmllZF9hbGxvY2F0aW9uX2V4cHJlc3Npb249MTYKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5hbGlnbm1lbnRfZm9yX2Fzc2lnbm1lbnQ9MTYKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5hbGlnbm1lbnRfZm9yX2JpbmFyeV9leHByZXNzaW9uPTE2CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuYWxpZ25tZW50X2Zvcl9jb21wYWN0X2lmPTE2CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuYWxpZ25tZW50X2Zvcl9jb25kaXRpb25hbF9leHByZXNzaW9uPTE2CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuYWxpZ25tZW50X2Zvcl9lbnVtX2NvbnN0YW50cz0xNgorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmFsaWdubWVudF9mb3JfZXhwcmVzc2lvbnNfaW5fYXJyYXlfaW5pdGlhbGl6ZXI9MTYKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5hbGlnbm1lbnRfZm9yX21ldGhvZF9kZWNsYXJhdGlvbj0wCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuYWxpZ25tZW50X2Zvcl9tdWx0aXBsZV9maWVsZHM9MTYKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5hbGlnbm1lbnRfZm9yX3BhcmFtZXRlcnNfaW5fY29uc3RydWN0b3JfZGVjbGFyYXRpb249MTYKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5hbGlnbm1lbnRfZm9yX3BhcmFtZXRlcnNfaW5fbWV0aG9kX2RlY2xhcmF0aW9uPTE2CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuYWxpZ25tZW50X2Zvcl9yZXNvdXJjZXNfaW5fdHJ5PTgwCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuYWxpZ25tZW50X2Zvcl9zZWxlY3Rvcl9pbl9tZXRob2RfaW52b2NhdGlvbj0xNgorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmFsaWdubWVudF9mb3Jfc3VwZXJjbGFzc19pbl90eXBlX2RlY2xhcmF0aW9uPTE2CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuYWxpZ25tZW50X2Zvcl9zdXBlcmludGVyZmFjZXNfaW5fZW51bV9kZWNsYXJhdGlvbj0xNgorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmFsaWdubWVudF9mb3Jfc3VwZXJpbnRlcmZhY2VzX2luX3R5cGVfZGVjbGFyYXRpb249MTYKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5hbGlnbm1lbnRfZm9yX3Rocm93c19jbGF1c2VfaW5fY29uc3RydWN0b3JfZGVjbGFyYXRpb249MTYKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5hbGlnbm1lbnRfZm9yX3Rocm93c19jbGF1c2VfaW5fbWV0aG9kX2RlY2xhcmF0aW9uPTE2CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuYWxpZ25tZW50X2Zvcl91bmlvbl90eXBlX2luX211bHRpY2F0Y2g9MTYKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5ibGFua19saW5lc19hZnRlcl9pbXBvcnRzPTEKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5ibGFua19saW5lc19hZnRlcl9wYWNrYWdlPTEKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5ibGFua19saW5lc19iZWZvcmVfZmllbGQ9MAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmJsYW5rX2xpbmVzX2JlZm9yZV9maXJzdF9jbGFzc19ib2R5X2RlY2xhcmF0aW9uPTAKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5ibGFua19saW5lc19iZWZvcmVfaW1wb3J0cz0wCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuYmxhbmtfbGluZXNfYmVmb3JlX21lbWJlcl90eXBlPTAKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5ibGFua19saW5lc19iZWZvcmVfbWV0aG9kPTEKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5ibGFua19saW5lc19iZWZvcmVfbmV3X2NodW5rPTEKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5ibGFua19saW5lc19iZWZvcmVfcGFja2FnZT0wCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuYmxhbmtfbGluZXNfYmV0d2Vlbl9pbXBvcnRfZ3JvdXBzPTEKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5ibGFua19saW5lc19iZXR3ZWVuX3R5cGVfZGVjbGFyYXRpb25zPTIKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5icmFjZV9wb3NpdGlvbl9mb3JfYW5ub3RhdGlvbl90eXBlX2RlY2xhcmF0aW9uPWVuZF9vZl9saW5lCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuYnJhY2VfcG9zaXRpb25fZm9yX2Fub255bW91c190eXBlX2RlY2xhcmF0aW9uPWVuZF9vZl9saW5lCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuYnJhY2VfcG9zaXRpb25fZm9yX2FycmF5X2luaXRpYWxpemVyPWVuZF9vZl9saW5lCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuYnJhY2VfcG9zaXRpb25fZm9yX2Jsb2NrPWVuZF9vZl9saW5lCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuYnJhY2VfcG9zaXRpb25fZm9yX2Jsb2NrX2luX2Nhc2U9ZW5kX29mX2xpbmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5icmFjZV9wb3NpdGlvbl9mb3JfY29uc3RydWN0b3JfZGVjbGFyYXRpb249ZW5kX29mX2xpbmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5icmFjZV9wb3NpdGlvbl9mb3JfZW51bV9jb25zdGFudD1lbmRfb2ZfbGluZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmJyYWNlX3Bvc2l0aW9uX2Zvcl9lbnVtX2RlY2xhcmF0aW9uPWVuZF9vZl9saW5lCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuYnJhY2VfcG9zaXRpb25fZm9yX21ldGhvZF9kZWNsYXJhdGlvbj1lbmRfb2ZfbGluZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmJyYWNlX3Bvc2l0aW9uX2Zvcl9zd2l0Y2g9ZW5kX29mX2xpbmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5icmFjZV9wb3NpdGlvbl9mb3JfdHlwZV9kZWNsYXJhdGlvbj1lbmRfb2ZfbGluZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmNvbW1lbnQuY2xlYXJfYmxhbmtfbGluZXNfaW5fYmxvY2tfY29tbWVudD1mYWxzZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmNvbW1lbnQuY2xlYXJfYmxhbmtfbGluZXNfaW5famF2YWRvY19jb21tZW50PWZhbHNlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuY29tbWVudC5mb3JtYXRfYmxvY2tfY29tbWVudHM9dHJ1ZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmNvbW1lbnQuZm9ybWF0X2hlYWRlcj10cnVlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuY29tbWVudC5mb3JtYXRfaHRtbD10cnVlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuY29tbWVudC5mb3JtYXRfamF2YWRvY19jb21tZW50cz10cnVlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuY29tbWVudC5mb3JtYXRfbGluZV9jb21tZW50cz10cnVlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuY29tbWVudC5mb3JtYXRfc291cmNlX2NvZGU9dHJ1ZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmNvbW1lbnQuaW5kZW50X3BhcmFtZXRlcl9kZXNjcmlwdGlvbj1mYWxzZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmNvbW1lbnQuaW5kZW50X3Jvb3RfdGFncz10cnVlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuY29tbWVudC5pbnNlcnRfbmV3X2xpbmVfYmVmb3JlX3Jvb3RfdGFncz1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5jb21tZW50Lmluc2VydF9uZXdfbGluZV9mb3JfcGFyYW1ldGVyPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5jb21tZW50LmxpbmVfbGVuZ3RoPTgwCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuY29tbWVudC5uZXdfbGluZXNfYXRfYmxvY2tfYm91bmRhcmllcz10cnVlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuY29tbWVudC5uZXdfbGluZXNfYXRfamF2YWRvY19ib3VuZGFyaWVzPXRydWUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5jb21tZW50LnByZXNlcnZlX3doaXRlX3NwYWNlX2JldHdlZW5fY29kZV9hbmRfbGluZV9jb21tZW50cz1mYWxzZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmNvbXBhY3RfZWxzZV9pZj10cnVlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuY29udGludWF0aW9uX2luZGVudGF0aW9uPTIKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5jb250aW51YXRpb25faW5kZW50YXRpb25fZm9yX2FycmF5X2luaXRpYWxpemVyPTIKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5kaXNhYmxpbmdfdGFnPUBmb3JtYXR0ZXJcOm9mZgorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmVuYWJsaW5nX3RhZz1AZm9ybWF0dGVyXDpvbgorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmZvcm1hdF9ndWFyZGlhbl9jbGF1c2Vfb25fb25lX2xpbmU9ZmFsc2UKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5mb3JtYXRfbGluZV9jb21tZW50X3N0YXJ0aW5nX29uX2ZpcnN0X2NvbHVtbj10cnVlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5kZW50X2JvZHlfZGVjbGFyYXRpb25zX2NvbXBhcmVfdG9fYW5ub3RhdGlvbl9kZWNsYXJhdGlvbl9oZWFkZXI9dHJ1ZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluZGVudF9ib2R5X2RlY2xhcmF0aW9uc19jb21wYXJlX3RvX2VudW1fY29uc3RhbnRfaGVhZGVyPXRydWUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbmRlbnRfYm9keV9kZWNsYXJhdGlvbnNfY29tcGFyZV90b19lbnVtX2RlY2xhcmF0aW9uX2hlYWRlcj10cnVlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5kZW50X2JvZHlfZGVjbGFyYXRpb25zX2NvbXBhcmVfdG9fdHlwZV9oZWFkZXI9dHJ1ZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluZGVudF9icmVha3NfY29tcGFyZV90b19jYXNlcz10cnVlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5kZW50X2VtcHR5X2xpbmVzPWZhbHNlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5kZW50X3N0YXRlbWVudHNfY29tcGFyZV90b19ibG9jaz10cnVlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5kZW50X3N0YXRlbWVudHNfY29tcGFyZV90b19ib2R5PXRydWUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbmRlbnRfc3dpdGNoc3RhdGVtZW50c19jb21wYXJlX3RvX2Nhc2VzPXRydWUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbmRlbnRfc3dpdGNoc3RhdGVtZW50c19jb21wYXJlX3RvX3N3aXRjaD10cnVlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5kZW50YXRpb24uc2l6ZT00CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X25ld19saW5lX2FmdGVyX2Fubm90YXRpb25fb25fZmllbGQ9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X25ld19saW5lX2FmdGVyX2Fubm90YXRpb25fb25fbG9jYWxfdmFyaWFibGU9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X25ld19saW5lX2FmdGVyX2Fubm90YXRpb25fb25fbWV0aG9kPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9uZXdfbGluZV9hZnRlcl9hbm5vdGF0aW9uX29uX3BhY2thZ2U9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X25ld19saW5lX2FmdGVyX2Fubm90YXRpb25fb25fcGFyYW1ldGVyPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfbmV3X2xpbmVfYWZ0ZXJfYW5ub3RhdGlvbl9vbl90eXBlPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9uZXdfbGluZV9hZnRlcl9sYWJlbD1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X25ld19saW5lX2FmdGVyX29wZW5pbmdfYnJhY2VfaW5fYXJyYXlfaW5pdGlhbGl6ZXI9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9uZXdfbGluZV9hdF9lbmRfb2ZfZmlsZV9pZl9taXNzaW5nPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9uZXdfbGluZV9iZWZvcmVfY2F0Y2hfaW5fdHJ5X3N0YXRlbWVudD1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X25ld19saW5lX2JlZm9yZV9jbG9zaW5nX2JyYWNlX2luX2FycmF5X2luaXRpYWxpemVyPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfbmV3X2xpbmVfYmVmb3JlX2Vsc2VfaW5faWZfc3RhdGVtZW50PWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfbmV3X2xpbmVfYmVmb3JlX2ZpbmFsbHlfaW5fdHJ5X3N0YXRlbWVudD1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X25ld19saW5lX2JlZm9yZV93aGlsZV9pbl9kb19zdGF0ZW1lbnQ9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9uZXdfbGluZV9pbl9lbXB0eV9hbm5vdGF0aW9uX2RlY2xhcmF0aW9uPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9uZXdfbGluZV9pbl9lbXB0eV9hbm9ueW1vdXNfdHlwZV9kZWNsYXJhdGlvbj1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X25ld19saW5lX2luX2VtcHR5X2Jsb2NrPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9uZXdfbGluZV9pbl9lbXB0eV9lbnVtX2NvbnN0YW50PWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfbmV3X2xpbmVfaW5fZW1wdHlfZW51bV9kZWNsYXJhdGlvbj1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfbmV3X2xpbmVfaW5fZW1wdHlfbWV0aG9kX2JvZHk9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X25ld19saW5lX2luX2VtcHR5X3R5cGVfZGVjbGFyYXRpb249aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX2FuZF9pbl90eXBlX3BhcmFtZXRlcj1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfYXNzaWdubWVudF9vcGVyYXRvcj1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfYXRfaW5fYW5ub3RhdGlvbj1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX2F0X2luX2Fubm90YXRpb25fdHlwZV9kZWNsYXJhdGlvbj1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX2JpbmFyeV9vcGVyYXRvcj1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfY2xvc2luZ19hbmdsZV9icmFja2V0X2luX3R5cGVfYXJndW1lbnRzPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9jbG9zaW5nX2FuZ2xlX2JyYWNrZXRfaW5fdHlwZV9wYXJhbWV0ZXJzPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9jbG9zaW5nX2JyYWNlX2luX2Jsb2NrPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9jbG9zaW5nX3BhcmVuX2luX2Nhc3Q9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX2NvbG9uX2luX2Fzc2VydD1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfY29sb25faW5fY2FzZT1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfY29sb25faW5fY29uZGl0aW9uYWw9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX2NvbG9uX2luX2Zvcj1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfY29sb25faW5fbGFiZWxlZF9zdGF0ZW1lbnQ9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX2NvbW1hX2luX2FsbG9jYXRpb25fZXhwcmVzc2lvbj1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfY29tbWFfaW5fYW5ub3RhdGlvbj1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfY29tbWFfaW5fYXJyYXlfaW5pdGlhbGl6ZXI9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX2NvbW1hX2luX2NvbnN0cnVjdG9yX2RlY2xhcmF0aW9uX3BhcmFtZXRlcnM9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX2NvbW1hX2luX2NvbnN0cnVjdG9yX2RlY2xhcmF0aW9uX3Rocm93cz1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfY29tbWFfaW5fZW51bV9jb25zdGFudF9hcmd1bWVudHM9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX2NvbW1hX2luX2VudW1fZGVjbGFyYXRpb25zPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9jb21tYV9pbl9leHBsaWNpdGNvbnN0cnVjdG9yY2FsbF9hcmd1bWVudHM9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX2NvbW1hX2luX2Zvcl9pbmNyZW1lbnRzPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9jb21tYV9pbl9mb3JfaW5pdHM9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX2NvbW1hX2luX21ldGhvZF9kZWNsYXJhdGlvbl9wYXJhbWV0ZXJzPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9jb21tYV9pbl9tZXRob2RfZGVjbGFyYXRpb25fdGhyb3dzPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9jb21tYV9pbl9tZXRob2RfaW52b2NhdGlvbl9hcmd1bWVudHM9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX2NvbW1hX2luX211bHRpcGxlX2ZpZWxkX2RlY2xhcmF0aW9ucz1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfY29tbWFfaW5fbXVsdGlwbGVfbG9jYWxfZGVjbGFyYXRpb25zPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9jb21tYV9pbl9wYXJhbWV0ZXJpemVkX3R5cGVfcmVmZXJlbmNlPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9jb21tYV9pbl9zdXBlcmludGVyZmFjZXM9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX2NvbW1hX2luX3R5cGVfYXJndW1lbnRzPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9jb21tYV9pbl90eXBlX3BhcmFtZXRlcnM9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX2VsbGlwc2lzPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9vcGVuaW5nX2FuZ2xlX2JyYWNrZXRfaW5fcGFyYW1ldGVyaXplZF90eXBlX3JlZmVyZW5jZT1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX29wZW5pbmdfYW5nbGVfYnJhY2tldF9pbl90eXBlX2FyZ3VtZW50cz1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX29wZW5pbmdfYW5nbGVfYnJhY2tldF9pbl90eXBlX3BhcmFtZXRlcnM9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9vcGVuaW5nX2JyYWNlX2luX2FycmF5X2luaXRpYWxpemVyPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfb3BlbmluZ19icmFja2V0X2luX2FycmF5X2FsbG9jYXRpb25fZXhwcmVzc2lvbj1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX29wZW5pbmdfYnJhY2tldF9pbl9hcnJheV9yZWZlcmVuY2U9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9vcGVuaW5nX3BhcmVuX2luX2Fubm90YXRpb249ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9vcGVuaW5nX3BhcmVuX2luX2Nhc3Q9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9vcGVuaW5nX3BhcmVuX2luX2NhdGNoPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfb3BlbmluZ19wYXJlbl9pbl9jb25zdHJ1Y3Rvcl9kZWNsYXJhdGlvbj1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX29wZW5pbmdfcGFyZW5faW5fZW51bV9jb25zdGFudD1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX29wZW5pbmdfcGFyZW5faW5fZm9yPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfb3BlbmluZ19wYXJlbl9pbl9pZj1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX29wZW5pbmdfcGFyZW5faW5fbWV0aG9kX2RlY2xhcmF0aW9uPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfb3BlbmluZ19wYXJlbl9pbl9tZXRob2RfaW52b2NhdGlvbj1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX29wZW5pbmdfcGFyZW5faW5fcGFyZW50aGVzaXplZF9leHByZXNzaW9uPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfb3BlbmluZ19wYXJlbl9pbl9zd2l0Y2g9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9vcGVuaW5nX3BhcmVuX2luX3N5bmNocm9uaXplZD1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX29wZW5pbmdfcGFyZW5faW5fdHJ5PWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfb3BlbmluZ19wYXJlbl9pbl93aGlsZT1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX3Bvc3RmaXhfb3BlcmF0b3I9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9wcmVmaXhfb3BlcmF0b3I9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9xdWVzdGlvbl9pbl9jb25kaXRpb25hbD1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfcXVlc3Rpb25faW5fd2lsZGNhcmQ9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9zZW1pY29sb25faW5fZm9yPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9zZW1pY29sb25faW5fdHJ5X3Jlc291cmNlcz1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfdW5hcnlfb3BlcmF0b3I9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfYW5kX2luX3R5cGVfcGFyYW1ldGVyPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfYXNzaWdubWVudF9vcGVyYXRvcj1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX2F0X2luX2Fubm90YXRpb25fdHlwZV9kZWNsYXJhdGlvbj1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX2JpbmFyeV9vcGVyYXRvcj1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX2Nsb3NpbmdfYW5nbGVfYnJhY2tldF9pbl9wYXJhbWV0ZXJpemVkX3R5cGVfcmVmZXJlbmNlPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX2Nsb3NpbmdfYW5nbGVfYnJhY2tldF9pbl90eXBlX2FyZ3VtZW50cz1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9jbG9zaW5nX2FuZ2xlX2JyYWNrZXRfaW5fdHlwZV9wYXJhbWV0ZXJzPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX2Nsb3NpbmdfYnJhY2VfaW5fYXJyYXlfaW5pdGlhbGl6ZXI9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfY2xvc2luZ19icmFja2V0X2luX2FycmF5X2FsbG9jYXRpb25fZXhwcmVzc2lvbj1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9jbG9zaW5nX2JyYWNrZXRfaW5fYXJyYXlfcmVmZXJlbmNlPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX2Nsb3NpbmdfcGFyZW5faW5fYW5ub3RhdGlvbj1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9jbG9zaW5nX3BhcmVuX2luX2Nhc3Q9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfY2xvc2luZ19wYXJlbl9pbl9jYXRjaD1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9jbG9zaW5nX3BhcmVuX2luX2NvbnN0cnVjdG9yX2RlY2xhcmF0aW9uPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX2Nsb3NpbmdfcGFyZW5faW5fZW51bV9jb25zdGFudD1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9jbG9zaW5nX3BhcmVuX2luX2Zvcj1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9jbG9zaW5nX3BhcmVuX2luX2lmPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX2Nsb3NpbmdfcGFyZW5faW5fbWV0aG9kX2RlY2xhcmF0aW9uPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX2Nsb3NpbmdfcGFyZW5faW5fbWV0aG9kX2ludm9jYXRpb249ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfY2xvc2luZ19wYXJlbl9pbl9wYXJlbnRoZXNpemVkX2V4cHJlc3Npb249ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfY2xvc2luZ19wYXJlbl9pbl9zd2l0Y2g9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfY2xvc2luZ19wYXJlbl9pbl9zeW5jaHJvbml6ZWQ9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfY2xvc2luZ19wYXJlbl9pbl90cnk9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfY2xvc2luZ19wYXJlbl9pbl93aGlsZT1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9jb2xvbl9pbl9hc3NlcnQ9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9jb2xvbl9pbl9jYXNlPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX2NvbG9uX2luX2NvbmRpdGlvbmFsPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfY29sb25faW5fZGVmYXVsdD1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9jb2xvbl9pbl9mb3I9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9jb2xvbl9pbl9sYWJlbGVkX3N0YXRlbWVudD1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9jb21tYV9pbl9hbGxvY2F0aW9uX2V4cHJlc3Npb249ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfY29tbWFfaW5fYW5ub3RhdGlvbj1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9jb21tYV9pbl9hcnJheV9pbml0aWFsaXplcj1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9jb21tYV9pbl9jb25zdHJ1Y3Rvcl9kZWNsYXJhdGlvbl9wYXJhbWV0ZXJzPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX2NvbW1hX2luX2NvbnN0cnVjdG9yX2RlY2xhcmF0aW9uX3Rocm93cz1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9jb21tYV9pbl9lbnVtX2NvbnN0YW50X2FyZ3VtZW50cz1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9jb21tYV9pbl9lbnVtX2RlY2xhcmF0aW9ucz1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9jb21tYV9pbl9leHBsaWNpdGNvbnN0cnVjdG9yY2FsbF9hcmd1bWVudHM9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfY29tbWFfaW5fZm9yX2luY3JlbWVudHM9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfY29tbWFfaW5fZm9yX2luaXRzPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX2NvbW1hX2luX21ldGhvZF9kZWNsYXJhdGlvbl9wYXJhbWV0ZXJzPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX2NvbW1hX2luX21ldGhvZF9kZWNsYXJhdGlvbl90aHJvd3M9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfY29tbWFfaW5fbWV0aG9kX2ludm9jYXRpb25fYXJndW1lbnRzPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX2NvbW1hX2luX211bHRpcGxlX2ZpZWxkX2RlY2xhcmF0aW9ucz1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9jb21tYV9pbl9tdWx0aXBsZV9sb2NhbF9kZWNsYXJhdGlvbnM9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfY29tbWFfaW5fcGFyYW1ldGVyaXplZF90eXBlX3JlZmVyZW5jZT1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9jb21tYV9pbl9zdXBlcmludGVyZmFjZXM9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfY29tbWFfaW5fdHlwZV9hcmd1bWVudHM9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfY29tbWFfaW5fdHlwZV9wYXJhbWV0ZXJzPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX2VsbGlwc2lzPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX29wZW5pbmdfYW5nbGVfYnJhY2tldF9pbl9wYXJhbWV0ZXJpemVkX3R5cGVfcmVmZXJlbmNlPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX29wZW5pbmdfYW5nbGVfYnJhY2tldF9pbl90eXBlX2FyZ3VtZW50cz1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9vcGVuaW5nX2FuZ2xlX2JyYWNrZXRfaW5fdHlwZV9wYXJhbWV0ZXJzPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX29wZW5pbmdfYnJhY2VfaW5fYW5ub3RhdGlvbl90eXBlX2RlY2xhcmF0aW9uPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfb3BlbmluZ19icmFjZV9pbl9hbm9ueW1vdXNfdHlwZV9kZWNsYXJhdGlvbj1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX29wZW5pbmdfYnJhY2VfaW5fYXJyYXlfaW5pdGlhbGl6ZXI9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9vcGVuaW5nX2JyYWNlX2luX2Jsb2NrPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfb3BlbmluZ19icmFjZV9pbl9jb25zdHJ1Y3Rvcl9kZWNsYXJhdGlvbj1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX29wZW5pbmdfYnJhY2VfaW5fZW51bV9jb25zdGFudD1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX29wZW5pbmdfYnJhY2VfaW5fZW51bV9kZWNsYXJhdGlvbj1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX29wZW5pbmdfYnJhY2VfaW5fbWV0aG9kX2RlY2xhcmF0aW9uPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfb3BlbmluZ19icmFjZV9pbl9zd2l0Y2g9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9vcGVuaW5nX2JyYWNlX2luX3R5cGVfZGVjbGFyYXRpb249aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9vcGVuaW5nX2JyYWNrZXRfaW5fYXJyYXlfYWxsb2NhdGlvbl9leHByZXNzaW9uPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX29wZW5pbmdfYnJhY2tldF9pbl9hcnJheV9yZWZlcmVuY2U9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfb3BlbmluZ19icmFja2V0X2luX2FycmF5X3R5cGVfcmVmZXJlbmNlPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX29wZW5pbmdfcGFyZW5faW5fYW5ub3RhdGlvbj1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9vcGVuaW5nX3BhcmVuX2luX2Fubm90YXRpb25fdHlwZV9tZW1iZXJfZGVjbGFyYXRpb249ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfb3BlbmluZ19wYXJlbl9pbl9jYXRjaD1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX29wZW5pbmdfcGFyZW5faW5fY29uc3RydWN0b3JfZGVjbGFyYXRpb249ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfb3BlbmluZ19wYXJlbl9pbl9lbnVtX2NvbnN0YW50PWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX29wZW5pbmdfcGFyZW5faW5fZm9yPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfb3BlbmluZ19wYXJlbl9pbl9pZj1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX29wZW5pbmdfcGFyZW5faW5fbWV0aG9kX2RlY2xhcmF0aW9uPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX29wZW5pbmdfcGFyZW5faW5fbWV0aG9kX2ludm9jYXRpb249ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfb3BlbmluZ19wYXJlbl9pbl9wYXJlbnRoZXNpemVkX2V4cHJlc3Npb249ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfb3BlbmluZ19wYXJlbl9pbl9zd2l0Y2g9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9vcGVuaW5nX3BhcmVuX2luX3N5bmNocm9uaXplZD1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX29wZW5pbmdfcGFyZW5faW5fdHJ5PWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfb3BlbmluZ19wYXJlbl9pbl93aGlsZT1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX3BhcmVudGhlc2l6ZWRfZXhwcmVzc2lvbl9pbl9yZXR1cm49aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9wYXJlbnRoZXNpemVkX2V4cHJlc3Npb25faW5fdGhyb3c9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9wb3N0Zml4X29wZXJhdG9yPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX3ByZWZpeF9vcGVyYXRvcj1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9xdWVzdGlvbl9pbl9jb25kaXRpb25hbD1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX3F1ZXN0aW9uX2luX3dpbGRjYXJkPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX3NlbWljb2xvbj1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9zZW1pY29sb25faW5fZm9yPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX3NlbWljb2xvbl9pbl90cnlfcmVzb3VyY2VzPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX3VuYXJ5X29wZXJhdG9yPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmV0d2Vlbl9icmFja2V0c19pbl9hcnJheV90eXBlX3JlZmVyZW5jZT1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JldHdlZW5fZW1wdHlfYnJhY2VzX2luX2FycmF5X2luaXRpYWxpemVyPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmV0d2Vlbl9lbXB0eV9icmFja2V0c19pbl9hcnJheV9hbGxvY2F0aW9uX2V4cHJlc3Npb249ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZXR3ZWVuX2VtcHR5X3BhcmVuc19pbl9hbm5vdGF0aW9uX3R5cGVfbWVtYmVyX2RlY2xhcmF0aW9uPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmV0d2Vlbl9lbXB0eV9wYXJlbnNfaW5fY29uc3RydWN0b3JfZGVjbGFyYXRpb249ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZXR3ZWVuX2VtcHR5X3BhcmVuc19pbl9lbnVtX2NvbnN0YW50PWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmV0d2Vlbl9lbXB0eV9wYXJlbnNfaW5fbWV0aG9kX2RlY2xhcmF0aW9uPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmV0d2Vlbl9lbXB0eV9wYXJlbnNfaW5fbWV0aG9kX2ludm9jYXRpb249ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmpvaW5fbGluZXNfaW5fY29tbWVudHM9dHJ1ZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmpvaW5fd3JhcHBlZF9saW5lcz10cnVlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIua2VlcF9lbHNlX3N0YXRlbWVudF9vbl9zYW1lX2xpbmU9ZmFsc2UKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5rZWVwX2VtcHR5X2FycmF5X2luaXRpYWxpemVyX29uX29uZV9saW5lPWZhbHNlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIua2VlcF9pbXBsZV9pZl9vbl9vbmVfbGluZT10cnVlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIua2VlcF90aGVuX3N0YXRlbWVudF9vbl9zYW1lX2xpbmU9ZmFsc2UKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5saW5lU3BsaXQ9ODAKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5uZXZlcl9pbmRlbnRfYmxvY2tfY29tbWVudHNfb25fZmlyc3RfY29sdW1uPWZhbHNlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIubmV2ZXJfaW5kZW50X2xpbmVfY29tbWVudHNfb25fZmlyc3RfY29sdW1uPWZhbHNlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIubnVtYmVyX29mX2JsYW5rX2xpbmVzX2F0X2JlZ2lubmluZ19vZl9tZXRob2RfYm9keT0wCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIubnVtYmVyX29mX2VtcHR5X2xpbmVzX3RvX3ByZXNlcnZlPTMKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5wdXRfZW1wdHlfc3RhdGVtZW50X29uX25ld19saW5lPWZhbHNlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIudGFidWxhdGlvbi5jaGFyPXNwYWNlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIudGFidWxhdGlvbi5zaXplPTIKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci51c2Vfb25fb2ZmX3RhZ3M9ZmFsc2UKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci51c2VfdGFic19vbmx5X2Zvcl9sZWFkaW5nX2luZGVudGF0aW9ucz1mYWxzZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLndyYXBfYmVmb3JlX2JpbmFyeV9vcGVyYXRvcj10cnVlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIud3JhcF9iZWZvcmVfb3Jfb3BlcmF0b3JfbXVsdGljYXRjaD10cnVlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIud3JhcF9vdXRlcl9leHByZXNzaW9uc193aGVuX25lc3RlZD10cnVlCmRpZmYgLS1naXQgYS9nZXJyaXQtcGx1Z2luLWd3dHVpLy5zZXR0aW5ncy9vcmcuZWNsaXBzZS5qZHQudWkucHJlZnMgYi9nZXJyaXQtcGx1Z2luLWd3dHVpLy5zZXR0aW5ncy9vcmcuZWNsaXBzZS5qZHQudWkucHJlZnMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYzAxODgyMQotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1wbHVnaW4tZ3d0dWkvLnNldHRpbmdzL29yZy5lY2xpcHNlLmpkdC51aS5wcmVmcwpAQCAtMCwwICsxLDcgQEAKK2VjbGlwc2UucHJlZmVyZW5jZXMudmVyc2lvbj0xCitmb3JtYXR0ZXJfcHJvZmlsZT1fR29vZ2xlIEZvcm1hdAorZm9ybWF0dGVyX3NldHRpbmdzX3ZlcnNpb249MTIKK29yZy5lY2xpcHNlLmpkdC51aS5leGNlcHRpb24ubmFtZT1lCitvcmcuZWNsaXBzZS5qZHQudWkuZ2V0dGVyc2V0dGVyLnVzZS5pcz10cnVlCitvcmcuZWNsaXBzZS5qZHQudWkua2V5d29yZHRoaXM9ZmFsc2UKK29yZy5lY2xpcHNlLmpkdC51aS5vdmVycmlkZWFubm90YXRpb249dHJ1ZQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXBsdWdpbi1nd3R1aS9wb20ueG1sIGIvZ2Vycml0LXBsdWdpbi1nd3R1aS9wb20ueG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmFhNmJhOGYKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtcGx1Z2luLWd3dHVpL3BvbS54bWwKQEAgLTAsMCArMSw4MCBAQAorPD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KKzwhLS0KK0NvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisKK0xpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworeW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisKK2h0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorCitVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCitkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCitTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCitsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKy0tPgorPHByb2plY3QgeG1sbnM9Imh0dHA6Ly9tYXZlbi5hcGFjaGUub3JnL1BPTS80LjAuMCIKKyAgICAgICAgeG1sbnM6eHNpPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxL1hNTFNjaGVtYS1pbnN0YW5jZSIKKyAgICAgICAgeHNpOnNjaGVtYUxvY2F0aW9uPSJodHRwOi8vbWF2ZW4uYXBhY2hlLm9yZy9QT00vNC4wLjAgaHR0cDovL21hdmVuLmFwYWNoZS5vcmcvbWF2ZW4tdjRfMF8wLnhzZCI+CisgIDxtb2RlbFZlcnNpb24+NC4wLjA8L21vZGVsVmVyc2lvbj4KKworICA8cGFyZW50PgorICAgIDxncm91cElkPmNvbS5nb29nbGUuZ2Vycml0PC9ncm91cElkPgorICAgIDxhcnRpZmFjdElkPmdlcnJpdC1wYXJlbnQ8L2FydGlmYWN0SWQ+CisgICAgPHZlcnNpb24+Mi42LVNOQVBTSE9UPC92ZXJzaW9uPgorICA8L3BhcmVudD4KKworICA8YXJ0aWZhY3RJZD5nZXJyaXQtcGx1Z2luLWd3dHVpPC9hcnRpZmFjdElkPgorICA8bmFtZT5HZXJyaXQgQ29kZSBSZXZpZXcgLSBQbHVnaW4gR1dUIFVJPC9uYW1lPgorCisgIDxkZXNjcmlwdGlvbj4KKyAgICBBUEkgZm9yIFVJIHBsdWdpbnMgdG8gYnVpbGQgd2l0aCBHV1QgYW5kIGludGVncmF0ZSB3aXRoIEdlcnJpdAorICA8L2Rlc2NyaXB0aW9uPgorCisgIDxkZXBlbmRlbmNpZXM+CisgICAgPGRlcGVuZGVuY3k+CisgICAgICA8Z3JvdXBJZD5jb20uZ29vZ2xlLmd3dDwvZ3JvdXBJZD4KKyAgICAgIDxhcnRpZmFjdElkPmd3dC11c2VyPC9hcnRpZmFjdElkPgorICAgIDwvZGVwZW5kZW5jeT4KKworICAgIDxkZXBlbmRlbmN5PgorICAgICAgPGdyb3VwSWQ+Y29tLmdvb2dsZS5nd3Q8L2dyb3VwSWQ+CisgICAgICA8YXJ0aWZhY3RJZD5nd3QtZGV2PC9hcnRpZmFjdElkPgorICAgIDwvZGVwZW5kZW5jeT4KKyAgPC9kZXBlbmRlbmNpZXM+CisKKyAgIDxidWlsZD4KKyAgICA8cGx1Z2lucz4KKyAgICAgIDxwbHVnaW4+CisgICAgICAgIDxncm91cElkPm9yZy5hcGFjaGUubWF2ZW4ucGx1Z2luczwvZ3JvdXBJZD4KKyAgICAgICAgPGFydGlmYWN0SWQ+bWF2ZW4tc291cmNlLXBsdWdpbjwvYXJ0aWZhY3RJZD4KKyAgICAgICAgPGV4ZWN1dGlvbnM+CisgICAgICAgICAgPGV4ZWN1dGlvbj4KKyAgICAgICAgICAgIDxnb2Fscz4KKyAgICAgICAgICAgICAgPGdvYWw+amFyPC9nb2FsPgorICAgICAgICAgICAgPC9nb2Fscz4KKyAgICAgICAgICA8L2V4ZWN1dGlvbj4KKyAgICAgICAgPC9leGVjdXRpb25zPgorICAgICAgPC9wbHVnaW4+CisKKyAgICAgIDxwbHVnaW4+CisgICAgICAgIDxncm91cElkPm9yZy5jb2RlaGF1cy5tb2pvPC9ncm91cElkPgorICAgICAgICA8YXJ0aWZhY3RJZD5nd3QtbWF2ZW4tcGx1Z2luPC9hcnRpZmFjdElkPgorICAgICAgICA8Y29uZmlndXJhdGlvbj4KKyAgICAgICAgICA8bW9kdWxlPmNvbS5nb29nbGUuZ2Vycml0LlBsdWdpbjwvbW9kdWxlPgorICAgICAgICAgIDxkaXNhYmxlQ2xhc3NNZXRhZGF0YT50cnVlPC9kaXNhYmxlQ2xhc3NNZXRhZGF0YT4KKyAgICAgICAgICA8ZGlzYWJsZUNhc3RDaGVja2luZz50cnVlPC9kaXNhYmxlQ2FzdENoZWNraW5nPgorICAgICAgICA8L2NvbmZpZ3VyYXRpb24+CisgICAgICAgIDxleGVjdXRpb25zPgorICAgICAgICAgIDxleGVjdXRpb24+CisgICAgICAgICAgICA8Z29hbHM+CisgICAgICAgICAgICAgIDxnb2FsPnJlc291cmNlczwvZ29hbD4KKyAgICAgICAgICAgICAgPGdvYWw+Y29tcGlsZTwvZ29hbD4KKyAgICAgICAgICAgIDwvZ29hbHM+CisgICAgICAgICAgPC9leGVjdXRpb24+CisgICAgICAgIDwvZXhlY3V0aW9ucz4KKyAgICAgIDwvcGx1Z2luPgorICAgIDwvcGx1Z2lucz4KKyAgPC9idWlsZD4KKzwvcHJvamVjdD4KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9nZXJyaXQtcGx1Z2luLWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvUGx1Z2luLmd3dC54bWwgYi9nZXJyaXQtcGx1Z2luLWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvUGx1Z2luLmd3dC54bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMDNlZGY2NwotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1wbHVnaW4tZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9QbHVnaW4uZ3d0LnhtbApAQCAtMCwwICsxLDIzIEBACis8IS0tCisgQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKworIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKworIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorCisgVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisgV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisgU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorLS0+Cis8bW9kdWxlPgorICA8ZGVmaW5lLWxpbmtlciBuYW1lPSJnZXJyaXRfcGx1Z2luIiBjbGFzcz0iY29tLmdvb2dsZS5nZXJyaXQubGlua2VyLkdlcnJpdFBsdWdpbkxpbmtlciIvPgorICA8YWRkLWxpbmtlciBuYW1lPSJnZXJyaXRfcGx1Z2luIi8+CisgIDxnZW5lcmF0ZS13aXRoIGNsYXNzPSJjb20uZ29vZ2xlLmdlcnJpdC5yZWJpbmQuUGx1Z2luR2VuZXJhdG9yIj4KKyAgICA8d2hlbi10eXBlLWFzc2lnbmFibGUgY2xhc3M9ImNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5QbHVnaW4iLz4KKyAgPC9nZW5lcmF0ZS13aXRoPgorICA8c291cmNlIHBhdGg9ImNsaWVudCIvPgorPC9tb2R1bGU+CmRpZmYgLS1naXQgYS9nZXJyaXQtcGx1Z2luLWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L1BsdWdpbi5qYXZhIGIvZ2Vycml0LXBsdWdpbi1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9QbHVnaW4uamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4xMjkxYjc5Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXBsdWdpbi1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9QbHVnaW4uamF2YQpAQCAtMCwwICsxLDI5IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50OworCitpbXBvcnQgY29tLmdvb2dsZS5nd3QuY29yZS5jbGllbnQuRW50cnlQb2ludDsKKworLyoqCisgKiBCYXNlIGNsYXNzIGZvciB3cml0aW5nIEdlcnJpdCBXZWIgVUkgcGx1Z2lucworICoKKyAqIFdyaXRpbmcgYSBwbHVnaW46CisgKiA8b2w+CisgKiA8bGk+RGVjbGFyZSBzdWJ0eXBlIG9mIFBsdWdpbjwvbGk+CisgKiA8bGk+QmluZCBXZWJVaVBsdWdpbiB0byBHd3RQbHVnaW4gaW1wbGVtZW50YXRpb24gaW4gR2Vycml0LU1vZHVsZTwvbGk+CisgKiA8L29sPgorICovCitwdWJsaWMgYWJzdHJhY3QgY2xhc3MgUGx1Z2luIGltcGxlbWVudHMgRW50cnlQb2ludCB7Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtcGx1Z2luLWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvbGlua2VyL0dlcnJpdFBsdWdpbkxpbmtlci5qYXZhIGIvZ2Vycml0LXBsdWdpbi1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2xpbmtlci9HZXJyaXRQbHVnaW5MaW5rZXIuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5lNTAzMzRlCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXBsdWdpbi1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2xpbmtlci9HZXJyaXRQbHVnaW5MaW5rZXIuamF2YQpAQCAtMCwwICsxLDMxIEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQubGlua2VyOworCitpbXBvcnQgY29tLmdvb2dsZS5nd3QuY29yZS5leHQuTGlua2VyQ29udGV4dDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC5jb3JlLmxpbmtlci5Dcm9zc1NpdGVJZnJhbWVMaW5rZXI7CisKKy8qKiBGaW5hbGl6ZXMgdGhlIG1vZHVsZSBtYW5pZmVzdCBmaWxlIHdpdGggdGhlIHNlbGVjdGlvbiBzY3JpcHQuICovCitwdWJsaWMgZmluYWwgY2xhc3MgR2Vycml0UGx1Z2luTGlua2VyIGV4dGVuZHMgQ3Jvc3NTaXRlSWZyYW1lTGlua2VyIHsKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBTdHJpbmcgZ2V0RGVzY3JpcHRpb24oKSB7CisgICAgcmV0dXJuICJHZXJyaXQgR1dUIFVJIHBsdWdpbiI7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHJvdGVjdGVkIFN0cmluZyBnZXRKc0NvbXB1dGVVcmxGb3JSZXNvdXJjZShMaW5rZXJDb250ZXh0IGNvbnRleHQpIHsKKyAgICByZXR1cm4gImNvbS9nb29nbGUvZ2Vycml0L2xpbmtlci9jb21wdXRlVXJsRm9yUGx1Z2luUmVzb3VyY2UuanMiOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtcGx1Z2luLWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcmViaW5kL1BsdWdpbkdlbmVyYXRvci5qYXZhIGIvZ2Vycml0LXBsdWdpbi1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3JlYmluZC9QbHVnaW5HZW5lcmF0b3IuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi43MTY2NmY5Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXBsdWdpbi1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3JlYmluZC9QbHVnaW5HZW5lcmF0b3IuamF2YQpAQCAtMCwwICsxLDk1IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8gQ29weXJpZ2h0IDIwMDggR29vZ2xlIEluYy4KKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnJlYmluZDsKKworaW1wb3J0IGphdmEuaW8uUHJpbnRXcml0ZXI7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC5jb3JlLmNsaWVudC5HV1Q7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QuY29yZS5leHQuR2VuZXJhdG9yOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmNvcmUuZXh0LkdlbmVyYXRvckNvbnRleHQ7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QuY29yZS5leHQuVHJlZUxvZ2dlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC5jb3JlLmV4dC5VbmFibGVUb0NvbXBsZXRlRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmNvcmUuZXh0LnR5cGVpbmZvLkpDbGFzc1R5cGU7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QuY29yZS5leHQudHlwZWluZm8uVHlwZU9yYWNsZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLnJlYmluZC5DbGFzc1NvdXJjZUZpbGVDb21wb3NlckZhY3Rvcnk7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5yZWJpbmQuU291cmNlV3JpdGVyOworCisvKioKKyAqIFdyaXRlIHRoZSB0b3AgbGF5ZXIgaW4gdGhlIEdhZGdldCBib290c3RyYXAgc2FuZHdpY2ggYW5kIGdlbmVyYXRlIGEgc3R1YgorICogbWFuaWZlc3QgdGhhdCB3aWxsIGJlIGNvbXBsZXRlZCBieSB0aGUgbGlua2VyLgorICoKKyAqIEJhc2VkIG9uIGd3dC1nYWRnZXRzIEdhZGdldEdlbmVyYXRvciBjbGFzcworICovCitwdWJsaWMgY2xhc3MgUGx1Z2luR2VuZXJhdG9yIGV4dGVuZHMgR2VuZXJhdG9yIHsKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBTdHJpbmcgZ2VuZXJhdGUoVHJlZUxvZ2dlciBsb2dnZXIsIEdlbmVyYXRvckNvbnRleHQgY29udGV4dCwKKyAgICAgIFN0cmluZyB0eXBlTmFtZSkgdGhyb3dzIFVuYWJsZVRvQ29tcGxldGVFeGNlcHRpb24geworCisgICAgLy8gVGhlIFR5cGVPcmFjbGUga25vd3MgYWJvdXQgYWxsIHR5cGVzIGluIHRoZSB0eXBlIHN5c3RlbQorICAgIFR5cGVPcmFjbGUgdHlwZU9yYWNsZSA9IGNvbnRleHQuZ2V0VHlwZU9yYWNsZSgpOworCisgICAgLy8gR2V0IGEgcmVmZXJlbmNlIHRvIHRoZSB0eXBlIHRoYXQgdGhlIGdlbmVyYXRvciBzaG91bGQgaW1wbGVtZW50CisgICAgSkNsYXNzVHlwZSBzb3VyY2VUeXBlID0gdHlwZU9yYWNsZS5maW5kVHlwZSh0eXBlTmFtZSk7CisKKyAgICAvLyBFbnN1cmUgdGhhdCB0aGUgcmVxdWVzdGVkIHR5cGUgZXhpc3RzCisgICAgaWYgKHNvdXJjZVR5cGUgPT0gbnVsbCkgeworICAgICAgbG9nZ2VyLmxvZyhUcmVlTG9nZ2VyLkVSUk9SLCAiQ291bGQgbm90IGZpbmQgcmVxdWVzdGVkIHR5cGVOYW1lIiwgbnVsbCk7CisgICAgICB0aHJvdyBuZXcgVW5hYmxlVG9Db21wbGV0ZUV4Y2VwdGlvbigpOworICAgIH0KKworICAgIC8vIE1ha2Ugc3VyZSB0aGUgR2FkZ2V0IHR5cGUgaXMgY29ycmVjdGx5IGRlZmluZWQKKyAgICB2YWxpZGF0ZVR5cGUobG9nZ2VyLCBzb3VyY2VUeXBlKTsKKworICAgIC8vIFBpY2sgYSBuYW1lIGZvciB0aGUgZ2VuZXJhdGVkIGNsYXNzIHRvIG5vdCBjb25mbGljdC4KKyAgICBTdHJpbmcgZ2VuZXJhdGVkU2ltcGxlU291cmNlTmFtZSA9IHNvdXJjZVR5cGUuZ2V0U2ltcGxlU291cmNlTmFtZSgpCisgICAgICAgICsgIlBsdWdpbkltcGwiOworCisgICAgLy8gQmVnaW4gd3JpdGluZyB0aGUgZ2VuZXJhdGVkIHNvdXJjZS4KKyAgICBDbGFzc1NvdXJjZUZpbGVDb21wb3NlckZhY3RvcnkgZiA9IG5ldyBDbGFzc1NvdXJjZUZpbGVDb21wb3NlckZhY3RvcnkoCisgICAgICAgIHNvdXJjZVR5cGUuZ2V0UGFja2FnZSgpLmdldE5hbWUoKSwgZ2VuZXJhdGVkU2ltcGxlU291cmNlTmFtZSk7CisgICAgZi5hZGRJbXBvcnQoR1dULmNsYXNzLmdldE5hbWUoKSk7CisgICAgZi5zZXRTdXBlcmNsYXNzKHR5cGVOYW1lKTsKKworICAgIC8vIEFsbCBzb3VyY2UgZ2V0cyB3cml0dGVuIHRocm91Z2ggdGhpcyBXcml0ZXIKKyAgICBQcmludFdyaXRlciBvdXQgPSBjb250ZXh0LnRyeUNyZWF0ZShsb2dnZXIsCisgICAgICAgIHNvdXJjZVR5cGUuZ2V0UGFja2FnZSgpLmdldE5hbWUoKSwgZ2VuZXJhdGVkU2ltcGxlU291cmNlTmFtZSk7CisKKyAgICAvLyBJZiBhbiBpbXBsZW1lbnRhdGlvbiBhbHJlYWR5IGV4aXN0cywgd2UgZG9uJ3QgbmVlZCB0byBkbyBhbnkgd29yaworICAgIGlmIChvdXQgIT0gbnVsbCkgeworCisgICAgICAvLyBXZSByZWFsbHkgdXNlIGEgU291cmNlV3JpdGVyIHNpbmNlIGl0J3MgY29udmVuaWVudAorICAgICAgU291cmNlV3JpdGVyIHN3ID0gZi5jcmVhdGVTb3VyY2VXcml0ZXIoY29udGV4dCwgb3V0KTsKKyAgICAgIHN3LnByaW50bG4oInB1YmxpYyAiICsgZ2VuZXJhdGVkU2ltcGxlU291cmNlTmFtZSArICIoKSB7Iik7CisgICAgICBzdy5pbmRlbnQoKTsKKyAgICAgIHN3LnByaW50bG4oIm9uTW9kdWxlTG9hZCgpOyIpOworICAgICAgc3cub3V0ZGVudCgpOworICAgICAgc3cucHJpbnRsbigifSIpOworCisgICAgICBzdy5jb21taXQobG9nZ2VyKTsKKyAgICB9CisKKyAgICByZXR1cm4gZi5nZXRDcmVhdGVkQ2xhc3NOYW1lKCk7CisgIH0KKworICBwcm90ZWN0ZWQgdm9pZCB2YWxpZGF0ZVR5cGUoVHJlZUxvZ2dlciBsb2dnZXIsIEpDbGFzc1R5cGUgdHlwZSkKKyAgICAgIHRocm93cyBVbmFibGVUb0NvbXBsZXRlRXhjZXB0aW9uIHsKKyAgICBpZiAoIXR5cGUuaXNEZWZhdWx0SW5zdGFudGlhYmxlKCkpIHsKKyAgICAgIGxvZ2dlci5sb2coVHJlZUxvZ2dlci5FUlJPUiwgIlBsdWdpbiB0eXBlcyBtdXN0IGJlIGRlZmF1bHQgaW5zdGFudGlhYmxlIiwKKyAgICAgICAgICBudWxsKTsKKyAgICAgIHRocm93IG5ldyBVbmFibGVUb0NvbXBsZXRlRXhjZXB0aW9uKCk7CisgICAgfQorICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtcGx1Z2luLWd3dHVpL3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9saW5rZXIvY29tcHV0ZVVybEZvclBsdWdpblJlc291cmNlLmpzIGIvZ2Vycml0LXBsdWdpbi1nd3R1aS9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvbGlua2VyL2NvbXB1dGVVcmxGb3JQbHVnaW5SZXNvdXJjZS5qcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4zZTIwZTk0Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXBsdWdpbi1nd3R1aS9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvbGlua2VyL2NvbXB1dGVVcmxGb3JQbHVnaW5SZXNvdXJjZS5qcwpAQCAtMCwwICsxLDMgQEAKK2Z1bmN0aW9uIGNvbXB1dGVVcmxGb3JSZXNvdXJjZShyZXNvdXJjZSkgeworICByZXR1cm4gX19NT0RVTEVfRlVOQ19fLl9fbW9kdWxlQmFzZSArIHJlc291cmNlOworfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXBsdWdpbi1qcy1hcmNoZXR5cGUvLmdpdGlnbm9yZSBiL2dlcnJpdC1wbHVnaW4tanMtYXJjaGV0eXBlLy5naXRpZ25vcmUKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uODBkNjI1NwotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1wbHVnaW4tanMtYXJjaGV0eXBlLy5naXRpZ25vcmUKQEAgLTAsMCArMSw1IEBACisvdGFyZ2V0CisvLmNsYXNzcGF0aAorLy5wcm9qZWN0CisvLnNldHRpbmdzL29yZy5tYXZlbi5pZGUuZWNsaXBzZS5wcmVmcworLy5zZXR0aW5ncy9vcmcuZWNsaXBzZS5tMmUuY29yZS5wcmVmcwpkaWZmIC0tZ2l0IGEvZ2Vycml0LXBsdWdpbi1qcy1hcmNoZXR5cGUvcG9tLnhtbCBiL2dlcnJpdC1wbHVnaW4tanMtYXJjaGV0eXBlL3BvbS54bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMWYwZjUzYQotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1wbHVnaW4tanMtYXJjaGV0eXBlL3BvbS54bWwKQEAgLTAsMCArMSw1MyBAQAorPD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KKzwhLS0KK0NvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisKK0xpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworeW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisKK2h0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorCitVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCitkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCitTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCitsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKy0tPgorPHByb2plY3QgeG1sbnM9Imh0dHA6Ly9tYXZlbi5hcGFjaGUub3JnL1BPTS80LjAuMCIgeG1sbnM6eHNpPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxL1hNTFNjaGVtYS1pbnN0YW5jZSIKKyAgeHNpOnNjaGVtYUxvY2F0aW9uPSJodHRwOi8vbWF2ZW4uYXBhY2hlLm9yZy9QT00vNC4wLjAgaHR0cDovL21hdmVuLmFwYWNoZS5vcmcvbWF2ZW4tdjRfMF8wLnhzZCI+CisgIDxtb2RlbFZlcnNpb24+NC4wLjA8L21vZGVsVmVyc2lvbj4KKworICA8cGFyZW50PgorICAgIDxncm91cElkPmNvbS5nb29nbGUuZ2Vycml0PC9ncm91cElkPgorICAgIDxhcnRpZmFjdElkPmdlcnJpdC1wYXJlbnQ8L2FydGlmYWN0SWQ+CisgICAgPHZlcnNpb24+Mi42LVNOQVBTSE9UPC92ZXJzaW9uPgorICA8L3BhcmVudD4KKworICA8YXJ0aWZhY3RJZD5nZXJyaXQtcGx1Z2luLWpzLWFyY2hldHlwZTwvYXJ0aWZhY3RJZD4KKyAgPG5hbWU+R2Vycml0IENvZGUgUmV2aWV3IC0gV2ViIFVJIEphdmFTY3JpcHQgUGx1Z2luIEFyY2hldHlwZTwvbmFtZT4KKworICA8cHJvcGVydGllcz4KKyAgICA8ZGVmYXVsdEdlcnJpdEFwaVZlcnNpb24+JHtwcm9qZWN0LnZlcnNpb259PC9kZWZhdWx0R2Vycml0QXBpVmVyc2lvbj4KKyAgPC9wcm9wZXJ0aWVzPgorCisgIDxidWlsZD4KKyAgICA8cmVzb3VyY2VzPgorICAgICAgPHJlc291cmNlPgorICAgICAgICA8ZGlyZWN0b3J5PnNyYy9tYWluL3Jlc291cmNlczwvZGlyZWN0b3J5PgorICAgICAgICA8ZmlsdGVyaW5nPnRydWU8L2ZpbHRlcmluZz4KKyAgICAgICAgPGluY2x1ZGVzPgorICAgICAgICAgIDxpbmNsdWRlPk1FVEEtSU5GL21hdmVuL2FyY2hldHlwZS1tZXRhZGF0YS54bWw8L2luY2x1ZGU+CisgICAgICAgIDwvaW5jbHVkZXM+CisgICAgICA8L3Jlc291cmNlPgorICAgICAgPHJlc291cmNlPgorICAgICAgICA8ZGlyZWN0b3J5PnNyYy9tYWluL3Jlc291cmNlczwvZGlyZWN0b3J5PgorICAgICAgICA8ZmlsdGVyaW5nPmZhbHNlPC9maWx0ZXJpbmc+CisgICAgICAgIDxleGNsdWRlcz4KKyAgICAgICAgICA8ZXhjbHVkZT5NRVRBLUlORi9tYXZlbi9hcmNoZXR5cGUtbWV0YWRhdGEueG1sPC9leGNsdWRlPgorICAgICAgICA8L2V4Y2x1ZGVzPgorICAgICAgPC9yZXNvdXJjZT4KKyAgICA8L3Jlc291cmNlcz4KKyAgPC9idWlsZD4KKworPC9wcm9qZWN0PgpkaWZmIC0tZ2l0IGEvZ2Vycml0LXBsdWdpbi1qcy1hcmNoZXR5cGUvc3JjL21haW4vcmVzb3VyY2VzL01FVEEtSU5GL21hdmVuL2FyY2hldHlwZS1tZXRhZGF0YS54bWwgYi9nZXJyaXQtcGx1Z2luLWpzLWFyY2hldHlwZS9zcmMvbWFpbi9yZXNvdXJjZXMvTUVUQS1JTkYvbWF2ZW4vYXJjaGV0eXBlLW1ldGFkYXRhLnhtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4wNTRjYWFlCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXBsdWdpbi1qcy1hcmNoZXR5cGUvc3JjL21haW4vcmVzb3VyY2VzL01FVEEtSU5GL21hdmVuL2FyY2hldHlwZS1tZXRhZGF0YS54bWwKQEAgLTAsMCArMSw2MiBAQAorPD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KKzwhLS0KK0NvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisKK0xpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworeW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisKK2h0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorCitVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCitkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCitTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCitsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKy0tPgorPGFyY2hldHlwZS1kZXNjcmlwdG9yIG5hbWU9IkdlcnJpdCBQbHVnaW4iPgorICA8cmVxdWlyZWRQcm9wZXJ0aWVzPgorICAgIDxyZXF1aXJlZFByb3BlcnR5IGtleT0icGx1Z2luTmFtZSIvPgorCisgICAgPHJlcXVpcmVkUHJvcGVydHkga2V5PSJJbXBsZW1lbnRhdGlvbi1WZW5kb3IiLz4KKyAgICA8cmVxdWlyZWRQcm9wZXJ0eSBrZXk9IkltcGxlbWVudGF0aW9uLVVybCIvPgorCisgICAgPHJlcXVpcmVkUHJvcGVydHkga2V5PSJnZXJyaXRBcGlUeXBlIj4KKyAgICAgIDxkZWZhdWx0VmFsdWU+anM8L2RlZmF1bHRWYWx1ZT4KKyAgICA8L3JlcXVpcmVkUHJvcGVydHk+CisgICAgPHJlcXVpcmVkUHJvcGVydHkga2V5PSJnZXJyaXRBcGlWZXJzaW9uIj4KKyAgICAgIDxkZWZhdWx0VmFsdWU+JHtkZWZhdWx0R2Vycml0QXBpVmVyc2lvbn08L2RlZmF1bHRWYWx1ZT4KKyAgICA8L3JlcXVpcmVkUHJvcGVydHk+CisgIDwvcmVxdWlyZWRQcm9wZXJ0aWVzPgorCisgIDxmaWxlU2V0cz4KKyAgICA8ZmlsZVNldCBmaWx0ZXJlZD0idHJ1ZSIgcGFja2FnZWQ9InRydWUiPgorICAgICAgPGRpcmVjdG9yeT5zcmMvbWFpbi9qYXZhPC9kaXJlY3Rvcnk+CisgICAgICA8aW5jbHVkZXM+CisgICAgICAgIDxpbmNsdWRlPioqLyouamF2YTwvaW5jbHVkZT4KKyAgICAgIDwvaW5jbHVkZXM+CisgICAgPC9maWxlU2V0PgorCisgICAgPGZpbGVTZXQ+CisgICAgICA8ZGlyZWN0b3J5PnNyYy9tYWluL2pzPC9kaXJlY3Rvcnk+CisgICAgICA8aW5jbHVkZXM+CisgICAgICAgIDxpbmNsdWRlPioqLyouanM8L2luY2x1ZGU+CisgICAgICA8L2luY2x1ZGVzPgorICAgIDwvZmlsZVNldD4KKworICAgIDxmaWxlU2V0IGZpbHRlcmVkPSJ0cnVlIj4KKyAgICAgIDxkaXJlY3Rvcnk+c3JjL21haW4vcmVzb3VyY2VzL0RvY3VtZW50YXRpb248L2RpcmVjdG9yeT4KKyAgICAgIDxpbmNsdWRlcz4KKyAgICAgICAgPGluY2x1ZGU+KiovKi5tZDwvaW5jbHVkZT4KKyAgICAgIDwvaW5jbHVkZXM+CisgICAgPC9maWxlU2V0PgorCisgICAgPGZpbGVTZXQ+CisgICAgICA8ZGlyZWN0b3J5PjwvZGlyZWN0b3J5PgorICAgICAgPGluY2x1ZGVzPgorICAgICAgICA8aW5jbHVkZT4uZ2l0aWdub3JlPC9pbmNsdWRlPgorICAgICAgICA8aW5jbHVkZT5MSUNFTlNFPC9pbmNsdWRlPgorICAgICAgPC9pbmNsdWRlcz4KKyAgICA8L2ZpbGVTZXQ+CisgIDwvZmlsZVNldHM+Cis8L2FyY2hldHlwZS1kZXNjcmlwdG9yPgpkaWZmIC0tZ2l0IGEvZ2Vycml0LXBsdWdpbi1qcy1hcmNoZXR5cGUvc3JjL21haW4vcmVzb3VyY2VzL2FyY2hldHlwZS1yZXNvdXJjZXMvLmdpdGlnbm9yZSBiL2dlcnJpdC1wbHVnaW4tanMtYXJjaGV0eXBlL3NyYy9tYWluL3Jlc291cmNlcy9hcmNoZXR5cGUtcmVzb3VyY2VzLy5naXRpZ25vcmUKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uODBkNjI1NwotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1wbHVnaW4tanMtYXJjaGV0eXBlL3NyYy9tYWluL3Jlc291cmNlcy9hcmNoZXR5cGUtcmVzb3VyY2VzLy5naXRpZ25vcmUKQEAgLTAsMCArMSw1IEBACisvdGFyZ2V0CisvLmNsYXNzcGF0aAorLy5wcm9qZWN0CisvLnNldHRpbmdzL29yZy5tYXZlbi5pZGUuZWNsaXBzZS5wcmVmcworLy5zZXR0aW5ncy9vcmcuZWNsaXBzZS5tMmUuY29yZS5wcmVmcwpkaWZmIC0tZ2l0IGEvZ2Vycml0LXBsdWdpbi1qcy1hcmNoZXR5cGUvc3JjL21haW4vcmVzb3VyY2VzL2FyY2hldHlwZS1yZXNvdXJjZXMvTElDRU5TRSBiL2dlcnJpdC1wbHVnaW4tanMtYXJjaGV0eXBlL3NyYy9tYWluL3Jlc291cmNlcy9hcmNoZXR5cGUtcmVzb3VyY2VzL0xJQ0VOU0UKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMTEwNjllZAotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1wbHVnaW4tanMtYXJjaGV0eXBlL3NyYy9tYWluL3Jlc291cmNlcy9hcmNoZXR5cGUtcmVzb3VyY2VzL0xJQ0VOU0UKQEAgLTAsMCArMSwyMDEgQEAKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEFwYWNoZSBMaWNlbnNlCisgICAgICAgICAgICAgICAgICAgICAgICBWZXJzaW9uIDIuMCwgSmFudWFyeSAyMDA0CisgICAgICAgICAgICAgICAgICAgICBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvCisKK1RFUk1TIEFORCBDT05ESVRJT05TIEZPUiBVU0UsIFJFUFJPRFVDVElPTiwgQU5EIERJU1RSSUJVVElPTgorCisxLiBEZWZpbml0aW9ucy4KKworICAgIkxpY2Vuc2UiIHNoYWxsIG1lYW4gdGhlIHRlcm1zIGFuZCBjb25kaXRpb25zIGZvciB1c2UsIHJlcHJvZHVjdGlvbiwKKyAgIGFuZCBkaXN0cmlidXRpb24gYXMgZGVmaW5lZCBieSBTZWN0aW9ucyAxIHRocm91Z2ggOSBvZiB0aGlzIGRvY3VtZW50LgorCisgICAiTGljZW5zb3IiIHNoYWxsIG1lYW4gdGhlIGNvcHlyaWdodCBvd25lciBvciBlbnRpdHkgYXV0aG9yaXplZCBieQorICAgdGhlIGNvcHlyaWdodCBvd25lciB0aGF0IGlzIGdyYW50aW5nIHRoZSBMaWNlbnNlLgorCisgICAiTGVnYWwgRW50aXR5IiBzaGFsbCBtZWFuIHRoZSB1bmlvbiBvZiB0aGUgYWN0aW5nIGVudGl0eSBhbmQgYWxsCisgICBvdGhlciBlbnRpdGllcyB0aGF0IGNvbnRyb2wsIGFyZSBjb250cm9sbGVkIGJ5LCBvciBhcmUgdW5kZXIgY29tbW9uCisgICBjb250cm9sIHdpdGggdGhhdCBlbnRpdHkuIEZvciB0aGUgcHVycG9zZXMgb2YgdGhpcyBkZWZpbml0aW9uLAorICAgImNvbnRyb2wiIG1lYW5zIChpKSB0aGUgcG93ZXIsIGRpcmVjdCBvciBpbmRpcmVjdCwgdG8gY2F1c2UgdGhlCisgICBkaXJlY3Rpb24gb3IgbWFuYWdlbWVudCBvZiBzdWNoIGVudGl0eSwgd2hldGhlciBieSBjb250cmFjdCBvcgorICAgb3RoZXJ3aXNlLCBvciAoaWkpIG93bmVyc2hpcCBvZiBmaWZ0eSBwZXJjZW50ICg1MCUpIG9yIG1vcmUgb2YgdGhlCisgICBvdXRzdGFuZGluZyBzaGFyZXMsIG9yIChpaWkpIGJlbmVmaWNpYWwgb3duZXJzaGlwIG9mIHN1Y2ggZW50aXR5LgorCisgICAiWW91IiAob3IgIllvdXIiKSBzaGFsbCBtZWFuIGFuIGluZGl2aWR1YWwgb3IgTGVnYWwgRW50aXR5CisgICBleGVyY2lzaW5nIHBlcm1pc3Npb25zIGdyYW50ZWQgYnkgdGhpcyBMaWNlbnNlLgorCisgICAiU291cmNlIiBmb3JtIHNoYWxsIG1lYW4gdGhlIHByZWZlcnJlZCBmb3JtIGZvciBtYWtpbmcgbW9kaWZpY2F0aW9ucywKKyAgIGluY2x1ZGluZyBidXQgbm90IGxpbWl0ZWQgdG8gc29mdHdhcmUgc291cmNlIGNvZGUsIGRvY3VtZW50YXRpb24KKyAgIHNvdXJjZSwgYW5kIGNvbmZpZ3VyYXRpb24gZmlsZXMuCisKKyAgICJPYmplY3QiIGZvcm0gc2hhbGwgbWVhbiBhbnkgZm9ybSByZXN1bHRpbmcgZnJvbSBtZWNoYW5pY2FsCisgICB0cmFuc2Zvcm1hdGlvbiBvciB0cmFuc2xhdGlvbiBvZiBhIFNvdXJjZSBmb3JtLCBpbmNsdWRpbmcgYnV0CisgICBub3QgbGltaXRlZCB0byBjb21waWxlZCBvYmplY3QgY29kZSwgZ2VuZXJhdGVkIGRvY3VtZW50YXRpb24sCisgICBhbmQgY29udmVyc2lvbnMgdG8gb3RoZXIgbWVkaWEgdHlwZXMuCisKKyAgICJXb3JrIiBzaGFsbCBtZWFuIHRoZSB3b3JrIG9mIGF1dGhvcnNoaXAsIHdoZXRoZXIgaW4gU291cmNlIG9yCisgICBPYmplY3QgZm9ybSwgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIExpY2Vuc2UsIGFzIGluZGljYXRlZCBieSBhCisgICBjb3B5cmlnaHQgbm90aWNlIHRoYXQgaXMgaW5jbHVkZWQgaW4gb3IgYXR0YWNoZWQgdG8gdGhlIHdvcmsKKyAgIChhbiBleGFtcGxlIGlzIHByb3ZpZGVkIGluIHRoZSBBcHBlbmRpeCBiZWxvdykuCisKKyAgICJEZXJpdmF0aXZlIFdvcmtzIiBzaGFsbCBtZWFuIGFueSB3b3JrLCB3aGV0aGVyIGluIFNvdXJjZSBvciBPYmplY3QKKyAgIGZvcm0sIHRoYXQgaXMgYmFzZWQgb24gKG9yIGRlcml2ZWQgZnJvbSkgdGhlIFdvcmsgYW5kIGZvciB3aGljaCB0aGUKKyAgIGVkaXRvcmlhbCByZXZpc2lvbnMsIGFubm90YXRpb25zLCBlbGFib3JhdGlvbnMsIG9yIG90aGVyIG1vZGlmaWNhdGlvbnMKKyAgIHJlcHJlc2VudCwgYXMgYSB3aG9sZSwgYW4gb3JpZ2luYWwgd29yayBvZiBhdXRob3JzaGlwLiBGb3IgdGhlIHB1cnBvc2VzCisgICBvZiB0aGlzIExpY2Vuc2UsIERlcml2YXRpdmUgV29ya3Mgc2hhbGwgbm90IGluY2x1ZGUgd29ya3MgdGhhdCByZW1haW4KKyAgIHNlcGFyYWJsZSBmcm9tLCBvciBtZXJlbHkgbGluayAob3IgYmluZCBieSBuYW1lKSB0byB0aGUgaW50ZXJmYWNlcyBvZiwKKyAgIHRoZSBXb3JrIGFuZCBEZXJpdmF0aXZlIFdvcmtzIHRoZXJlb2YuCisKKyAgICJDb250cmlidXRpb24iIHNoYWxsIG1lYW4gYW55IHdvcmsgb2YgYXV0aG9yc2hpcCwgaW5jbHVkaW5nCisgICB0aGUgb3JpZ2luYWwgdmVyc2lvbiBvZiB0aGUgV29yayBhbmQgYW55IG1vZGlmaWNhdGlvbnMgb3IgYWRkaXRpb25zCisgICB0byB0aGF0IFdvcmsgb3IgRGVyaXZhdGl2ZSBXb3JrcyB0aGVyZW9mLCB0aGF0IGlzIGludGVudGlvbmFsbHkKKyAgIHN1Ym1pdHRlZCB0byBMaWNlbnNvciBmb3IgaW5jbHVzaW9uIGluIHRoZSBXb3JrIGJ5IHRoZSBjb3B5cmlnaHQgb3duZXIKKyAgIG9yIGJ5IGFuIGluZGl2aWR1YWwgb3IgTGVnYWwgRW50aXR5IGF1dGhvcml6ZWQgdG8gc3VibWl0IG9uIGJlaGFsZiBvZgorICAgdGhlIGNvcHlyaWdodCBvd25lci4gRm9yIHRoZSBwdXJwb3NlcyBvZiB0aGlzIGRlZmluaXRpb24sICJzdWJtaXR0ZWQiCisgICBtZWFucyBhbnkgZm9ybSBvZiBlbGVjdHJvbmljLCB2ZXJiYWwsIG9yIHdyaXR0ZW4gY29tbXVuaWNhdGlvbiBzZW50CisgICB0byB0aGUgTGljZW5zb3Igb3IgaXRzIHJlcHJlc2VudGF0aXZlcywgaW5jbHVkaW5nIGJ1dCBub3QgbGltaXRlZCB0bworICAgY29tbXVuaWNhdGlvbiBvbiBlbGVjdHJvbmljIG1haWxpbmcgbGlzdHMsIHNvdXJjZSBjb2RlIGNvbnRyb2wgc3lzdGVtcywKKyAgIGFuZCBpc3N1ZSB0cmFja2luZyBzeXN0ZW1zIHRoYXQgYXJlIG1hbmFnZWQgYnksIG9yIG9uIGJlaGFsZiBvZiwgdGhlCisgICBMaWNlbnNvciBmb3IgdGhlIHB1cnBvc2Ugb2YgZGlzY3Vzc2luZyBhbmQgaW1wcm92aW5nIHRoZSBXb3JrLCBidXQKKyAgIGV4Y2x1ZGluZyBjb21tdW5pY2F0aW9uIHRoYXQgaXMgY29uc3BpY3VvdXNseSBtYXJrZWQgb3Igb3RoZXJ3aXNlCisgICBkZXNpZ25hdGVkIGluIHdyaXRpbmcgYnkgdGhlIGNvcHlyaWdodCBvd25lciBhcyAiTm90IGEgQ29udHJpYnV0aW9uLiIKKworICAgIkNvbnRyaWJ1dG9yIiBzaGFsbCBtZWFuIExpY2Vuc29yIGFuZCBhbnkgaW5kaXZpZHVhbCBvciBMZWdhbCBFbnRpdHkKKyAgIG9uIGJlaGFsZiBvZiB3aG9tIGEgQ29udHJpYnV0aW9uIGhhcyBiZWVuIHJlY2VpdmVkIGJ5IExpY2Vuc29yIGFuZAorICAgc3Vic2VxdWVudGx5IGluY29ycG9yYXRlZCB3aXRoaW4gdGhlIFdvcmsuCisKKzIuIEdyYW50IG9mIENvcHlyaWdodCBMaWNlbnNlLiBTdWJqZWN0IHRvIHRoZSB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZgorICAgdGhpcyBMaWNlbnNlLCBlYWNoIENvbnRyaWJ1dG9yIGhlcmVieSBncmFudHMgdG8gWW91IGEgcGVycGV0dWFsLAorICAgd29ybGR3aWRlLCBub24tZXhjbHVzaXZlLCBuby1jaGFyZ2UsIHJveWFsdHktZnJlZSwgaXJyZXZvY2FibGUKKyAgIGNvcHlyaWdodCBsaWNlbnNlIHRvIHJlcHJvZHVjZSwgcHJlcGFyZSBEZXJpdmF0aXZlIFdvcmtzIG9mLAorICAgcHVibGljbHkgZGlzcGxheSwgcHVibGljbHkgcGVyZm9ybSwgc3VibGljZW5zZSwgYW5kIGRpc3RyaWJ1dGUgdGhlCisgICBXb3JrIGFuZCBzdWNoIERlcml2YXRpdmUgV29ya3MgaW4gU291cmNlIG9yIE9iamVjdCBmb3JtLgorCiszLiBHcmFudCBvZiBQYXRlbnQgTGljZW5zZS4gU3ViamVjdCB0byB0aGUgdGVybXMgYW5kIGNvbmRpdGlvbnMgb2YKKyAgIHRoaXMgTGljZW5zZSwgZWFjaCBDb250cmlidXRvciBoZXJlYnkgZ3JhbnRzIHRvIFlvdSBhIHBlcnBldHVhbCwKKyAgIHdvcmxkd2lkZSwgbm9uLWV4Y2x1c2l2ZSwgbm8tY2hhcmdlLCByb3lhbHR5LWZyZWUsIGlycmV2b2NhYmxlCisgICAoZXhjZXB0IGFzIHN0YXRlZCBpbiB0aGlzIHNlY3Rpb24pIHBhdGVudCBsaWNlbnNlIHRvIG1ha2UsIGhhdmUgbWFkZSwKKyAgIHVzZSwgb2ZmZXIgdG8gc2VsbCwgc2VsbCwgaW1wb3J0LCBhbmQgb3RoZXJ3aXNlIHRyYW5zZmVyIHRoZSBXb3JrLAorICAgd2hlcmUgc3VjaCBsaWNlbnNlIGFwcGxpZXMgb25seSB0byB0aG9zZSBwYXRlbnQgY2xhaW1zIGxpY2Vuc2FibGUKKyAgIGJ5IHN1Y2ggQ29udHJpYnV0b3IgdGhhdCBhcmUgbmVjZXNzYXJpbHkgaW5mcmluZ2VkIGJ5IHRoZWlyCisgICBDb250cmlidXRpb24ocykgYWxvbmUgb3IgYnkgY29tYmluYXRpb24gb2YgdGhlaXIgQ29udHJpYnV0aW9uKHMpCisgICB3aXRoIHRoZSBXb3JrIHRvIHdoaWNoIHN1Y2ggQ29udHJpYnV0aW9uKHMpIHdhcyBzdWJtaXR0ZWQuIElmIFlvdQorICAgaW5zdGl0dXRlIHBhdGVudCBsaXRpZ2F0aW9uIGFnYWluc3QgYW55IGVudGl0eSAoaW5jbHVkaW5nIGEKKyAgIGNyb3NzLWNsYWltIG9yIGNvdW50ZXJjbGFpbSBpbiBhIGxhd3N1aXQpIGFsbGVnaW5nIHRoYXQgdGhlIFdvcmsKKyAgIG9yIGEgQ29udHJpYnV0aW9uIGluY29ycG9yYXRlZCB3aXRoaW4gdGhlIFdvcmsgY29uc3RpdHV0ZXMgZGlyZWN0CisgICBvciBjb250cmlidXRvcnkgcGF0ZW50IGluZnJpbmdlbWVudCwgdGhlbiBhbnkgcGF0ZW50IGxpY2Vuc2VzCisgICBncmFudGVkIHRvIFlvdSB1bmRlciB0aGlzIExpY2Vuc2UgZm9yIHRoYXQgV29yayBzaGFsbCB0ZXJtaW5hdGUKKyAgIGFzIG9mIHRoZSBkYXRlIHN1Y2ggbGl0aWdhdGlvbiBpcyBmaWxlZC4KKworNC4gUmVkaXN0cmlidXRpb24uIFlvdSBtYXkgcmVwcm9kdWNlIGFuZCBkaXN0cmlidXRlIGNvcGllcyBvZiB0aGUKKyAgIFdvcmsgb3IgRGVyaXZhdGl2ZSBXb3JrcyB0aGVyZW9mIGluIGFueSBtZWRpdW0sIHdpdGggb3Igd2l0aG91dAorICAgbW9kaWZpY2F0aW9ucywgYW5kIGluIFNvdXJjZSBvciBPYmplY3QgZm9ybSwgcHJvdmlkZWQgdGhhdCBZb3UKKyAgIG1lZXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zOgorCisgICAoYSkgWW91IG11c3QgZ2l2ZSBhbnkgb3RoZXIgcmVjaXBpZW50cyBvZiB0aGUgV29yayBvcgorICAgICAgIERlcml2YXRpdmUgV29ya3MgYSBjb3B5IG9mIHRoaXMgTGljZW5zZTsgYW5kCisKKyAgIChiKSBZb3UgbXVzdCBjYXVzZSBhbnkgbW9kaWZpZWQgZmlsZXMgdG8gY2FycnkgcHJvbWluZW50IG5vdGljZXMKKyAgICAgICBzdGF0aW5nIHRoYXQgWW91IGNoYW5nZWQgdGhlIGZpbGVzOyBhbmQKKworICAgKGMpIFlvdSBtdXN0IHJldGFpbiwgaW4gdGhlIFNvdXJjZSBmb3JtIG9mIGFueSBEZXJpdmF0aXZlIFdvcmtzCisgICAgICAgdGhhdCBZb3UgZGlzdHJpYnV0ZSwgYWxsIGNvcHlyaWdodCwgcGF0ZW50LCB0cmFkZW1hcmssIGFuZAorICAgICAgIGF0dHJpYnV0aW9uIG5vdGljZXMgZnJvbSB0aGUgU291cmNlIGZvcm0gb2YgdGhlIFdvcmssCisgICAgICAgZXhjbHVkaW5nIHRob3NlIG5vdGljZXMgdGhhdCBkbyBub3QgcGVydGFpbiB0byBhbnkgcGFydCBvZgorICAgICAgIHRoZSBEZXJpdmF0aXZlIFdvcmtzOyBhbmQKKworICAgKGQpIElmIHRoZSBXb3JrIGluY2x1ZGVzIGEgIk5PVElDRSIgdGV4dCBmaWxlIGFzIHBhcnQgb2YgaXRzCisgICAgICAgZGlzdHJpYnV0aW9uLCB0aGVuIGFueSBEZXJpdmF0aXZlIFdvcmtzIHRoYXQgWW91IGRpc3RyaWJ1dGUgbXVzdAorICAgICAgIGluY2x1ZGUgYSByZWFkYWJsZSBjb3B5IG9mIHRoZSBhdHRyaWJ1dGlvbiBub3RpY2VzIGNvbnRhaW5lZAorICAgICAgIHdpdGhpbiBzdWNoIE5PVElDRSBmaWxlLCBleGNsdWRpbmcgdGhvc2Ugbm90aWNlcyB0aGF0IGRvIG5vdAorICAgICAgIHBlcnRhaW4gdG8gYW55IHBhcnQgb2YgdGhlIERlcml2YXRpdmUgV29ya3MsIGluIGF0IGxlYXN0IG9uZQorICAgICAgIG9mIHRoZSBmb2xsb3dpbmcgcGxhY2VzOiB3aXRoaW4gYSBOT1RJQ0UgdGV4dCBmaWxlIGRpc3RyaWJ1dGVkCisgICAgICAgYXMgcGFydCBvZiB0aGUgRGVyaXZhdGl2ZSBXb3Jrczsgd2l0aGluIHRoZSBTb3VyY2UgZm9ybSBvcgorICAgICAgIGRvY3VtZW50YXRpb24sIGlmIHByb3ZpZGVkIGFsb25nIHdpdGggdGhlIERlcml2YXRpdmUgV29ya3M7IG9yLAorICAgICAgIHdpdGhpbiBhIGRpc3BsYXkgZ2VuZXJhdGVkIGJ5IHRoZSBEZXJpdmF0aXZlIFdvcmtzLCBpZiBhbmQKKyAgICAgICB3aGVyZXZlciBzdWNoIHRoaXJkLXBhcnR5IG5vdGljZXMgbm9ybWFsbHkgYXBwZWFyLiBUaGUgY29udGVudHMKKyAgICAgICBvZiB0aGUgTk9USUNFIGZpbGUgYXJlIGZvciBpbmZvcm1hdGlvbmFsIHB1cnBvc2VzIG9ubHkgYW5kCisgICAgICAgZG8gbm90IG1vZGlmeSB0aGUgTGljZW5zZS4gWW91IG1heSBhZGQgWW91ciBvd24gYXR0cmlidXRpb24KKyAgICAgICBub3RpY2VzIHdpdGhpbiBEZXJpdmF0aXZlIFdvcmtzIHRoYXQgWW91IGRpc3RyaWJ1dGUsIGFsb25nc2lkZQorICAgICAgIG9yIGFzIGFuIGFkZGVuZHVtIHRvIHRoZSBOT1RJQ0UgdGV4dCBmcm9tIHRoZSBXb3JrLCBwcm92aWRlZAorICAgICAgIHRoYXQgc3VjaCBhZGRpdGlvbmFsIGF0dHJpYnV0aW9uIG5vdGljZXMgY2Fubm90IGJlIGNvbnN0cnVlZAorICAgICAgIGFzIG1vZGlmeWluZyB0aGUgTGljZW5zZS4KKworICAgWW91IG1heSBhZGQgWW91ciBvd24gY29weXJpZ2h0IHN0YXRlbWVudCB0byBZb3VyIG1vZGlmaWNhdGlvbnMgYW5kCisgICBtYXkgcHJvdmlkZSBhZGRpdGlvbmFsIG9yIGRpZmZlcmVudCBsaWNlbnNlIHRlcm1zIGFuZCBjb25kaXRpb25zCisgICBmb3IgdXNlLCByZXByb2R1Y3Rpb24sIG9yIGRpc3RyaWJ1dGlvbiBvZiBZb3VyIG1vZGlmaWNhdGlvbnMsIG9yCisgICBmb3IgYW55IHN1Y2ggRGVyaXZhdGl2ZSBXb3JrcyBhcyBhIHdob2xlLCBwcm92aWRlZCBZb3VyIHVzZSwKKyAgIHJlcHJvZHVjdGlvbiwgYW5kIGRpc3RyaWJ1dGlvbiBvZiB0aGUgV29yayBvdGhlcndpc2UgY29tcGxpZXMgd2l0aAorICAgdGhlIGNvbmRpdGlvbnMgc3RhdGVkIGluIHRoaXMgTGljZW5zZS4KKworNS4gU3VibWlzc2lvbiBvZiBDb250cmlidXRpb25zLiBVbmxlc3MgWW91IGV4cGxpY2l0bHkgc3RhdGUgb3RoZXJ3aXNlLAorICAgYW55IENvbnRyaWJ1dGlvbiBpbnRlbnRpb25hbGx5IHN1Ym1pdHRlZCBmb3IgaW5jbHVzaW9uIGluIHRoZSBXb3JrCisgICBieSBZb3UgdG8gdGhlIExpY2Vuc29yIHNoYWxsIGJlIHVuZGVyIHRoZSB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZgorICAgdGhpcyBMaWNlbnNlLCB3aXRob3V0IGFueSBhZGRpdGlvbmFsIHRlcm1zIG9yIGNvbmRpdGlvbnMuCisgICBOb3R3aXRoc3RhbmRpbmcgdGhlIGFib3ZlLCBub3RoaW5nIGhlcmVpbiBzaGFsbCBzdXBlcnNlZGUgb3IgbW9kaWZ5CisgICB0aGUgdGVybXMgb2YgYW55IHNlcGFyYXRlIGxpY2Vuc2UgYWdyZWVtZW50IHlvdSBtYXkgaGF2ZSBleGVjdXRlZAorICAgd2l0aCBMaWNlbnNvciByZWdhcmRpbmcgc3VjaCBDb250cmlidXRpb25zLgorCis2LiBUcmFkZW1hcmtzLiBUaGlzIExpY2Vuc2UgZG9lcyBub3QgZ3JhbnQgcGVybWlzc2lvbiB0byB1c2UgdGhlIHRyYWRlCisgICBuYW1lcywgdHJhZGVtYXJrcywgc2VydmljZSBtYXJrcywgb3IgcHJvZHVjdCBuYW1lcyBvZiB0aGUgTGljZW5zb3IsCisgICBleGNlcHQgYXMgcmVxdWlyZWQgZm9yIHJlYXNvbmFibGUgYW5kIGN1c3RvbWFyeSB1c2UgaW4gZGVzY3JpYmluZyB0aGUKKyAgIG9yaWdpbiBvZiB0aGUgV29yayBhbmQgcmVwcm9kdWNpbmcgdGhlIGNvbnRlbnQgb2YgdGhlIE5PVElDRSBmaWxlLgorCis3LiBEaXNjbGFpbWVyIG9mIFdhcnJhbnR5LiBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IKKyAgIGFncmVlZCB0byBpbiB3cml0aW5nLCBMaWNlbnNvciBwcm92aWRlcyB0aGUgV29yayAoYW5kIGVhY2gKKyAgIENvbnRyaWJ1dG9yIHByb3ZpZGVzIGl0cyBDb250cmlidXRpb25zKSBvbiBhbiAiQVMgSVMiIEJBU0lTLAorICAgV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yCisgICBpbXBsaWVkLCBpbmNsdWRpbmcsIHdpdGhvdXQgbGltaXRhdGlvbiwgYW55IHdhcnJhbnRpZXMgb3IgY29uZGl0aW9ucworICAgb2YgVElUTEUsIE5PTi1JTkZSSU5HRU1FTlQsIE1FUkNIQU5UQUJJTElUWSwgb3IgRklUTkVTUyBGT1IgQQorICAgUEFSVElDVUxBUiBQVVJQT1NFLiBZb3UgYXJlIHNvbGVseSByZXNwb25zaWJsZSBmb3IgZGV0ZXJtaW5pbmcgdGhlCisgICBhcHByb3ByaWF0ZW5lc3Mgb2YgdXNpbmcgb3IgcmVkaXN0cmlidXRpbmcgdGhlIFdvcmsgYW5kIGFzc3VtZSBhbnkKKyAgIHJpc2tzIGFzc29jaWF0ZWQgd2l0aCBZb3VyIGV4ZXJjaXNlIG9mIHBlcm1pc3Npb25zIHVuZGVyIHRoaXMgTGljZW5zZS4KKworOC4gTGltaXRhdGlvbiBvZiBMaWFiaWxpdHkuIEluIG5vIGV2ZW50IGFuZCB1bmRlciBubyBsZWdhbCB0aGVvcnksCisgICB3aGV0aGVyIGluIHRvcnQgKGluY2x1ZGluZyBuZWdsaWdlbmNlKSwgY29udHJhY3QsIG9yIG90aGVyd2lzZSwKKyAgIHVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyAoc3VjaCBhcyBkZWxpYmVyYXRlIGFuZCBncm9zc2x5CisgICBuZWdsaWdlbnQgYWN0cykgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNoYWxsIGFueSBDb250cmlidXRvciBiZQorICAgbGlhYmxlIHRvIFlvdSBmb3IgZGFtYWdlcywgaW5jbHVkaW5nIGFueSBkaXJlY3QsIGluZGlyZWN0LCBzcGVjaWFsLAorICAgaW5jaWRlbnRhbCwgb3IgY29uc2VxdWVudGlhbCBkYW1hZ2VzIG9mIGFueSBjaGFyYWN0ZXIgYXJpc2luZyBhcyBhCisgICByZXN1bHQgb2YgdGhpcyBMaWNlbnNlIG9yIG91dCBvZiB0aGUgdXNlIG9yIGluYWJpbGl0eSB0byB1c2UgdGhlCisgICBXb3JrIChpbmNsdWRpbmcgYnV0IG5vdCBsaW1pdGVkIHRvIGRhbWFnZXMgZm9yIGxvc3Mgb2YgZ29vZHdpbGwsCisgICB3b3JrIHN0b3BwYWdlLCBjb21wdXRlciBmYWlsdXJlIG9yIG1hbGZ1bmN0aW9uLCBvciBhbnkgYW5kIGFsbAorICAgb3RoZXIgY29tbWVyY2lhbCBkYW1hZ2VzIG9yIGxvc3NlcyksIGV2ZW4gaWYgc3VjaCBDb250cmlidXRvcgorICAgaGFzIGJlZW4gYWR2aXNlZCBvZiB0aGUgcG9zc2liaWxpdHkgb2Ygc3VjaCBkYW1hZ2VzLgorCis5LiBBY2NlcHRpbmcgV2FycmFudHkgb3IgQWRkaXRpb25hbCBMaWFiaWxpdHkuIFdoaWxlIHJlZGlzdHJpYnV0aW5nCisgICB0aGUgV29yayBvciBEZXJpdmF0aXZlIFdvcmtzIHRoZXJlb2YsIFlvdSBtYXkgY2hvb3NlIHRvIG9mZmVyLAorICAgYW5kIGNoYXJnZSBhIGZlZSBmb3IsIGFjY2VwdGFuY2Ugb2Ygc3VwcG9ydCwgd2FycmFudHksIGluZGVtbml0eSwKKyAgIG9yIG90aGVyIGxpYWJpbGl0eSBvYmxpZ2F0aW9ucyBhbmQvb3IgcmlnaHRzIGNvbnNpc3RlbnQgd2l0aCB0aGlzCisgICBMaWNlbnNlLiBIb3dldmVyLCBpbiBhY2NlcHRpbmcgc3VjaCBvYmxpZ2F0aW9ucywgWW91IG1heSBhY3Qgb25seQorICAgb24gWW91ciBvd24gYmVoYWxmIGFuZCBvbiBZb3VyIHNvbGUgcmVzcG9uc2liaWxpdHksIG5vdCBvbiBiZWhhbGYKKyAgIG9mIGFueSBvdGhlciBDb250cmlidXRvciwgYW5kIG9ubHkgaWYgWW91IGFncmVlIHRvIGluZGVtbmlmeSwKKyAgIGRlZmVuZCwgYW5kIGhvbGQgZWFjaCBDb250cmlidXRvciBoYXJtbGVzcyBmb3IgYW55IGxpYWJpbGl0eQorICAgaW5jdXJyZWQgYnksIG9yIGNsYWltcyBhc3NlcnRlZCBhZ2FpbnN0LCBzdWNoIENvbnRyaWJ1dG9yIGJ5IHJlYXNvbgorICAgb2YgeW91ciBhY2NlcHRpbmcgYW55IHN1Y2ggd2FycmFudHkgb3IgYWRkaXRpb25hbCBsaWFiaWxpdHkuCisKK0VORCBPRiBURVJNUyBBTkQgQ09ORElUSU9OUworCitBUFBFTkRJWDogSG93IHRvIGFwcGx5IHRoZSBBcGFjaGUgTGljZW5zZSB0byB5b3VyIHdvcmsuCisKKyAgIFRvIGFwcGx5IHRoZSBBcGFjaGUgTGljZW5zZSB0byB5b3VyIHdvcmssIGF0dGFjaCB0aGUgZm9sbG93aW5nCisgICBib2lsZXJwbGF0ZSBub3RpY2UsIHdpdGggdGhlIGZpZWxkcyBlbmNsb3NlZCBieSBicmFja2V0cyAiW10iCisgICByZXBsYWNlZCB3aXRoIHlvdXIgb3duIGlkZW50aWZ5aW5nIGluZm9ybWF0aW9uLiAoRG9uJ3QgaW5jbHVkZQorICAgdGhlIGJyYWNrZXRzISkgIFRoZSB0ZXh0IHNob3VsZCBiZSBlbmNsb3NlZCBpbiB0aGUgYXBwcm9wcmlhdGUKKyAgIGNvbW1lbnQgc3ludGF4IGZvciB0aGUgZmlsZSBmb3JtYXQuIFdlIGFsc28gcmVjb21tZW5kIHRoYXQgYQorICAgZmlsZSBvciBjbGFzcyBuYW1lIGFuZCBkZXNjcmlwdGlvbiBvZiBwdXJwb3NlIGJlIGluY2x1ZGVkIG9uIHRoZQorICAgc2FtZSAicHJpbnRlZCBwYWdlIiBhcyB0aGUgY29weXJpZ2h0IG5vdGljZSBmb3IgZWFzaWVyCisgICBpZGVudGlmaWNhdGlvbiB3aXRoaW4gdGhpcmQtcGFydHkgYXJjaGl2ZXMuCisKK0NvcHlyaWdodCBbeXl5eV0gW25hbWUgb2YgY29weXJpZ2h0IG93bmVyXQorCitMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKK3lvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KK1lvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorCisgICAgaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisKK1VubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKK2Rpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCitXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KK1NlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKK2xpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgpkaWZmIC0tZ2l0IGEvZ2Vycml0LXBsdWdpbi1qcy1hcmNoZXR5cGUvc3JjL21haW4vcmVzb3VyY2VzL2FyY2hldHlwZS1yZXNvdXJjZXMvcG9tLnhtbCBiL2dlcnJpdC1wbHVnaW4tanMtYXJjaGV0eXBlL3NyYy9tYWluL3Jlc291cmNlcy9hcmNoZXR5cGUtcmVzb3VyY2VzL3BvbS54bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uOWZlOGQwZgotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1wbHVnaW4tanMtYXJjaGV0eXBlL3NyYy9tYWluL3Jlc291cmNlcy9hcmNoZXR5cGUtcmVzb3VyY2VzL3BvbS54bWwKQEAgLTAsMCArMSwxMjMgQEAKKzwhLS0KK0NvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisKK0xpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworeW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisKK2h0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorCitVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCitkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCitTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCitsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKy0tPgorPHByb2plY3QgeG1sbnM9Imh0dHA6Ly9tYXZlbi5hcGFjaGUub3JnL1BPTS80LjAuMCIKKyAgeG1sbnM6eHNpPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxL1hNTFNjaGVtYS1pbnN0YW5jZSIKKyAgeHNpOnNjaGVtYUxvY2F0aW9uPSJodHRwOi8vbWF2ZW4uYXBhY2hlLm9yZy9QT00vNC4wLjAgaHR0cDovL21hdmVuLmFwYWNoZS5vcmcvbWF2ZW4tdjRfMF8wLnhzZCI+CisgIDxtb2RlbFZlcnNpb24+NC4wLjA8L21vZGVsVmVyc2lvbj4KKworICA8Z3JvdXBJZD4ke2dyb3VwSWR9PC9ncm91cElkPgorICA8YXJ0aWZhY3RJZD4ke2FydGlmYWN0SWR9PC9hcnRpZmFjdElkPgorICA8cGFja2FnaW5nPmphcjwvcGFja2FnaW5nPgorICA8dmVyc2lvbj4ke3ZlcnNpb259PC92ZXJzaW9uPgorICA8bmFtZT4ke3BsdWdpbk5hbWV9PC9uYW1lPgorCisgIDxwcm9wZXJ0aWVzPgorICAgIDxHZXJyaXQtQXBpVHlwZT4ke2dlcnJpdEFwaVR5cGV9PC9HZXJyaXQtQXBpVHlwZT4KKyAgICA8R2Vycml0LUFwaVZlcnNpb24+JHtnZXJyaXRBcGlWZXJzaW9ufTwvR2Vycml0LUFwaVZlcnNpb24+CisgIDwvcHJvcGVydGllcz4KKworICA8YnVpbGQ+CisgICAgPHBsdWdpbnM+CisgICAgICA8cGx1Z2luPgorICAgICAgICA8Z3JvdXBJZD5vcmcuYXBhY2hlLm1hdmVuLnBsdWdpbnM8L2dyb3VwSWQ+CisgICAgICAgIDxhcnRpZmFjdElkPm1hdmVuLWphci1wbHVnaW48L2FydGlmYWN0SWQ+CisgICAgICAgIDx2ZXJzaW9uPjIuNDwvdmVyc2lvbj4KKyAgICAgICAgPGNvbmZpZ3VyYXRpb24+CisgICAgICAgICAgPGluY2x1ZGVzPgorICAgICAgICAgICAgPGluY2x1ZGU+KiovKi5qczwvaW5jbHVkZT4KKyAgICAgICAgICAgIDxpbmNsdWRlPioqLyouY2xhc3M8L2luY2x1ZGU+CisgICAgICAgICAgPC9pbmNsdWRlcz4KKyAgICAgICAgICA8YXJjaGl2ZT4KKyAgICAgICAgICAgIDxtYW5pZmVzdEVudHJpZXM+CisgICAgICAgICAgICAgIDxHZXJyaXQtTW9kdWxlPiR7cGFja2FnZX0uTW9kdWxlPC9HZXJyaXQtTW9kdWxlPgorCisgICAgICAgICAgICAgIDxJbXBsZW1lbnRhdGlvbi1WZW5kb3I+JHtJbXBsZW1lbnRhdGlvbi1WZW5kb3J9PC9JbXBsZW1lbnRhdGlvbi1WZW5kb3I+CisgICAgICAgICAgICAgIDxJbXBsZW1lbnRhdGlvbi1VUkw+JHtJbXBsZW1lbnRhdGlvbi1Vcmx9PC9JbXBsZW1lbnRhdGlvbi1VUkw+CisKKyAgICAgICAgICAgICAgPEltcGxlbWVudGF0aW9uLVRpdGxlPiR7R2Vycml0LUFwaVR5cGV9ICR7cHJvamVjdC5hcnRpZmFjdElkfTwvSW1wbGVtZW50YXRpb24tVGl0bGU+CisgICAgICAgICAgICAgIDxJbXBsZW1lbnRhdGlvbi1WZXJzaW9uPiR7cHJvamVjdC52ZXJzaW9ufTwvSW1wbGVtZW50YXRpb24tVmVyc2lvbj4KKworICAgICAgICAgICAgICA8R2Vycml0LUFwaVR5cGU+JHtHZXJyaXQtQXBpVHlwZX08L0dlcnJpdC1BcGlUeXBlPgorICAgICAgICAgICAgICA8R2Vycml0LUFwaVZlcnNpb24+JHtHZXJyaXQtQXBpVmVyc2lvbn08L0dlcnJpdC1BcGlWZXJzaW9uPgorICAgICAgICAgICAgPC9tYW5pZmVzdEVudHJpZXM+CisgICAgICAgICAgPC9hcmNoaXZlPgorICAgICAgICA8L2NvbmZpZ3VyYXRpb24+CisgICAgICA8L3BsdWdpbj4KKworICAgICAgPHBsdWdpbj4KKyAgICAgICAgPGdyb3VwSWQ+b3JnLmFwYWNoZS5tYXZlbi5wbHVnaW5zPC9ncm91cElkPgorICAgICAgICA8YXJ0aWZhY3RJZD5tYXZlbi1jb21waWxlci1wbHVnaW48L2FydGlmYWN0SWQ+CisgICAgICAgIDx2ZXJzaW9uPjIuMy4yPC92ZXJzaW9uPgorICAgICAgICA8Y29uZmlndXJhdGlvbj4KKyAgICAgICAgICA8c291cmNlPjEuNjwvc291cmNlPgorICAgICAgICAgIDx0YXJnZXQ+MS42PC90YXJnZXQ+CisgICAgICAgICAgPGVuY29kaW5nPlVURi04PC9lbmNvZGluZz4KKyAgICAgICAgPC9jb25maWd1cmF0aW9uPgorICAgICAgPC9wbHVnaW4+CisKKyAgICAgIDxwbHVnaW4+CisgICAgICAgIDxhcnRpZmFjdElkPm1hdmVuLXJlc291cmNlcy1wbHVnaW48L2FydGlmYWN0SWQ+CisgICAgICAgIDx2ZXJzaW9uPjIuNjwvdmVyc2lvbj4KKyAgICAgICAgPGV4ZWN1dGlvbnM+CisgICAgICAgICAgPGV4ZWN1dGlvbj4KKyAgICAgICAgICAgIDxpZD5jb3B5LXJlc291cmNlczwvaWQ+CisgICAgICAgICAgICA8cGhhc2U+cHJvY2Vzcy1yZXNvdXJjZXM8L3BoYXNlPgorICAgICAgICAgICAgPGdvYWxzPgorICAgICAgICAgICAgICA8Z29hbD5jb3B5LXJlc291cmNlczwvZ29hbD4KKyAgICAgICAgICAgIDwvZ29hbHM+CisgICAgICAgICAgICA8Y29uZmlndXJhdGlvbj4KKyAgICAgICAgICAgICAgPG91dHB1dERpcmVjdG9yeT4ke2Jhc2VkaXJ9L3RhcmdldC9jbGFzc2VzL3N0YXRpYzwvb3V0cHV0RGlyZWN0b3J5PgorICAgICAgICAgICAgICA8cmVzb3VyY2VzPgorICAgICAgICAgICAgICAgIDxyZXNvdXJjZT4KKyAgICAgICAgICAgICAgICAgIDxkaXJlY3Rvcnk+c3JjL21haW4vanM8L2RpcmVjdG9yeT4KKyAgICAgICAgICAgICAgICAgIDxmaWx0ZXJpbmc+dHJ1ZTwvZmlsdGVyaW5nPgorICAgICAgICAgICAgICAgIDwvcmVzb3VyY2U+CisgICAgICAgICAgICAgIDwvcmVzb3VyY2VzPgorICAgICAgICAgICAgPC9jb25maWd1cmF0aW9uPgorICAgICAgICAgIDwvZXhlY3V0aW9uPgorICAgICAgICA8L2V4ZWN1dGlvbnM+CisgICAgICA8L3BsdWdpbj4KKworICAgIDwvcGx1Z2lucz4KKyAgPC9idWlsZD4KKworICA8ZGVwZW5kZW5jaWVzPgorICAgIDxkZXBlbmRlbmN5PgorICAgICAgPGdyb3VwSWQ+Y29tLmdvb2dsZS5nZXJyaXQ8L2dyb3VwSWQ+CisgICAgICA8YXJ0aWZhY3RJZD5nZXJyaXQtJHtHZXJyaXQtQXBpVHlwZX0tYXBpPC9hcnRpZmFjdElkPgorICAgICAgPHZlcnNpb24+JHtHZXJyaXQtQXBpVmVyc2lvbn08L3ZlcnNpb24+CisgICAgICA8c2NvcGU+cHJvdmlkZWQ8L3Njb3BlPgorICAgIDwvZGVwZW5kZW5jeT4KKworICAgIDxkZXBlbmRlbmN5PgorICAgICAgPGdyb3VwSWQ+anVuaXQ8L2dyb3VwSWQ+CisgICAgICA8YXJ0aWZhY3RJZD5qdW5pdDwvYXJ0aWZhY3RJZD4KKyAgICAgIDx2ZXJzaW9uPjQuOC4xPC92ZXJzaW9uPgorICAgICAgPHNjb3BlPnRlc3Q8L3Njb3BlPgorICAgIDwvZGVwZW5kZW5jeT4KKyAgPC9kZXBlbmRlbmNpZXM+CisKKyAgPHJlcG9zaXRvcmllcz4KKyAgICA8cmVwb3NpdG9yeT4KKyAgICAgIDxpZD5nZXJyaXQtYXBpLXJlcG9zaXRvcnk8L2lkPgorI2lmICgkZ2Vycml0QXBpVmVyc2lvbi5lbmRzV2l0aCgiU05BUFNIT1QiKSkKKyAgICAgIDx1cmw+aHR0cHM6Ly9nZXJyaXQtYXBpLmNvbW1vbmRhdGFzdG9yYWdlLmdvb2dsZWFwaXMuY29tL3NuYXBzaG90LzwvdXJsPgorI2Vsc2UKKyAgICAgIDx1cmw+aHR0cHM6Ly9nZXJyaXQtYXBpLmNvbW1vbmRhdGFzdG9yYWdlLmdvb2dsZWFwaXMuY29tL3JlbGVhc2UvPC91cmw+CisjZW5kCisgICAgPC9yZXBvc2l0b3J5PgorICA8L3JlcG9zaXRvcmllcz4KKzwvcHJvamVjdD4KZGlmZiAtLWdpdCBhL2dlcnJpdC1wbHVnaW4tanMtYXJjaGV0eXBlL3NyYy9tYWluL3Jlc291cmNlcy9hcmNoZXR5cGUtcmVzb3VyY2VzL3NyYy9tYWluL2phdmEvTW9kdWxlLmphdmEgYi9nZXJyaXQtcGx1Z2luLWpzLWFyY2hldHlwZS9zcmMvbWFpbi9yZXNvdXJjZXMvYXJjaGV0eXBlLXJlc291cmNlcy9zcmMvbWFpbi9qYXZhL01vZHVsZS5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjA1NmFmZWIKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtcGx1Z2luLWpzLWFyY2hldHlwZS9zcmMvbWFpbi9yZXNvdXJjZXMvYXJjaGV0eXBlLXJlc291cmNlcy9zcmMvbWFpbi9qYXZhL01vZHVsZS5qYXZhCkBAIC0wLDAgKzEsMjYgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSAke3BhY2thZ2V9OworCitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuQWJzdHJhY3RNb2R1bGU7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy53ZWJ1aS5XZWJVaVBsdWdpbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLndlYnVpLkphdmFTY3JpcHRQbHVnaW47CisKK2NsYXNzIE1vZHVsZSBleHRlbmRzIEFic3RyYWN0TW9kdWxlIHsKKyAgQE92ZXJyaWRlCisgIHByb3RlY3RlZCB2b2lkIGNvbmZpZ3VyZSgpIHsKKyAgICBiaW5kKFdlYlVpUGx1Z2luLmNsYXNzKS50b0luc3RhbmNlKG5ldyBKYXZhU2NyaXB0UGx1Z2luKCJoZWxsby1qcy1wbHVnaW5zLmpzIikpOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtcGx1Z2luLWpzLWFyY2hldHlwZS9zcmMvbWFpbi9yZXNvdXJjZXMvYXJjaGV0eXBlLXJlc291cmNlcy9zcmMvbWFpbi9qcy9oZWxsby1qcy1wbHVnaW5zLmpzIGIvZ2Vycml0LXBsdWdpbi1qcy1hcmNoZXR5cGUvc3JjL21haW4vcmVzb3VyY2VzL2FyY2hldHlwZS1yZXNvdXJjZXMvc3JjL21haW4vanMvaGVsbG8tanMtcGx1Z2lucy5qcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5mZDUxYTQyCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXBsdWdpbi1qcy1hcmNoZXR5cGUvc3JjL21haW4vcmVzb3VyY2VzL2FyY2hldHlwZS1yZXNvdXJjZXMvc3JjL21haW4vanMvaGVsbG8tanMtcGx1Z2lucy5qcwpAQCAtMCwwICsxIEBACithbGVydCgiR3JlZXRpbmcgZnJvbSBKYXZhU2NyaXB0IEdlcnJpdCBwbHVnaW4hIik7ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXByZXR0aWZ5L3BvbS54bWwgYi9nZXJyaXQtcHJldHRpZnkvcG9tLnhtbAppbmRleCA5MzU0Mjc0Li40ZGIxMDU2IDEwMDY0NAotLS0gYS9nZXJyaXQtcHJldHRpZnkvcG9tLnhtbAorKysgYi9nZXJyaXQtcHJldHRpZnkvcG9tLnhtbApAQCAtMjIsNyArMjIsNyBAQAogICA8cGFyZW50PgogICAgIDxncm91cElkPmNvbS5nb29nbGUuZ2Vycml0PC9ncm91cElkPgogICAgIDxhcnRpZmFjdElkPmdlcnJpdC1wYXJlbnQ8L2FydGlmYWN0SWQ+Ci0gICAgPHZlcnNpb24+Mi41LVNOQVBTSE9UPC92ZXJzaW9uPgorICAgIDx2ZXJzaW9uPjIuNi1TTkFQU0hPVDwvdmVyc2lvbj4KICAgPC9wYXJlbnQ+CiAKICAgPGFydGlmYWN0SWQ+Z2Vycml0LXByZXR0aWZ5PC9hcnRpZmFjdElkPgpkaWZmIC0tZ2l0IGEvZ2Vycml0LXJldmlld2RiL3BvbS54bWwgYi9nZXJyaXQtcmV2aWV3ZGIvcG9tLnhtbAppbmRleCBmOWZiNDllLi45NjU5OWIzIDEwMDY0NAotLS0gYS9nZXJyaXQtcmV2aWV3ZGIvcG9tLnhtbAorKysgYi9nZXJyaXQtcmV2aWV3ZGIvcG9tLnhtbApAQCAtMjIsNyArMjIsNyBAQAogICA8cGFyZW50PgogICAgIDxncm91cElkPmNvbS5nb29nbGUuZ2Vycml0PC9ncm91cElkPgogICAgIDxhcnRpZmFjdElkPmdlcnJpdC1wYXJlbnQ8L2FydGlmYWN0SWQ+Ci0gICAgPHZlcnNpb24+Mi41LVNOQVBTSE9UPC92ZXJzaW9uPgorICAgIDx2ZXJzaW9uPjIuNi1TTkFQU0hPVDwvdmVyc2lvbj4KICAgPC9wYXJlbnQ+CiAKICAgPGFydGlmYWN0SWQ+Z2Vycml0LXJldmlld2RiPC9hcnRpZmFjdElkPgpkaWZmIC0tZ2l0IGEvZ2Vycml0LXJldmlld2RiL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcmV2aWV3ZGIvY2xpZW50L1BhdGNoLmphdmEgYi9nZXJyaXQtcmV2aWV3ZGIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9yZXZpZXdkYi9jbGllbnQvUGF0Y2guamF2YQppbmRleCAwMGUyODJiLi42ZGRkNmQyIDEwMDY0NAotLS0gYS9nZXJyaXQtcmV2aWV3ZGIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9yZXZpZXdkYi9jbGllbnQvUGF0Y2guamF2YQorKysgYi9nZXJyaXQtcmV2aWV3ZGIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9yZXZpZXdkYi9jbGllbnQvUGF0Y2guamF2YQpAQCAtODQsNyArODQsNyBAQAogICAgIC8qKiBQYXRoIHdhcyBjb3BpZWQgZnJvbSB7QGxpbmsgUGF0Y2gjZ2V0U291cmNlRmlsZU5hbWUoKX0uICovCiAgICAgQ09QSUVEKCdDJyksCiAKLSAgICAvKiogU3VmZmljaWVudCBhbW91bnQgb2YgY29udGVudCBjaGFuZ2VkIHRvIGNsYWltIHRoZSBmaWxlIHdhcyB3cml0dGVuLiAqLworICAgIC8qKiBTdWZmaWNpZW50IGFtb3VudCBvZiBjb250ZW50IGNoYW5nZWQgdG8gY2xhaW0gdGhlIGZpbGUgd2FzIHJld3JpdHRlbi4gKi8KICAgICBSRVdSSVRFKCdXJyk7CiAKICAgICBwcml2YXRlIGZpbmFsIGNoYXIgY29kZTsKZGlmZiAtLWdpdCBhL2dlcnJpdC1yZXZpZXdkYi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3Jldmlld2RiL2NsaWVudC9Qcm9qZWN0LmphdmEgYi9nZXJyaXQtcmV2aWV3ZGIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9yZXZpZXdkYi9jbGllbnQvUHJvamVjdC5qYXZhCmluZGV4IGEyZmM0NmYuLjM4ZDQxYjM2IDEwMDY0NAotLS0gYS9nZXJyaXQtcmV2aWV3ZGIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9yZXZpZXdkYi9jbGllbnQvUHJvamVjdC5qYXZhCisrKyBiL2dlcnJpdC1yZXZpZXdkYi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3Jldmlld2RiL2NsaWVudC9Qcm9qZWN0LmphdmEKQEAgLTcwLDYgKzcwLDggQEAKIAogICAgIE1FUkdFX0lGX05FQ0VTU0FSWSwKIAorICAgIFJFQkFTRV9JRl9ORUNFU1NBUlksCisKICAgICBNRVJHRV9BTFdBWVMsCiAKICAgICBDSEVSUllfUElDSzsKZGlmZiAtLWdpdCBhL2dlcnJpdC1yZXZpZXdkYi9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvcmV2aWV3ZGIvc2VydmVyL2luZGV4X3Bvc3RncmVzLnNxbCBiL2dlcnJpdC1yZXZpZXdkYi9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvcmV2aWV3ZGIvc2VydmVyL2luZGV4X3Bvc3RncmVzLnNxbAppbmRleCAyYzkxZGI0Li42NzVjNWJjIDEwMDY0NAotLS0gYS9nZXJyaXQtcmV2aWV3ZGIvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3Jldmlld2RiL3NlcnZlci9pbmRleF9wb3N0Z3Jlcy5zcWwKKysrIGIvZ2Vycml0LXJldmlld2RiL3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9yZXZpZXdkYi9zZXJ2ZXIvaW5kZXhfcG9zdGdyZXMuc3FsCkBAIC00NywzMCArNDcsNiBAQAogCiBEUk9QIEZVTkNUSU9OIG1ha2VfcGxwZ3NxbCgpOwogCi0tLSBEZWZpbmUgb3VyIHNjaGVtYSB1cGdyYWRlIHN1cHBvcnQgZnVuY3Rpb24uCi0tLQotCi1kZWxpbWl0ZXIgLy8KLQotQ1JFQVRFIE9SIFJFUExBQ0UgRlVOQ1RJT04KLWNoZWNrX3NjaGVtYV92ZXJzaW9uIChleHAgSU5UKQotUkVUVVJOUyBWQVJDSEFSKDI1NSkKLUFTICQkCi1ERUNMQVJFCi0gIGxfYWN0IElOVDsKLUJFR0lOCi0gIFNFTEVDVCB2ZXJzaW9uX25iciBJTlRPIGxfYWN0Ci0gIEZST00gc2NoZW1hX3ZlcnNpb247Ci0KLSAgSUYgbF9hY3QgPD4gZXhwCi0gIFRIRU4KLSAgICBSQUlTRSBFWENFUFRJT04gJ2V4cGVjdGVkIHNjaGVtYSAlLCBmb3VuZCAlJywgZXhwLCBsX2FjdDsKLSAgRU5EIElGOwotICBSRVRVUk4gJ09LJzsKLUVORDsKLSQkIExBTkdVQUdFIHBscGdzcWw7Ci0vLwotCiBkZWxpbWl0ZXIgOwogCiAtLSBJbmRleGVzIHRvIHN1cHBvcnQgQFF1ZXJ5CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3BvbS54bWwgYi9nZXJyaXQtc2VydmVyL3BvbS54bWwKaW5kZXggYWYxODE3My4uMGIxM2ZiZCAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9wb20ueG1sCisrKyBiL2dlcnJpdC1zZXJ2ZXIvcG9tLnhtbApAQCAtMjIsNyArMjIsNyBAQAogICA8cGFyZW50PgogICAgIDxncm91cElkPmNvbS5nb29nbGUuZ2Vycml0PC9ncm91cElkPgogICAgIDxhcnRpZmFjdElkPmdlcnJpdC1wYXJlbnQ8L2FydGlmYWN0SWQ+Ci0gICAgPHZlcnNpb24+Mi41LVNOQVBTSE9UPC92ZXJzaW9uPgorICAgIDx2ZXJzaW9uPjIuNi1TTkFQU0hPVDwvdmVyc2lvbj4KICAgPC9wYXJlbnQ+CiAKICAgPGFydGlmYWN0SWQ+Z2Vycml0LXNlcnZlcjwvYXJ0aWZhY3RJZD4KQEAgLTgwLDcgKzgwLDYgQEAKICAgICA8ZGVwZW5kZW5jeT4KICAgICAgIDxncm91cElkPmJvdW5jeWNhc3RsZTwvZ3JvdXBJZD4KICAgICAgIDxhcnRpZmFjdElkPmJjcGctamRrMTU8L2FydGlmYWN0SWQ+Ci0gICAgICA8dmVyc2lvbj4xNDA8L3ZlcnNpb24+CiAgICAgICA8c2NvcGU+cHJvdmlkZWQ8L3Njb3BlPgogICAgIDwvZGVwZW5kZW5jeT4KIApAQCAtMTYyLDcgKzE2MSw3IEBACiAgICAgPC9kZXBlbmRlbmN5PgogCiAgICAgPGRlcGVuZGVuY3k+Ci0gICAgICA8Z3JvdXBJZD5jb20uZ29vZ2xlLmdlcnJpdDwvZ3JvdXBJZD4KKyAgICAgIDxncm91cElkPmNvbS5nb29nbGVjb2RlLmp1bml2ZXJzYWxjaGFyZGV0PC9ncm91cElkPgogICAgICAgPGFydGlmYWN0SWQ+anVuaXZlcnNhbGNoYXJkZXQ8L2FydGlmYWN0SWQ+CiAgICAgPC9kZXBlbmRlbmN5PgogCmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL0NoYW5nZUhvb2tSdW5uZXIuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vQ2hhbmdlSG9va1J1bm5lci5qYXZhCmluZGV4IDM3YmUyOTMuLjE3N2VjNjUgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vQ2hhbmdlSG9va1J1bm5lci5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vQ2hhbmdlSG9va1J1bm5lci5qYXZhCkBAIC0zOSw4ICszOSwxMCBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5ldmVudHMuQ29tbWVudEFkZGVkRXZlbnQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmV2ZW50cy5EcmFmdFB1Ymxpc2hlZEV2ZW50OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5ldmVudHMuRXZlbnRGYWN0b3J5OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5ldmVudHMuTWVyZ2VGYWlsZWRFdmVudDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZXZlbnRzLlBhdGNoU2V0Q3JlYXRlZEV2ZW50OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5ldmVudHMuUmVmVXBkYXRlZEV2ZW50OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5ldmVudHMuUmV2aWV3ZXJBZGRlZEV2ZW50OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuR2l0UmVwb3NpdG9yeU1hbmFnZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5Xb3JrUXVldWU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuUHJvamVjdENhY2hlOwpAQCAtMTA4LDYgKzExMCw5IEBACiAgICAgLyoqIEZpbGVuYW1lIG9mIHRoZSBjaGFuZ2UgbWVyZ2VkIGhvb2suICovCiAgICAgcHJpdmF0ZSBmaW5hbCBGaWxlIGNoYW5nZU1lcmdlZEhvb2s7CiAKKyAgICAvKiogRmlsZW5hbWUgb2YgdGhlIG1lcmdlIGZhaWxlZCBob29rLiAqLworICAgIHByaXZhdGUgZmluYWwgRmlsZSBtZXJnZUZhaWxlZEhvb2s7CisKICAgICAvKiogRmlsZW5hbWUgb2YgdGhlIGNoYW5nZSBhYmFuZG9uZWQgaG9vay4gKi8KICAgICBwcml2YXRlIGZpbmFsIEZpbGUgY2hhbmdlQWJhbmRvbmVkSG9vazsKIApAQCAtMTE3LDYgKzEyMiw5IEBACiAgICAgLyoqIEZpbGVuYW1lIG9mIHRoZSByZWYgdXBkYXRlZCBob29rLiAqLwogICAgIHByaXZhdGUgZmluYWwgRmlsZSByZWZVcGRhdGVkSG9vazsKIAorICAgIC8qKiBGaWxlbmFtZSBvZiB0aGUgcmV2aWV3ZXIgYWRkZWQgaG9vay4gKi8KKyAgICBwcml2YXRlIGZpbmFsIEZpbGUgcmV2aWV3ZXJBZGRlZEhvb2s7CisKICAgICAvKiogRmlsZW5hbWUgb2YgdGhlIGNsYSBzaWduZWQgaG9vay4gKi8KICAgICBwcml2YXRlIGZpbmFsIEZpbGUgY2xhU2lnbmVkSG9vazsKIApAQCAtMTcwLDkgKzE3OCwxMSBAQAogICAgICAgICBkcmFmdFB1Ymxpc2hlZEhvb2sgPSBzaXRlUGF0aC5yZXNvbHZlKG5ldyBGaWxlKGhvb2tzUGF0aCwgZ2V0VmFsdWUoY29uZmlnLCAiaG9va3MiLCAiZHJhZnRQdWJsaXNoZWRIb29rIiwgImRyYWZ0LXB1Ymxpc2hlZCIpKS5nZXRQYXRoKCkpOwogICAgICAgICBjb21tZW50QWRkZWRIb29rID0gc2l0ZVBhdGgucmVzb2x2ZShuZXcgRmlsZShob29rc1BhdGgsIGdldFZhbHVlKGNvbmZpZywgImhvb2tzIiwgImNvbW1lbnRBZGRlZEhvb2siLCAiY29tbWVudC1hZGRlZCIpKS5nZXRQYXRoKCkpOwogICAgICAgICBjaGFuZ2VNZXJnZWRIb29rID0gc2l0ZVBhdGgucmVzb2x2ZShuZXcgRmlsZShob29rc1BhdGgsIGdldFZhbHVlKGNvbmZpZywgImhvb2tzIiwgImNoYW5nZU1lcmdlZEhvb2siLCAiY2hhbmdlLW1lcmdlZCIpKS5nZXRQYXRoKCkpOworICAgICAgICBtZXJnZUZhaWxlZEhvb2sgPSBzaXRlUGF0aC5yZXNvbHZlKG5ldyBGaWxlKGhvb2tzUGF0aCwgZ2V0VmFsdWUoY29uZmlnLCAiaG9va3MiLCAibWVyZ2VGYWlsZWQiLCAibWVyZ2UtZmFpbGVkIikpLmdldFBhdGgoKSk7CiAgICAgICAgIGNoYW5nZUFiYW5kb25lZEhvb2sgPSBzaXRlUGF0aC5yZXNvbHZlKG5ldyBGaWxlKGhvb2tzUGF0aCwgZ2V0VmFsdWUoY29uZmlnLCAiaG9va3MiLCAiY2hhbmdlQWJhbmRvbmVkSG9vayIsICJjaGFuZ2UtYWJhbmRvbmVkIikpLmdldFBhdGgoKSk7CiAgICAgICAgIGNoYW5nZVJlc3RvcmVkSG9vayA9IHNpdGVQYXRoLnJlc29sdmUobmV3IEZpbGUoaG9va3NQYXRoLCBnZXRWYWx1ZShjb25maWcsICJob29rcyIsICJjaGFuZ2VSZXN0b3JlZEhvb2siLCAiY2hhbmdlLXJlc3RvcmVkIikpLmdldFBhdGgoKSk7CiAgICAgICAgIHJlZlVwZGF0ZWRIb29rID0gc2l0ZVBhdGgucmVzb2x2ZShuZXcgRmlsZShob29rc1BhdGgsIGdldFZhbHVlKGNvbmZpZywgImhvb2tzIiwgInJlZlVwZGF0ZWRIb29rIiwgInJlZi11cGRhdGVkIikpLmdldFBhdGgoKSk7CisgICAgICAgIHJldmlld2VyQWRkZWRIb29rID0gc2l0ZVBhdGgucmVzb2x2ZShuZXcgRmlsZShob29rc1BhdGgsIGdldFZhbHVlKGNvbmZpZywgImhvb2tzIiwgInJldmlld2VyQWRkZWRIb29rIiwgInJldmlld2VyLWFkZGVkIikpLmdldFBhdGgoKSk7CiAgICAgICAgIGNsYVNpZ25lZEhvb2sgPSBzaXRlUGF0aC5yZXNvbHZlKG5ldyBGaWxlKGhvb2tzUGF0aCwgZ2V0VmFsdWUoY29uZmlnLCAiaG9va3MiLCAiY2xhU2lnbmVkSG9vayIsICJjbGEtc2lnbmVkIikpLmdldFBhdGgoKSk7CiAgICAgfQogCkBAIC0zMjQsNiArMzM0LDMwIEBACiAgICAgICAgIHJ1bkhvb2soY2hhbmdlLmdldFByb2plY3QoKSwgY2hhbmdlTWVyZ2VkSG9vaywgYXJncyk7CiAgICAgfQogCisgICAgcHVibGljIHZvaWQgZG9NZXJnZUZhaWxlZEhvb2soZmluYWwgQ2hhbmdlIGNoYW5nZSwgZmluYWwgQWNjb3VudCBhY2NvdW50LAorICAgICAgICAgIGZpbmFsIFBhdGNoU2V0IHBhdGNoU2V0LCBmaW5hbCBTdHJpbmcgcmVhc29uLAorICAgICAgICAgIGZpbmFsIFJldmlld0RiIGRiKSB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKKyAgICAgICAgZmluYWwgTWVyZ2VGYWlsZWRFdmVudCBldmVudCA9IG5ldyBNZXJnZUZhaWxlZEV2ZW50KCk7CisKKyAgICAgICAgZXZlbnQuY2hhbmdlID0gZXZlbnRGYWN0b3J5LmFzQ2hhbmdlQXR0cmlidXRlKGNoYW5nZSk7CisgICAgICAgIGV2ZW50LnN1Ym1pdHRlciA9IGV2ZW50RmFjdG9yeS5hc0FjY291bnRBdHRyaWJ1dGUoYWNjb3VudCk7CisgICAgICAgIGV2ZW50LnBhdGNoU2V0ID0gZXZlbnRGYWN0b3J5LmFzUGF0Y2hTZXRBdHRyaWJ1dGUocGF0Y2hTZXQpOworICAgICAgICBldmVudC5yZWFzb24gPSByZWFzb247CisgICAgICAgIGZpcmVFdmVudChjaGFuZ2UsIGV2ZW50LCBkYik7CisKKyAgICAgICAgZmluYWwgTGlzdDxTdHJpbmc+IGFyZ3MgPSBuZXcgQXJyYXlMaXN0PFN0cmluZz4oKTsKKyAgICAgICAgYWRkQXJnKGFyZ3MsICItLWNoYW5nZSIsIGV2ZW50LmNoYW5nZS5pZCk7CisgICAgICAgIGFkZEFyZyhhcmdzLCAiLS1jaGFuZ2UtdXJsIiwgZXZlbnQuY2hhbmdlLnVybCk7CisgICAgICAgIGFkZEFyZyhhcmdzLCAiLS1wcm9qZWN0IiwgZXZlbnQuY2hhbmdlLnByb2plY3QpOworICAgICAgICBhZGRBcmcoYXJncywgIi0tYnJhbmNoIiwgZXZlbnQuY2hhbmdlLmJyYW5jaCk7CisgICAgICAgIGFkZEFyZyhhcmdzLCAiLS10b3BpYyIsIGV2ZW50LmNoYW5nZS50b3BpYyk7CisgICAgICAgIGFkZEFyZyhhcmdzLCAiLS1zdWJtaXR0ZXIiLCBnZXREaXNwbGF5TmFtZShhY2NvdW50KSk7CisgICAgICAgIGFkZEFyZyhhcmdzLCAiLS1jb21taXQiLCBldmVudC5wYXRjaFNldC5yZXZpc2lvbik7CisgICAgICAgIGFkZEFyZyhhcmdzLCAiLS1yZWFzb24iLCAgcmVhc29uID09IG51bGwgPyAiIiA6IHJlYXNvbik7CisKKyAgICAgICAgcnVuSG9vayhjaGFuZ2UuZ2V0UHJvamVjdCgpLCBtZXJnZUZhaWxlZEhvb2ssIGFyZ3MpOworICAgIH0KKwogICAgIHB1YmxpYyB2b2lkIGRvQ2hhbmdlQWJhbmRvbmVkSG9vayhmaW5hbCBDaGFuZ2UgY2hhbmdlLCBmaW5hbCBBY2NvdW50IGFjY291bnQsCiAgICAgICAgICAgZmluYWwgU3RyaW5nIHJlYXNvbiwgZmluYWwgUmV2aWV3RGIgZGIpIHRocm93cyBPcm1FeGNlcHRpb24gewogICAgICAgICBmaW5hbCBDaGFuZ2VBYmFuZG9uZWRFdmVudCBldmVudCA9IG5ldyBDaGFuZ2VBYmFuZG9uZWRFdmVudCgpOwpAQCAtMzkxLDYgKzQyNSwyNSBAQAogICAgICAgcnVuSG9vayhyZWZOYW1lLmdldFBhcmVudEtleSgpLCByZWZVcGRhdGVkSG9vaywgYXJncyk7CiAgICAgfQogCisgICAgcHVibGljIHZvaWQgZG9SZXZpZXdlckFkZGVkSG9vayhmaW5hbCBDaGFuZ2UgY2hhbmdlLCBmaW5hbCBBY2NvdW50IGFjY291bnQsCisgICAgICAgIGZpbmFsIFBhdGNoU2V0IHBhdGNoU2V0LCBmaW5hbCBSZXZpZXdEYiBkYikgdGhyb3dzIE9ybUV4Y2VwdGlvbiB7CisgICAgICBmaW5hbCBSZXZpZXdlckFkZGVkRXZlbnQgZXZlbnQgPSBuZXcgUmV2aWV3ZXJBZGRlZEV2ZW50KCk7CisKKyAgICAgIGV2ZW50LmNoYW5nZSA9IGV2ZW50RmFjdG9yeS5hc0NoYW5nZUF0dHJpYnV0ZShjaGFuZ2UpOworICAgICAgZXZlbnQucGF0Y2hTZXQgPSBldmVudEZhY3RvcnkuYXNQYXRjaFNldEF0dHJpYnV0ZShwYXRjaFNldCk7CisgICAgICBldmVudC5yZXZpZXdlciA9IGV2ZW50RmFjdG9yeS5hc0FjY291bnRBdHRyaWJ1dGUoYWNjb3VudCk7CisgICAgICBmaXJlRXZlbnQoY2hhbmdlLCBldmVudCwgZGIpOworCisgICAgICBmaW5hbCBMaXN0PFN0cmluZz4gYXJncyA9IG5ldyBBcnJheUxpc3Q8U3RyaW5nPigpOworICAgICAgYWRkQXJnKGFyZ3MsICItLWNoYW5nZSIsIGV2ZW50LmNoYW5nZS5pZCk7CisgICAgICBhZGRBcmcoYXJncywgIi0tY2hhbmdlLXVybCIsIGV2ZW50LmNoYW5nZS51cmwpOworICAgICAgYWRkQXJnKGFyZ3MsICItLXByb2plY3QiLCBldmVudC5jaGFuZ2UucHJvamVjdCk7CisgICAgICBhZGRBcmcoYXJncywgIi0tYnJhbmNoIiwgZXZlbnQuY2hhbmdlLmJyYW5jaCk7CisgICAgICBhZGRBcmcoYXJncywgIi0tcmV2aWV3ZXIiLCBnZXREaXNwbGF5TmFtZShhY2NvdW50KSk7CisKKyAgICAgIHJ1bkhvb2soY2hhbmdlLmdldFByb2plY3QoKSwgcmV2aWV3ZXJBZGRlZEhvb2ssIGFyZ3MpOworICAgIH0KKwogICAgIHB1YmxpYyB2b2lkIGRvQ2xhU2lnbnVwSG9vayhBY2NvdW50IGFjY291bnQsIENvbnRyaWJ1dG9yQWdyZWVtZW50IGNsYSkgewogICAgICAgaWYgKGFjY291bnQgIT0gbnVsbCkgewogICAgICAgICBmaW5hbCBMaXN0PFN0cmluZz4gYXJncyA9IG5ldyBBcnJheUxpc3Q8U3RyaW5nPigpOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9DaGFuZ2VIb29rcy5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9DaGFuZ2VIb29rcy5qYXZhCmluZGV4IDEzNDA1N2QuLjBkOGRmYjggMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vQ2hhbmdlSG9va3MuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL0NoYW5nZUhvb2tzLmphdmEKQEAgLTUwLDcgKzUwLDcgQEAKICAgICogRmlyZSB0aGUgRHJhZnQgUHVibGlzaGVkIEhvb2suCiAgICAqCiAgICAqIEBwYXJhbSBjaGFuZ2UgVGhlIGNoYW5nZSBpdHNlbGYuCi0gICAqIEBwYXJhbSBwYXRjaFNldCBUaGUgUGF0Y2hzZXQgdGhhdCB3YXMgY3JlYXRlZC4KKyAgICogQHBhcmFtIHBhdGNoU2V0IFRoZSBQYXRjaHNldCB0aGF0IHdhcyBwdWJsaXNoZWQuCiAgICAqIEB0aHJvd3MgT3JtRXhjZXB0aW9uCiAgICAqLwogICBwdWJsaWMgdm9pZCBkb0RyYWZ0UHVibGlzaGVkSG9vayhDaGFuZ2UgY2hhbmdlLCBQYXRjaFNldCBwYXRjaFNldCwKQEAgLTgzLDYgKzgzLDE4IEBACiAgICAgICBQYXRjaFNldCBwYXRjaFNldCwgUmV2aWV3RGIgZGIpIHRocm93cyBPcm1FeGNlcHRpb247CiAKICAgLyoqCisgICAqIEZpcmUgdGhlIE1lcmdlIEZhaWxlZCBIb29rLgorICAgKgorICAgKiBAcGFyYW0gY2hhbmdlIFRoZSBjaGFuZ2UgaXRzZWxmLgorICAgKiBAcGFyYW0gYWNjb3VudCBUaGUgZ2Vycml0IHVzZXIgd2hvIGF0dGVtcHRlZCB0byBzdWJtaXQgdGhlIGNoYW5nZS4KKyAgICogQHBhcmFtIHBhdGNoU2V0IFRoZSBwYXRjaHNldCB0aGF0IGZhaWxlZCB0byBtZXJnZS4KKyAgICogQHBhcmFtIHJlYXNvbiBUaGUgcmVhc29uIHRoYXQgdGhlIGNoYW5nZSBmYWlsZWQgdG8gbWVyZ2UuCisgICAqIEB0aHJvd3MgT3JtRXhjZXB0aW9uCisgICAqLworICBwdWJsaWMgdm9pZCBkb01lcmdlRmFpbGVkSG9vayhDaGFuZ2UgY2hhbmdlLCBBY2NvdW50IGFjY291bnQsCisgICAgICBQYXRjaFNldCBwYXRjaFNldCwgU3RyaW5nIHJlYXNvbiwgUmV2aWV3RGIgZGIpIHRocm93cyBPcm1FeGNlcHRpb247CisKKyAgLyoqCiAgICAqIEZpcmUgdGhlIENoYW5nZSBBYmFuZG9uZWQgSG9vay4KICAgICoKICAgICogQHBhcmFtIGNoYW5nZSBUaGUgY2hhbmdlIGl0c2VsZi4KQEAgLTEyNSw1ICsxMzcsMTUgQEAKICAgcHVibGljIHZvaWQgZG9SZWZVcGRhdGVkSG9vayhCcmFuY2guTmFtZUtleSByZWZOYW1lLCBPYmplY3RJZCBvbGRJZCwKICAgICAgIE9iamVjdElkIG5ld0lkLCBBY2NvdW50IGFjY291bnQpOwogCisgIC8qKgorICAgKiBGaXJlIHRoZSBSZXZpZXdlciBBZGRlZCBIb29rCisgICAqCisgICAqIEBwYXJhbSBjaGFuZ2UgVGhlIGNoYW5nZSBpdHNlbGYuCisgICAqIEBwYXJhbSBwYXRjaFNldCBUaGUgcGF0Y2hzZXQgdGhhdCB0aGUgcmV2aWV3ZXIgd2FzIGFkZGVkIG9uLgorICAgKiBAcGFyYW0gYWNjb3VudCBUaGUgZ2Vycml0IHVzZXIgd2hvIHdhcyBhZGRlZCBhcyByZXZpZXdlci4KKyAgICovCisgIHB1YmxpYyB2b2lkIGRvUmV2aWV3ZXJBZGRlZEhvb2soQ2hhbmdlIGNoYW5nZSwgQWNjb3VudCBhY2NvdW50LAorICAgICAgUGF0Y2hTZXQgcGF0Y2hTZXQsIFJldmlld0RiIGRiKSB0aHJvd3MgT3JtRXhjZXB0aW9uOworCiAgIHB1YmxpYyB2b2lkIGRvQ2xhU2lnbnVwSG9vayhBY2NvdW50IGFjY291bnQsIENvbnRyaWJ1dG9yQWdyZWVtZW50IGNsYSk7CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL0Rpc2FibGVkQ2hhbmdlSG9va3MuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vRGlzYWJsZWRDaGFuZ2VIb29rcy5qYXZhCmluZGV4IGYzMGY1ZWEuLjU3Y2NiYTcgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vRGlzYWJsZWRDaGFuZ2VIb29rcy5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vRGlzYWJsZWRDaGFuZ2VIb29rcy5qYXZhCkBAIC00Niw2ICs0NiwxMSBAQAogICB9CiAKICAgQE92ZXJyaWRlCisgIHB1YmxpYyB2b2lkIGRvTWVyZ2VGYWlsZWRIb29rKENoYW5nZSBjaGFuZ2UsIEFjY291bnQgYWNjb3VudCwKKyAgICAgIFBhdGNoU2V0IHBhdGNoU2V0LCBTdHJpbmcgcmVhc29uLCBSZXZpZXdEYiBkYikgeworICB9CisKKyAgQE92ZXJyaWRlCiAgIHB1YmxpYyB2b2lkIGRvQ2hhbmdlUmVzdG9yZWRIb29rKENoYW5nZSBjaGFuZ2UsIEFjY291bnQgYWNjb3VudCwKICAgICAgIFN0cmluZyByZWFzb24sIFJldmlld0RiIGRiKSB7CiAgIH0KQEAgLTgxLDYgKzg2LDExIEBACiAgIH0KIAogICBAT3ZlcnJpZGUKKyAgcHVibGljIHZvaWQgZG9SZXZpZXdlckFkZGVkSG9vayhDaGFuZ2UgY2hhbmdlLCBBY2NvdW50IGFjY291bnQsIFBhdGNoU2V0IHBhdGNoU2V0LAorICAgICAgUmV2aWV3RGIgZGIpIHsKKyAgfQorCisgIEBPdmVycmlkZQogICBwdWJsaWMgdm9pZCByZW1vdmVDaGFuZ2VMaXN0ZW5lcihDaGFuZ2VMaXN0ZW5lciBsaXN0ZW5lcikgewogICB9CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcnVsZXMvUHJlZGljYXRlQ2xhc3NMb2FkZXIuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9ydWxlcy9QcmVkaWNhdGVDbGFzc0xvYWRlci5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmViMmQyNjQKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcnVsZXMvUHJlZGljYXRlQ2xhc3NMb2FkZXIuamF2YQpAQCAtMCwwICsxLDY1IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnJ1bGVzOworCitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5MaW5rZWRIYXNoTXVsdGltYXA7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5NdWx0aW1hcDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlZ2lzdHJhdGlvbi5EeW5hbWljU2V0OworCitpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb247CisKKy8qKgorICogTG9hZHMgdGhlIGNsYXNzZXMgZm9yIFByb2xvZyBwcmVkaWNhdGVzLgorICovCitwdWJsaWMgY2xhc3MgUHJlZGljYXRlQ2xhc3NMb2FkZXIgZXh0ZW5kcyBDbGFzc0xvYWRlciB7CisKKyAgcHJpdmF0ZSBmaW5hbCBNdWx0aW1hcDxTdHJpbmcsIENsYXNzTG9hZGVyPiBwYWNrYWdlQ2xhc3NMb2FkZXJNYXAgPQorICAgICAgTGlua2VkSGFzaE11bHRpbWFwLmNyZWF0ZSgpOworCisgIHB1YmxpYyBQcmVkaWNhdGVDbGFzc0xvYWRlcigKKyAgICAgIGZpbmFsIER5bmFtaWNTZXQ8UHJlZGljYXRlUHJvdmlkZXI+IHByZWRpY2F0ZVByb3ZpZGVycywKKyAgICAgIGZpbmFsIENsYXNzTG9hZGVyIHBhcmVudCkgeworICAgIHN1cGVyKHBhcmVudCk7CisKKyAgICBmb3IgKFByZWRpY2F0ZVByb3ZpZGVyIHByZWRpY2F0ZVByb3ZpZGVyIDogcHJlZGljYXRlUHJvdmlkZXJzKSB7CisgICAgICBmb3IgKFN0cmluZyBwa2cgOiBwcmVkaWNhdGVQcm92aWRlci5nZXRQYWNrYWdlcygpKSB7CisgICAgICAgIHBhY2thZ2VDbGFzc0xvYWRlck1hcC5wdXQocGtnLCBwcmVkaWNhdGVQcm92aWRlci5nZXRDbGFzcygpCisgICAgICAgICAgICAuZ2V0Q2xhc3NMb2FkZXIoKSk7CisgICAgICB9CisgICAgfQorICB9CisKKyAgQE92ZXJyaWRlCisgIHByb3RlY3RlZCBDbGFzczw/PiBmaW5kQ2xhc3MoZmluYWwgU3RyaW5nIGNsYXNzTmFtZSkKKyAgICAgIHRocm93cyBDbGFzc05vdEZvdW5kRXhjZXB0aW9uIHsKKyAgICBmaW5hbCBDb2xsZWN0aW9uPENsYXNzTG9hZGVyPiBjbGFzc0xvYWRlcnMgPQorICAgICAgICBwYWNrYWdlQ2xhc3NMb2FkZXJNYXAuZ2V0KGdldFBhY2thZ2VOYW1lKGNsYXNzTmFtZSkpOworICAgIGZvciAoZmluYWwgQ2xhc3NMb2FkZXIgY2wgOiBjbGFzc0xvYWRlcnMpIHsKKyAgICAgIHRyeSB7CisgICAgICAgIHJldHVybiBDbGFzcy5mb3JOYW1lKGNsYXNzTmFtZSwgdHJ1ZSwgY2wpOworICAgICAgfSBjYXRjaCAoQ2xhc3NOb3RGb3VuZEV4Y2VwdGlvbiBlKSB7CisgICAgICAgIC8vIGlnbm9yZQorICAgICAgfQorICAgIH0KKyAgICB0aHJvdyBuZXcgQ2xhc3NOb3RGb3VuZEV4Y2VwdGlvbihjbGFzc05hbWUpOworICB9CisKKyAgcHJpdmF0ZSBzdGF0aWMgU3RyaW5nIGdldFBhY2thZ2VOYW1lKFN0cmluZyBjbGFzc05hbWUpIHsKKyAgICBmaW5hbCBpbnQgcG9zID0gY2xhc3NOYW1lLmxhc3RJbmRleE9mKCcuJyk7CisgICAgaWYgKHBvcyA8IDApIHsKKyAgICAgIHJldHVybiAiIjsKKyAgICB9CisgICAgcmV0dXJuIGNsYXNzTmFtZS5zdWJzdHJpbmcoMCwgcG9zKTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3J1bGVzL1ByZWRpY2F0ZVByb3ZpZGVyLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcnVsZXMvUHJlZGljYXRlUHJvdmlkZXIuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi40YmQ5NDIzCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3J1bGVzL1ByZWRpY2F0ZVByb3ZpZGVyLmphdmEKQEAgLTAsMCArMSwzNCBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5ydWxlczsKKworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuSW1tdXRhYmxlU2V0OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMuYW5ub3RhdGlvbnMuRXh0ZW5zaW9uUG9pbnQ7CisKK2ltcG9ydCBjb20uZ29vZ2xlY29kZS5wcm9sb2dfY2FmZS5sYW5nLlByZWRpY2F0ZTsKKworLyoqCisgKiBQcm92aWRlcyBhZGRpdGlvbmFsIHBhY2thZ2VzIHRoYXQgY29udGFpbiBQcm9sb2cgcHJlZGljYXRlcyB0aGF0IHNob3VsZCBiZQorICogbWFkZSBhdmFpbGFibGUgaW4gdGhlIFByb2xvZyBlbnZpcm9ubWVudC4gVGhlIHByZWRpY2F0ZXMgY2FuIGUuZy4gYmUgdXNlZCBpbgorICogdGhlIHByb2plY3Qgc3VibWl0IHJ1bGVzLgorICoKKyAqIEVhY2ggSmF2YSBjbGFzcyBkZWZpbmluZyBhIFByb2xvZyBwcmVkaWNhdGUgbXVzdCBiZSBpbiBvbmUgb2YgdGhlIHByb3ZpZGVkCisgKiBwYWNrYWdlcyBhbmQgaXRzIG5hbWUgbXVzdCBhcHBseSB0byB0aGUgJ1BSRURfW2Z1bmN0b3JdX1thcml0eV0nIGZvcm1hdC4gSW4KKyAqIGFkZGl0aW9uIGl0IG11c3QgZXh0ZW5kIHtAbGluayBQcmVkaWNhdGV9LgorICovCitARXh0ZW5zaW9uUG9pbnQKK3B1YmxpYyBpbnRlcmZhY2UgUHJlZGljYXRlUHJvdmlkZXIgeworICAvKiogUmV0dXJuIHNldCBvZiBwYWNrYWdlcyB0aGF0IGNvbnRhaW4gUHJvbG9nIHByZWRpY2F0ZXMgKi8KKyAgcHVibGljIEltbXV0YWJsZVNldDxTdHJpbmc+IGdldFBhY2thZ2VzKCk7Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcnVsZXMvUHJvbG9nTW9kdWxlLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcnVsZXMvUHJvbG9nTW9kdWxlLmphdmEKaW5kZXggZDM2MTc5MC4uOTJiOGIxYiAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3J1bGVzL1Byb2xvZ01vZHVsZS5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9ydWxlcy9Qcm9sb2dNb2R1bGUuamF2YQpAQCAtMTQsMTEgKzE0LDEzIEBACiAKIHBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQucnVsZXM7CiAKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlZ2lzdHJhdGlvbi5EeW5hbWljU2V0OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuRmFjdG9yeU1vZHVsZTsKIAogcHVibGljIGNsYXNzIFByb2xvZ01vZHVsZSBleHRlbmRzIEZhY3RvcnlNb2R1bGUgewogICBAT3ZlcnJpZGUKICAgcHJvdGVjdGVkIHZvaWQgY29uZmlndXJlKCkgeworICAgIER5bmFtaWNTZXQuc2V0T2YoYmluZGVyKCksIFByZWRpY2F0ZVByb3ZpZGVyLmNsYXNzKTsKICAgICBmYWN0b3J5KFByb2xvZ0Vudmlyb25tZW50LkZhY3RvcnkuY2xhc3MpOwogICB9CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcnVsZXMvUnVsZXNDYWNoZS5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3J1bGVzL1J1bGVzQ2FjaGUuamF2YQppbmRleCBmYmVlMTQ1Li4zYjM1NjI2IDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcnVsZXMvUnVsZXNDYWNoZS5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9ydWxlcy9SdWxlc0NhY2hlLmphdmEKQEAgLTE2LDYgKzE2LDkgQEAKIAogaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlY29kZS5wcm9sb2dfY2FmZS5sYW5nLlByb2xvZ01hY2hpbmVDb3B5LnNhdmU7CiAKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0LkltbXV0YWJsZUxpc3Q7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5MaXN0czsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlZ2lzdHJhdGlvbi5EeW5hbWljU2V0OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5Qcm9qZWN0OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuR2Vycml0U2VydmVyQ29uZmlnOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuU2l0ZVBhdGhzOwpAQCAtNTIsNiArNTUsNyBAQAogaW1wb3J0IGphdmEubmV0LlVSTENsYXNzTG9hZGVyOwogaW1wb3J0IGphdmEudXRpbC5FbnVtU2V0OwogaW1wb3J0IGphdmEudXRpbC5IYXNoTWFwOworaW1wb3J0IGphdmEudXRpbC5MaXN0OwogaW1wb3J0IGphdmEudXRpbC5NYXA7CiAKIC8qKgpAQCAtNjksMTAgKzczLDggQEAKICAgLyoqIERlZmF1bHQgc2l6ZSBvZiB0aGUgaW50ZXJuYWwgUHJvbG9nIGRhdGFiYXNlIHdpdGhpbiBlYWNoIGludGVycHJldGVyLiAqLwogICBwcml2YXRlIHN0YXRpYyBmaW5hbCBpbnQgREJfTUFYID0gMjU2OwogCi0gIHByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZ1tdIFBBQ0tBR0VfTElTVCA9IHsKLSAgICAgIFByb2xvZy5CVUlMVElOLAotICAgICAgImdlcnJpdCIsCi0gICAgfTsKKyAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgTGlzdDxTdHJpbmc+IFBBQ0tBR0VfTElTVCA9IEltbXV0YWJsZUxpc3Qub2YoCisgICAgICBQcm9sb2cuQlVJTFRJTiwgImdlcnJpdCIpOwogCiAgIHByaXZhdGUgZmluYWwgTWFwPE9iamVjdElkLCBNYWNoaW5lUmVmPiBtYWNoaW5lQ2FjaGUgPQogICAgICAgbmV3IEhhc2hNYXA8T2JqZWN0SWQsIE1hY2hpbmVSZWY+KCk7CkBAIC05NCwxNiArOTYsMTggQEAKICAgcHJpdmF0ZSBmaW5hbCBGaWxlIGNhY2hlRGlyOwogICBwcml2YXRlIGZpbmFsIEZpbGUgcnVsZXNEaXI7CiAgIHByaXZhdGUgZmluYWwgR2l0UmVwb3NpdG9yeU1hbmFnZXIgZ2l0TWdyOworICBwcml2YXRlIGZpbmFsIER5bmFtaWNTZXQ8UHJlZGljYXRlUHJvdmlkZXI+IHByZWRpY2F0ZVByb3ZpZGVyczsKICAgcHJpdmF0ZSBmaW5hbCBDbGFzc0xvYWRlciBzeXN0ZW1Mb2FkZXI7CiAgIHByaXZhdGUgZmluYWwgUHJvbG9nTWFjaGluZUNvcHkgZGVmYXVsdE1hY2hpbmU7CiAKICAgQEluamVjdAogICBwcm90ZWN0ZWQgUnVsZXNDYWNoZShAR2Vycml0U2VydmVyQ29uZmlnIENvbmZpZyBjb25maWcsIFNpdGVQYXRocyBzaXRlLAotICAgICAgR2l0UmVwb3NpdG9yeU1hbmFnZXIgZ20pIHsKKyAgICAgIEdpdFJlcG9zaXRvcnlNYW5hZ2VyIGdtLCBEeW5hbWljU2V0PFByZWRpY2F0ZVByb3ZpZGVyPiBwcmVkaWNhdGVQcm92aWRlcnMpIHsKICAgICBlbmFibGVQcm9qZWN0UnVsZXMgPSBjb25maWcuZ2V0Qm9vbGVhbigicnVsZXMiLCBudWxsLCAiZW5hYmxlIiwgdHJ1ZSk7CiAgICAgY2FjaGVEaXIgPSBzaXRlLnJlc29sdmUoY29uZmlnLmdldFN0cmluZygiY2FjaGUiLCBudWxsLCAiZGlyZWN0b3J5IikpOwogICAgIHJ1bGVzRGlyID0gY2FjaGVEaXIgIT0gbnVsbCA/IG5ldyBGaWxlKGNhY2hlRGlyLCAicnVsZXMiKSA6IG51bGw7CiAgICAgZ2l0TWdyID0gZ207CisgICAgdGhpcy5wcmVkaWNhdGVQcm92aWRlcnMgPSBwcmVkaWNhdGVQcm92aWRlcnM7CiAKICAgICBzeXN0ZW1Mb2FkZXIgPSBnZXRDbGFzcygpLmdldENsYXNzTG9hZGVyKCk7CiAgICAgZGVmYXVsdE1hY2hpbmUgPSBzYXZlKG5ld0VtcHR5TWFjaGluZShzeXN0ZW1Mb2FkZXIpKTsKQEAgLTIwNywxNSArMjExLDIyIEBACiAgICAgfQogICB9CiAKLSAgcHJpdmF0ZSBzdGF0aWMgQnVmZmVyaW5nUHJvbG9nQ29udHJvbCBuZXdFbXB0eU1hY2hpbmUoQ2xhc3NMb2FkZXIgY2wpIHsKKyAgcHJpdmF0ZSBCdWZmZXJpbmdQcm9sb2dDb250cm9sIG5ld0VtcHR5TWFjaGluZShDbGFzc0xvYWRlciBjbCkgewogICAgIEJ1ZmZlcmluZ1Byb2xvZ0NvbnRyb2wgY3RsID0gbmV3IEJ1ZmZlcmluZ1Byb2xvZ0NvbnRyb2woKTsKICAgICBjdGwuc2V0TWF4QXJpdHkoUHJvbG9nRW52aXJvbm1lbnQuTUFYX0FSSVRZKTsKICAgICBjdGwuc2V0TWF4RGF0YWJhc2VTaXplKERCX01BWCk7Ci0gICAgY3RsLnNldFByb2xvZ0NsYXNzTG9hZGVyKG5ldyBQcm9sb2dDbGFzc0xvYWRlcihjbCkpOworICAgIGN0bC5zZXRQcm9sb2dDbGFzc0xvYWRlcihuZXcgUHJvbG9nQ2xhc3NMb2FkZXIobmV3IFByZWRpY2F0ZUNsYXNzTG9hZGVyKAorICAgICAgICBwcmVkaWNhdGVQcm92aWRlcnMsIGNsKSkpOwogICAgIGN0bC5zZXRFbmFibGVkKEVudW1TZXQuYWxsT2YoUHJvbG9nLkZlYXR1cmUuY2xhc3MpLCBmYWxzZSk7CiAKKyAgICBMaXN0PFN0cmluZz4gcGFja2FnZXMgPSBMaXN0cy5uZXdBcnJheUxpc3QoKTsKKyAgICBwYWNrYWdlcy5hZGRBbGwoUEFDS0FHRV9MSVNUKTsKKyAgICBmb3IgKFByZWRpY2F0ZVByb3ZpZGVyIHByZWRpY2F0ZVByb3ZpZGVyIDogcHJlZGljYXRlUHJvdmlkZXJzKSB7CisgICAgICBwYWNrYWdlcy5hZGRBbGwocHJlZGljYXRlUHJvdmlkZXIuZ2V0UGFja2FnZXMoKSk7CisgICAgfQorCiAgICAgLy8gQm9vdHN0cmFwIHRoZSBpbnRlcnByZXRlciBhbmQgZW5zdXJlIHRoZXJlIGlzIGNsZWFuIHN0YXRlLgotICAgIGN0bC5pbml0aWFsaXplKFBBQ0tBR0VfTElTVCk7CisgICAgY3RsLmluaXRpYWxpemUocGFja2FnZXMudG9BcnJheShuZXcgU3RyaW5nW3BhY2thZ2VzLnNpemUoKV0pKTsKICAgICByZXR1cm4gY3RsOwogICB9CiAKZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvQ2hhbmdlVXRpbC5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9DaGFuZ2VVdGlsLmphdmEKaW5kZXggNTM1YWQ4ZS4uNDVkYmE0ZSAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9DaGFuZ2VVdGlsLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9DaGFuZ2VVdGlsLmphdmEKQEAgLTE0LDE3ICsxNCwxMSBAQAogCiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlcjsKIAotaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuU2V0czsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uQ2hhbmdlSG9va1J1bm5lcjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uQ2hhbmdlSG9va3M7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQ2hhbmdlLlN0YXR1czsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQ2hhbmdlTWVzc2FnZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0QW5jZXN0b3I7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0QXBwcm92YWw7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0SW5mbzsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUmV2SWQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlRyYWNraW5nSWQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuc2VydmVyLlJldmlld0RiOwpAQCAtMzQsMTUgKzI4LDEwIEBACiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5HaXRSZXBvc2l0b3J5TWFuYWdlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0Lk1lcmdlT3A7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLm1haWwuRW1haWxFeGNlcHRpb247Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLm1haWwuUmViYXNlZFBhdGNoU2V0U2VuZGVyOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5tYWlsLlJlcGxhY2VQYXRjaFNldFNlbmRlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIubWFpbC5SZXBseVRvQ2hhbmdlU2VuZGVyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5tYWlsLlJldmVydGVkU2VuZGVyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wYXRjaC5QYXRjaFNldEluZm9GYWN0b3J5OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LkNoYW5nZUNvbnRyb2w7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuSW52YWxpZENoYW5nZU9wZXJhdGlvbkV4Y2VwdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5Ob1N1Y2hDaGFuZ2VFeGNlcHRpb247Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLkF0b21pY1VwZGF0ZTsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtQ29uY3VycmVuY3lFeGNlcHRpb247CiBpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLk9ybUV4Y2VwdGlvbjsKIApAQCAtNTMsMTEgKzQyLDggQEAKIGltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5PYmplY3RJZDsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5PYmplY3RJbnNlcnRlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5QZXJzb25JZGVudDsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5SZWY7CiBpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuUmVmVXBkYXRlOwogaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLlJlcG9zaXRvcnk7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5tZXJnZS5NZXJnZVN0cmF0ZWd5OwotaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubWVyZ2UuVGhyZWVXYXlNZXJnZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5yZXZ3YWxrLkZvb3RlckxpbmU7CiBpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5yZXZ3YWxrLlJldkNvbW1pdDsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LnJldndhbGsuUmV2V2FsazsKQEAgLTY4LDkgKzU0LDcgQEAKIGltcG9ydCBvcmcuc2xmNGouTG9nZ2VyRmFjdG9yeTsKIAogaW1wb3J0IGphdmEuaW8uSU9FeGNlcHRpb247Ci1pbXBvcnQgamF2YS5zcWwuVGltZXN0YW1wOwogaW1wb3J0IGphdmEudXRpbC5BcnJheUxpc3Q7Ci1pbXBvcnQgamF2YS51dGlsLkFycmF5czsKIGltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbnM7CiBpbXBvcnQgamF2YS51dGlsLkhhc2hTZXQ7CiBpbXBvcnQgamF2YS51dGlsLkxpc3Q7CkBAIC0xOTMsMjcwICsxNzcsNiBAQAogICAgIGRiLnBhdGNoU2V0QW5jZXN0b3JzKCkuaW5zZXJ0KHRvSW5zZXJ0KTsKICAgfQogCi0gIC8qKgotICAgKiBSZWJhc2VzIGEgY29tbWl0Ci0gICAqCi0gICAqIEBwYXJhbSBnaXQgUmVwb3NpdG9yeSB0byBmaW5kIGNvbW1pdHMgaW4KLSAgICogQHBhcmFtIGluc2VydGVyIGluc2VydGVyIHRvIGhhbmRsZSBuZXcgdHJlZXMgYW5kIGJsb2JzLgotICAgKiBAcGFyYW0gb3JpZ2luYWwgVGhlIGNvbW1pdCB0byByZWJhc2UKLSAgICogQHBhcmFtIGJhc2UgQmFzZSB0byByZWJhc2UgYWdhaW5zdAotICAgKiBAcmV0dXJuIENvbW1pdEJ1aWxkZXIgdGhlIG5ld2x5IHJlYmFzZWQgY29tbWl0Ci0gICAqIEB0aHJvd3MgSU9FeGNlcHRpb24gTWVyZ2VkIGZhaWxlZAotICAgKi8KLSAgcHVibGljIHN0YXRpYyBDb21taXRCdWlsZGVyIHJlYmFzZUNvbW1pdChSZXBvc2l0b3J5IGdpdCwKLSAgICAgIGZpbmFsIE9iamVjdEluc2VydGVyIGluc2VydGVyLCBSZXZDb21taXQgb3JpZ2luYWwsIFJldkNvbW1pdCBiYXNlLAotICAgICAgUGVyc29uSWRlbnQgY29tbWl0dGVySWRlbnQpIHRocm93cyBJT0V4Y2VwdGlvbiB7Ci0KLSAgICBpZiAob3JpZ2luYWwuZ2V0UGFyZW50Q291bnQoKSA9PSAwKSB7Ci0gICAgICB0aHJvdyBuZXcgSU9FeGNlcHRpb24oCi0gICAgICAgICAgIkNvbW1pdHMgd2l0aCBubyBwYXJlbnRzIGNhbm5vdCBiZSByZWJhc2VkIChpcyB0aGlzIHRoZSBpbml0aWFsIGNvbW1pdD8pLiIpOwotICAgIH0KLQotICAgIGlmIChvcmlnaW5hbC5nZXRQYXJlbnRDb3VudCgpID4gMSkgewotICAgICAgdGhyb3cgbmV3IElPRXhjZXB0aW9uKAotICAgICAgICAgICJQYXRjaCBzZXRzIHdpdGggbXVsdGlwbGUgcGFyZW50cyBjYW5ub3QgYmUgcmViYXNlZCAobWVyZ2UgY29tbWl0cykuIgotICAgICAgICAgICAgICArICIgUGFyZW50czogIiArIEFycmF5cy50b1N0cmluZyhvcmlnaW5hbC5nZXRQYXJlbnRzKCkpKTsKLSAgICB9Ci0KLSAgICBmaW5hbCBSZXZDb21taXQgcGFyZW50Q29tbWl0ID0gb3JpZ2luYWwuZ2V0UGFyZW50KDApOwotCi0gICAgaWYgKGJhc2UuZXF1YWxzKHBhcmVudENvbW1pdCkpIHsKLSAgICAgIHRocm93IG5ldyBJT0V4Y2VwdGlvbigiQ2hhbmdlIGlzIGFscmVhZHkgdXAgdG8gZGF0ZS4iKTsKLSAgICB9Ci0KLSAgICBmaW5hbCBUaHJlZVdheU1lcmdlciBtZXJnZXIgPSBNZXJnZVN0cmF0ZWd5LlJFU09MVkUubmV3TWVyZ2VyKGdpdCwgdHJ1ZSk7Ci0gICAgbWVyZ2VyLnNldE9iamVjdEluc2VydGVyKG5ldyBPYmplY3RJbnNlcnRlci5GaWx0ZXIoKSB7Ci0gICAgICBAT3ZlcnJpZGUKLSAgICAgIHByb3RlY3RlZCBPYmplY3RJbnNlcnRlciBkZWxlZ2F0ZSgpIHsKLSAgICAgICAgcmV0dXJuIGluc2VydGVyOwotICAgICAgfQotCi0gICAgICBAT3ZlcnJpZGUKLSAgICAgIHB1YmxpYyB2b2lkIGZsdXNoKCkgewotICAgICAgfQotCi0gICAgICBAT3ZlcnJpZGUKLSAgICAgIHB1YmxpYyB2b2lkIHJlbGVhc2UoKSB7Ci0gICAgICB9Ci0gICAgfSk7Ci0gICAgbWVyZ2VyLnNldEJhc2UocGFyZW50Q29tbWl0KTsKLSAgICBtZXJnZXIubWVyZ2Uob3JpZ2luYWwsIGJhc2UpOwotCi0gICAgaWYgKG1lcmdlci5nZXRSZXN1bHRUcmVlSWQoKSA9PSBudWxsKSB7Ci0gICAgICB0aHJvdyBuZXcgSU9FeGNlcHRpb24oCi0gICAgICAgICAgIlRoZSByZWJhc2UgZmFpbGVkIHNpbmNlIGNvbmZsaWN0cyBvY2N1cmVkIGR1cmluZyB0aGUgbWVyZ2UuIik7Ci0gICAgfQotCi0gICAgZmluYWwgQ29tbWl0QnVpbGRlciByZWJhc2VkQ29tbWl0QnVpbGRlciA9IG5ldyBDb21taXRCdWlsZGVyKCk7Ci0KLSAgICByZWJhc2VkQ29tbWl0QnVpbGRlci5zZXRUcmVlSWQobWVyZ2VyLmdldFJlc3VsdFRyZWVJZCgpKTsKLSAgICByZWJhc2VkQ29tbWl0QnVpbGRlci5zZXRQYXJlbnRJZChiYXNlKTsKLSAgICByZWJhc2VkQ29tbWl0QnVpbGRlci5zZXRBdXRob3Iob3JpZ2luYWwuZ2V0QXV0aG9ySWRlbnQoKSk7Ci0gICAgcmViYXNlZENvbW1pdEJ1aWxkZXIuc2V0TWVzc2FnZShvcmlnaW5hbC5nZXRGdWxsTWVzc2FnZSgpKTsKLSAgICByZWJhc2VkQ29tbWl0QnVpbGRlci5zZXRDb21taXR0ZXIoY29tbWl0dGVySWRlbnQpOwotCi0gICAgcmV0dXJuIHJlYmFzZWRDb21taXRCdWlsZGVyOwotICB9Ci0KLSAgcHVibGljIHN0YXRpYyB2b2lkIHJlYmFzZUNoYW5nZShmaW5hbCBQYXRjaFNldC5JZCBwYXRjaFNldElkLAotICAgICAgZmluYWwgSWRlbnRpZmllZFVzZXIgdXNlciwgZmluYWwgUmV2aWV3RGIgZGIsCi0gICAgICBSZWJhc2VkUGF0Y2hTZXRTZW5kZXIuRmFjdG9yeSByZWJhc2VkUGF0Y2hTZXRTZW5kZXJGYWN0b3J5LAotICAgICAgZmluYWwgQ2hhbmdlSG9va1J1bm5lciBob29rcywgR2l0UmVwb3NpdG9yeU1hbmFnZXIgZ2l0TWFuYWdlciwKLSAgICAgIGZpbmFsIFBhdGNoU2V0SW5mb0ZhY3RvcnkgcGF0Y2hTZXRJbmZvRmFjdG9yeSwKLSAgICAgIGZpbmFsIEdpdFJlZmVyZW5jZVVwZGF0ZWQgcmVwbGljYXRpb24sIFBlcnNvbklkZW50IG15SWRlbnQsCi0gICAgICBmaW5hbCBDaGFuZ2VDb250cm9sLkZhY3RvcnkgY2hhbmdlQ29udHJvbEZhY3RvcnksCi0gICAgICBmaW5hbCBBcHByb3ZhbHNVdGlsIGFwcHJvdmFsc1V0aWwpIHRocm93cyBOb1N1Y2hDaGFuZ2VFeGNlcHRpb24sCi0gICAgICBFbWFpbEV4Y2VwdGlvbiwgT3JtRXhjZXB0aW9uLCBNaXNzaW5nT2JqZWN0RXhjZXB0aW9uLAotICAgICAgSW5jb3JyZWN0T2JqZWN0VHlwZUV4Y2VwdGlvbiwgSU9FeGNlcHRpb24sCi0gICAgICBJbnZhbGlkQ2hhbmdlT3BlcmF0aW9uRXhjZXB0aW9uIHsKLQotICAgIGZpbmFsIENoYW5nZS5JZCBjaGFuZ2VJZCA9IHBhdGNoU2V0SWQuZ2V0UGFyZW50S2V5KCk7Ci0gICAgZmluYWwgQ2hhbmdlQ29udHJvbCBjaGFuZ2VDb250cm9sID0KLSAgICAgICAgY2hhbmdlQ29udHJvbEZhY3RvcnkudmFsaWRhdGVGb3IoY2hhbmdlSWQpOwotCi0gICAgaWYgKCFjaGFuZ2VDb250cm9sLmNhblJlYmFzZSgpKSB7Ci0gICAgICB0aHJvdyBuZXcgSW52YWxpZENoYW5nZU9wZXJhdGlvbkV4Y2VwdGlvbigKLSAgICAgICAgICAiQ2Fubm90IHJlYmFzZTogTmV3IHBhdGNoIHNldHMgYXJlIG5vdCBhbGxvd2VkIHRvIGJlIGFkZGVkIHRvIGNoYW5nZTogIgotICAgICAgICAgICAgICArIGNoYW5nZUlkLnRvU3RyaW5nKCkpOwotICAgIH0KLQotICAgIENoYW5nZSBjaGFuZ2UgPSBjaGFuZ2VDb250cm9sLmdldENoYW5nZSgpOwotICAgIGZpbmFsIFJlcG9zaXRvcnkgZ2l0ID0gZ2l0TWFuYWdlci5vcGVuUmVwb3NpdG9yeShjaGFuZ2UuZ2V0UHJvamVjdCgpKTsKLSAgICB0cnkgewotICAgICAgZmluYWwgUmV2V2FsayByZXZXYWxrID0gbmV3IFJldldhbGsoZ2l0KTsKLSAgICAgIHRyeSB7Ci0gICAgICAgIGZpbmFsIFBhdGNoU2V0IG9yaWdpbmFsUGF0Y2hTZXQgPSBkYi5wYXRjaFNldHMoKS5nZXQocGF0Y2hTZXRJZCk7Ci0gICAgICAgIFJldkNvbW1pdCBicmFuY2hUaXBDb21taXQgPSBudWxsOwotCi0gICAgICAgIExpc3Q8UGF0Y2hTZXRBbmNlc3Rvcj4gcGF0Y2hTZXRBbmNlc3RvcnMgPQotICAgICAgICAgICAgZGIucGF0Y2hTZXRBbmNlc3RvcnMoKS5hbmNlc3RvcnNPZihwYXRjaFNldElkKS50b0xpc3QoKTsKLSAgICAgICAgaWYgKHBhdGNoU2V0QW5jZXN0b3JzLnNpemUoKSA+IDEpIHsKLSAgICAgICAgICB0aHJvdyBuZXcgSU9FeGNlcHRpb24oCi0gICAgICAgICAgICAgICJUaGUgcGF0Y2ggc2V0IHlvdSBhcmUgdHJ5aW5nIHRvIHJlYmFzZSBpcyBkZXBlbmRlbnQgb24gc2V2ZXJhbCBvdGhlciBwYXRjaCBzZXRzOiAiCi0gICAgICAgICAgICAgICAgICArIHBhdGNoU2V0QW5jZXN0b3JzLnRvU3RyaW5nKCkpOwotICAgICAgICB9Ci0gICAgICAgIGlmIChwYXRjaFNldEFuY2VzdG9ycy5zaXplKCkgPT0gMSkgewotICAgICAgICAgIExpc3Q8UGF0Y2hTZXQ+IGRlcFBhdGNoU2V0TGlzdCA9IGRiLnBhdGNoU2V0cygpCi0gICAgICAgICAgICAgICAgICAuYnlSZXZpc2lvbihwYXRjaFNldEFuY2VzdG9ycy5nZXQoMCkuZ2V0QW5jZXN0b3JSZXZpc2lvbigpKQotICAgICAgICAgICAgICAgICAgLnRvTGlzdCgpOwotICAgICAgICAgIGlmICghZGVwUGF0Y2hTZXRMaXN0LmlzRW1wdHkoKSkgewotICAgICAgICAgICAgUGF0Y2hTZXQgZGVwUGF0Y2hTZXQgPSBkZXBQYXRjaFNldExpc3QuZ2V0KDApOwotCi0gICAgICAgICAgICBDaGFuZ2UuSWQgZGVwQ2hhbmdlSWQgPSBkZXBQYXRjaFNldC5nZXRJZCgpLmdldFBhcmVudEtleSgpOwotICAgICAgICAgICAgQ2hhbmdlIGRlcENoYW5nZSA9IGRiLmNoYW5nZXMoKS5nZXQoZGVwQ2hhbmdlSWQpOwotCi0gICAgICAgICAgICBpZiAoZGVwQ2hhbmdlLmdldFN0YXR1cygpID09IFN0YXR1cy5BQkFORE9ORUQpIHsKLSAgICAgICAgICAgICAgdGhyb3cgbmV3IElPRXhjZXB0aW9uKCJDYW5ub3QgcmViYXNlIGFnYWluc3QgYW4gYWJhbmRvbmVkIGNoYW5nZTogIgotICAgICAgICAgICAgICAgICAgKyBkZXBDaGFuZ2UuZ2V0S2V5KCkudG9TdHJpbmcoKSk7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICBpZiAoZGVwQ2hhbmdlLmdldFN0YXR1cygpLmlzT3BlbigpKSB7Ci0gICAgICAgICAgICAgIFBhdGNoU2V0IGxhdGVzdERlcFBhdGNoU2V0ID0KLSAgICAgICAgICAgICAgICAgIGRiLnBhdGNoU2V0cygpLmdldChkZXBDaGFuZ2UuY3VycmVudFBhdGNoU2V0SWQoKSk7Ci0gICAgICAgICAgICAgIGlmICghZGVwUGF0Y2hTZXQuZ2V0SWQoKS5lcXVhbHMoZGVwQ2hhbmdlLmN1cnJlbnRQYXRjaFNldElkKCkpKSB7Ci0gICAgICAgICAgICAgICAgYnJhbmNoVGlwQ29tbWl0ID0KLSAgICAgICAgICAgICAgICAgICAgcmV2V2Fsay5wYXJzZUNvbW1pdChPYmplY3RJZAotICAgICAgICAgICAgICAgICAgICAgICAgLmZyb21TdHJpbmcobGF0ZXN0RGVwUGF0Y2hTZXQuZ2V0UmV2aXNpb24oKS5nZXQoKSkpOwotICAgICAgICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgICAgIHRocm93IG5ldyBJT0V4Y2VwdGlvbigKLSAgICAgICAgICAgICAgICAgICAgIkNoYW5nZSBpcyBhbHJlYWR5IGJhc2VkIG9uIHRoZSBsYXRlc3QgcGF0Y2ggc2V0IG9mIHRoZSBkZXBlbmRlbnQgY2hhbmdlLiIpOwotICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgfQotICAgICAgICB9Ci0KLSAgICAgICAgaWYgKGJyYW5jaFRpcENvbW1pdCA9PSBudWxsKSB7Ci0gICAgICAgICAgLy8gV2UgYXJlIGRlcGVuZGVudCBvbiBhIG1lcmdlZCBQYXRjaFNldCBvciBoYXZlIG5vIFBhdGNoU2V0Ci0gICAgICAgICAgLy8gZGVwZW5kZW5jaWVzIGF0IGFsbC4KLSAgICAgICAgICBSZWYgZGVzdFJlZiA9IGdpdC5nZXRSZWYoY2hhbmdlLmdldERlc3QoKS5nZXQoKSk7Ci0gICAgICAgICAgaWYgKGRlc3RSZWYgPT0gbnVsbCkgewotICAgICAgICAgICAgdGhyb3cgbmV3IElPRXhjZXB0aW9uKAotICAgICAgICAgICAgICAgICJUaGUgZGVzdGluYXRpb24gYnJhbmNoIGRvZXMgbm90IGV4aXN0OiAiCi0gICAgICAgICAgICAgICAgICAgICsgY2hhbmdlLmdldERlc3QoKS5nZXQoKSk7Ci0gICAgICAgICAgfQotICAgICAgICAgIGJyYW5jaFRpcENvbW1pdCA9IHJldldhbGsucGFyc2VDb21taXQoZGVzdFJlZi5nZXRPYmplY3RJZCgpKTsKLSAgICAgICAgfQotCi0gICAgICAgIGZpbmFsIFJldkNvbW1pdCByZWJhc2VkQ29tbWl0OwotICAgICAgICBmaW5hbCBPYmplY3RJbnNlcnRlciBvaSA9IGdpdC5uZXdPYmplY3RJbnNlcnRlcigpOwotICAgICAgICB0cnkgewotICAgICAgICAgIE9iamVjdElkIG9sZElkID0gT2JqZWN0SWQuZnJvbVN0cmluZyhvcmlnaW5hbFBhdGNoU2V0LmdldFJldmlzaW9uKCkuZ2V0KCkpOwotICAgICAgICAgIE9iamVjdElkIG5ld0lkID0gb2kuaW5zZXJ0KHJlYmFzZUNvbW1pdCgKLSAgICAgICAgICAgICAgZ2l0LCBvaSwgcmV2V2Fsay5wYXJzZUNvbW1pdChvbGRJZCksIGJyYW5jaFRpcENvbW1pdCwgbXlJZGVudCkpOwotICAgICAgICAgIG9pLmZsdXNoKCk7Ci0gICAgICAgICAgcmViYXNlZENvbW1pdCA9IHJldldhbGsucGFyc2VDb21taXQobmV3SWQpOwotICAgICAgICB9IGZpbmFsbHkgewotICAgICAgICAgIG9pLnJlbGVhc2UoKTsKLSAgICAgICAgfQotCi0gICAgICAgIGNoYW5nZS5uZXh0UGF0Y2hTZXRJZCgpOwotICAgICAgICBmaW5hbCBQYXRjaFNldCBuZXdQYXRjaFNldCA9IG5ldyBQYXRjaFNldChjaGFuZ2UuY3VyclBhdGNoU2V0SWQoKSk7Ci0gICAgICAgIG5ld1BhdGNoU2V0LnNldENyZWF0ZWRPbihuZXcgVGltZXN0YW1wKFN5c3RlbS5jdXJyZW50VGltZU1pbGxpcygpKSk7Ci0gICAgICAgIG5ld1BhdGNoU2V0LnNldFVwbG9hZGVyKHVzZXIuZ2V0QWNjb3VudElkKCkpOwotICAgICAgICBuZXdQYXRjaFNldC5zZXRSZXZpc2lvbihuZXcgUmV2SWQocmViYXNlZENvbW1pdC5uYW1lKCkpKTsKLSAgICAgICAgbmV3UGF0Y2hTZXQuc2V0RHJhZnQob3JpZ2luYWxQYXRjaFNldC5pc0RyYWZ0KCkpOwotCi0gICAgICAgIGZpbmFsIFBhdGNoU2V0SW5mbyBpbmZvID0KLSAgICAgICAgICAgIHBhdGNoU2V0SW5mb0ZhY3RvcnkuZ2V0KHJlYmFzZWRDb21taXQsIG5ld1BhdGNoU2V0LmdldElkKCkpOwotCi0gICAgICAgIFJlZlVwZGF0ZSBydSA9IGdpdC51cGRhdGVSZWYobmV3UGF0Y2hTZXQuZ2V0UmVmTmFtZSgpKTsKLSAgICAgICAgcnUuc2V0RXhwZWN0ZWRPbGRPYmplY3RJZChPYmplY3RJZC56ZXJvSWQoKSk7Ci0gICAgICAgIHJ1LnNldE5ld09iamVjdElkKHJlYmFzZWRDb21taXQpOwotICAgICAgICBydS5kaXNhYmxlUmVmTG9nKCk7Ci0gICAgICAgIGlmIChydS51cGRhdGUocmV2V2FsaykgIT0gUmVmVXBkYXRlLlJlc3VsdC5ORVcpIHsKLSAgICAgICAgICB0aHJvdyBuZXcgSU9FeGNlcHRpb24oU3RyaW5nLmZvcm1hdCgKLSAgICAgICAgICAgICAgIkZhaWxlZCB0byBjcmVhdGUgcmVmICVzIGluICVzOiAlcyIsIG5ld1BhdGNoU2V0LmdldFJlZk5hbWUoKSwKLSAgICAgICAgICAgICAgY2hhbmdlLmdldERlc3QoKS5nZXRQYXJlbnRLZXkoKS5nZXQoKSwgcnUuZ2V0UmVzdWx0KCkpKTsKLSAgICAgICAgfQotICAgICAgICByZXBsaWNhdGlvbi5maXJlKGNoYW5nZS5nZXRQcm9qZWN0KCksIHJ1LmdldE5hbWUoKSk7Ci0KLSAgICAgICAgZmluYWwgU2V0PEFjY291bnQuSWQ+IG9sZFJldmlld2VycyA9IFNldHMubmV3SGFzaFNldCgpOwotICAgICAgICBmaW5hbCBTZXQ8QWNjb3VudC5JZD4gb2xkQ0MgPSBTZXRzLm5ld0hhc2hTZXQoKTsKLSAgICAgICAgZGIuY2hhbmdlcygpLmJlZ2luVHJhbnNhY3Rpb24oY2hhbmdlLmdldElkKCkpOwotICAgICAgICB0cnkgewotICAgICAgICAgIENoYW5nZSB1cGRhdGVkQ2hhbmdlOwotCi0gICAgICAgICAgdXBkYXRlZENoYW5nZSA9IGRiLmNoYW5nZXMoKS5hdG9taWNVcGRhdGUoY2hhbmdlSWQsCi0gICAgICAgICAgICAgIG5ldyBBdG9taWNVcGRhdGU8Q2hhbmdlPigpIHsKLSAgICAgICAgICAgICAgICBAT3ZlcnJpZGUKLSAgICAgICAgICAgICAgICBwdWJsaWMgQ2hhbmdlIHVwZGF0ZShDaGFuZ2UgY2hhbmdlKSB7Ci0gICAgICAgICAgICAgICAgICBpZiAoY2hhbmdlLmdldFN0YXR1cygpLmlzT3BlbigpKSB7Ci0gICAgICAgICAgICAgICAgICAgIGNoYW5nZS51cGRhdGVOdW1iZXJPZlBhdGNoU2V0cyhuZXdQYXRjaFNldC5nZXRQYXRjaFNldElkKCkpOwotICAgICAgICAgICAgICAgICAgICByZXR1cm4gY2hhbmdlOwotICAgICAgICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAgICAgICAgcmV0dXJuIG51bGw7Ci0gICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICB9KTsKLSAgICAgICAgICBpZiAodXBkYXRlZENoYW5nZSAhPSBudWxsKSB7Ci0gICAgICAgICAgICBjaGFuZ2UgPSB1cGRhdGVkQ2hhbmdlOwotICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICB0aHJvdyBuZXcgSW52YWxpZENoYW5nZU9wZXJhdGlvbkV4Y2VwdGlvbigKLSAgICAgICAgICAgICAgICBTdHJpbmcuZm9ybWF0KCJDaGFuZ2UgJXMgaXMgY2xvc2VkIiwgY2hhbmdlLmdldElkKCkpKTsKLSAgICAgICAgICB9Ci0KLSAgICAgICAgICBpbnNlcnRBbmNlc3RvcnMoZGIsIG5ld1BhdGNoU2V0LmdldElkKCksIHJlYmFzZWRDb21taXQpOwotICAgICAgICAgIGRiLnBhdGNoU2V0cygpLmluc2VydChDb2xsZWN0aW9ucy5zaW5nbGV0b24obmV3UGF0Y2hTZXQpKTsKLSAgICAgICAgICB1cGRhdGVkQ2hhbmdlID0gZGIuY2hhbmdlcygpLmF0b21pY1VwZGF0ZShjaGFuZ2VJZCwKLSAgICAgICAgICAgICAgbmV3IEF0b21pY1VwZGF0ZTxDaGFuZ2U+KCkgewotICAgICAgICAgICAgICAgIEBPdmVycmlkZQotICAgICAgICAgICAgICAgIHB1YmxpYyBDaGFuZ2UgdXBkYXRlKENoYW5nZSBjaGFuZ2UpIHsKLSAgICAgICAgICAgICAgICAgIGlmIChjaGFuZ2UuZ2V0U3RhdHVzKCkuaXNDbG9zZWQoKSkgewotICAgICAgICAgICAgICAgICAgICByZXR1cm4gbnVsbDsKLSAgICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICAgIGlmICghY2hhbmdlLmN1cnJlbnRQYXRjaFNldElkKCkuZXF1YWxzKHBhdGNoU2V0SWQpKSB7Ci0gICAgICAgICAgICAgICAgICAgIHJldHVybiBudWxsOwotICAgICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgICAgaWYgKGNoYW5nZS5nZXRTdGF0dXMoKSAhPSBDaGFuZ2UuU3RhdHVzLkRSQUZUKSB7Ci0gICAgICAgICAgICAgICAgICAgIGNoYW5nZS5zZXRTdGF0dXMoQ2hhbmdlLlN0YXR1cy5ORVcpOwotICAgICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgICAgY2hhbmdlLnNldExhc3RTaGExTWVyZ2VUZXN0ZWQobnVsbCk7Ci0gICAgICAgICAgICAgICAgICBjaGFuZ2Uuc2V0Q3VycmVudFBhdGNoU2V0KGluZm8pOwotICAgICAgICAgICAgICAgICAgQ2hhbmdlVXRpbC51cGRhdGVkKGNoYW5nZSk7Ci0gICAgICAgICAgICAgICAgICByZXR1cm4gY2hhbmdlOwotICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgfSk7Ci0gICAgICAgICAgaWYgKHVwZGF0ZWRDaGFuZ2UgIT0gbnVsbCkgewotICAgICAgICAgICAgY2hhbmdlID0gdXBkYXRlZENoYW5nZTsKLSAgICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgdGhyb3cgbmV3IEludmFsaWRDaGFuZ2VPcGVyYXRpb25FeGNlcHRpb24oCi0gICAgICAgICAgICAgICAgU3RyaW5nLmZvcm1hdCgiQ2hhbmdlICVzIHdhcyBtb2RpZmllZCIsIGNoYW5nZS5nZXRJZCgpKSk7Ci0gICAgICAgICAgfQotCi0gICAgICAgICAgZm9yIChQYXRjaFNldEFwcHJvdmFsIGEgOiBhcHByb3ZhbHNVdGlsLmNvcHlWZXRvc1RvTGF0ZXN0UGF0Y2hTZXQoY2hhbmdlKSkgewotICAgICAgICAgICAgaWYgKGEuZ2V0VmFsdWUoKSAhPSAwKSB7Ci0gICAgICAgICAgICAgIG9sZFJldmlld2Vycy5hZGQoYS5nZXRBY2NvdW50SWQoKSk7Ci0gICAgICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgICBvbGRDQy5hZGQoYS5nZXRBY2NvdW50SWQoKSk7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgfQotCi0gICAgICAgICAgZmluYWwgQ2hhbmdlTWVzc2FnZSBjbXNnID0KLSAgICAgICAgICAgICAgbmV3IENoYW5nZU1lc3NhZ2UobmV3IENoYW5nZU1lc3NhZ2UuS2V5KGNoYW5nZUlkLAotICAgICAgICAgICAgICAgICAgQ2hhbmdlVXRpbC5tZXNzYWdlVVVJRChkYikpLCB1c2VyLmdldEFjY291bnRJZCgpLCBwYXRjaFNldElkKTsKLSAgICAgICAgICBjbXNnLnNldE1lc3NhZ2UoIlBhdGNoIFNldCAiICsgcGF0Y2hTZXRJZC5nZXQoKSArICI6IFJlYmFzZWQiKTsKLSAgICAgICAgICBkYi5jaGFuZ2VNZXNzYWdlcygpLmluc2VydChDb2xsZWN0aW9ucy5zaW5nbGV0b24oY21zZykpOwotICAgICAgICAgIGRiLmNvbW1pdCgpOwotICAgICAgICB9IGZpbmFsbHkgewotICAgICAgICAgIGRiLnJvbGxiYWNrKCk7Ci0gICAgICAgIH0KLQotICAgICAgICBmaW5hbCBSZXBsYWNlUGF0Y2hTZXRTZW5kZXIgY20gPQotICAgICAgICAgICAgcmViYXNlZFBhdGNoU2V0U2VuZGVyRmFjdG9yeS5jcmVhdGUoY2hhbmdlKTsKLSAgICAgICAgY20uc2V0RnJvbSh1c2VyLmdldEFjY291bnRJZCgpKTsKLSAgICAgICAgY20uc2V0UGF0Y2hTZXQobmV3UGF0Y2hTZXQpOwotICAgICAgICBjbS5hZGRSZXZpZXdlcnMob2xkUmV2aWV3ZXJzKTsKLSAgICAgICAgY20uYWRkRXh0cmFDQyhvbGRDQyk7Ci0gICAgICAgIGNtLnNlbmQoKTsKLQotICAgICAgICBob29rcy5kb1BhdGNoc2V0Q3JlYXRlZEhvb2soY2hhbmdlLCBuZXdQYXRjaFNldCwgZGIpOwotICAgICAgfSBmaW5hbGx5IHsKLSAgICAgICAgcmV2V2Fsay5yZWxlYXNlKCk7Ci0gICAgICB9Ci0gICAgfSBmaW5hbGx5IHsKLSAgICAgIGdpdC5jbG9zZSgpOwotICAgIH0KLSAgfQotCiAgIHB1YmxpYyBzdGF0aWMgQ2hhbmdlLklkIHJldmVydChmaW5hbCBQYXRjaFNldC5JZCBwYXRjaFNldElkLAogICAgICAgZmluYWwgSWRlbnRpZmllZFVzZXIgdXNlciwgZmluYWwgU3RyaW5nIG1lc3NhZ2UsIGZpbmFsIFJldmlld0RiIGRiLAogICAgICAgZmluYWwgUmV2ZXJ0ZWRTZW5kZXIuRmFjdG9yeSByZXZlcnRlZFNlbmRlckZhY3RvcnksCmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2F1dGgvbGRhcC9IZWxwZXIuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYXV0aC9sZGFwL0hlbHBlci5qYXZhCmluZGV4IDY0NGY1ZGYuLmFlMDQ5YTAgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYXV0aC9sZGFwL0hlbHBlci5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYXV0aC9sZGFwL0hlbHBlci5qYXZhCkBAIC0xNCw2ICsxNCw3IEBACiAKIHBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmF1dGgubGRhcDsKIAoraW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmJhc2UuVGhyb3dhYmxlczsKIGltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jYWNoZS5DYWNoZTsKIGltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0LkltbXV0YWJsZVNldDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5QYXJhbWV0ZXJpemVkU3RyaW5nOwpAQCAtMjgsNiArMjksOCBAQAogCiBpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuQ29uZmlnOwogCitpbXBvcnQgamF2YS5zZWN1cml0eS5Qcml2aWxlZ2VkQWN0aW9uRXhjZXB0aW9uOworaW1wb3J0IGphdmEuc2VjdXJpdHkuUHJpdmlsZWdlZEV4Y2VwdGlvbkFjdGlvbjsKIGltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OwogaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uczsKIGltcG9ydCBqYXZhLnV0aWwuSGFzaE1hcDsKQEAgLTQ3LDYgKzUwLDkgQEAKIGltcG9ydCBqYXZheC5uYW1pbmcuZGlyZWN0b3J5LkRpckNvbnRleHQ7CiBpbXBvcnQgamF2YXgubmFtaW5nLmRpcmVjdG9yeS5Jbml0aWFsRGlyQ29udGV4dDsKIGltcG9ydCBqYXZheC5uZXQuc3NsLlNTTFNvY2tldEZhY3Rvcnk7CitpbXBvcnQgamF2YXguc2VjdXJpdHkuYXV0aC5TdWJqZWN0OworaW1wb3J0IGphdmF4LnNlY3VyaXR5LmF1dGgubG9naW4uTG9naW5Db250ZXh0OworaW1wb3J0IGphdmF4LnNlY3VyaXR5LmF1dGgubG9naW4uTG9naW5FeGNlcHRpb247CiAKIEBTaW5nbGV0b24gY2xhc3MgSGVscGVyIHsKICAgc3RhdGljIGZpbmFsIFN0cmluZyBMREFQX1VVSUQgPSAibGRhcDoiOwpAQCAtNTgsNiArNjQsNyBAQAogICBwcml2YXRlIGZpbmFsIFN0cmluZyBwYXNzd29yZDsKICAgcHJpdmF0ZSBmaW5hbCBTdHJpbmcgcmVmZXJyYWw7CiAgIHByaXZhdGUgZmluYWwgYm9vbGVhbiBzc2xWZXJpZnk7CisgIHByaXZhdGUgZmluYWwgU3RyaW5nIGF1dGhlbnRpY2F0aW9uOwogICBwcml2YXRlIHZvbGF0aWxlIExkYXBTY2hlbWEgbGRhcFNjaGVtYTsKICAgcHJpdmF0ZSBmaW5hbCBTdHJpbmcgcmVhZFRpbWVPdXRNaWxsaXM7CiAKQEAgLTcxLDYgKzc4LDcgQEAKICAgICB0aGlzLnBhc3N3b3JkID0gTGRhcFJlYWxtLm9wdGlvbmFsKGNvbmZpZywgInBhc3N3b3JkIik7CiAgICAgdGhpcy5yZWZlcnJhbCA9IExkYXBSZWFsbS5vcHRpb25hbChjb25maWcsICJyZWZlcnJhbCIpOwogICAgIHRoaXMuc3NsVmVyaWZ5ID0gY29uZmlnLmdldEJvb2xlYW4oImxkYXAiLCAic3NsdmVyaWZ5IiwgdHJ1ZSk7CisgICAgdGhpcy5hdXRoZW50aWNhdGlvbiA9IExkYXBSZWFsbS5vcHRpb25hbChjb25maWcsICJhdXRoZW50aWNhdGlvbiIpOwogICAgIFN0cmluZyB0aW1lb3V0ID0gTGRhcFJlYWxtLm9wdGlvbmFsKGNvbmZpZywgInJlYWRUaW1lb3V0Iik7CiAgICAgaWYgKHRpbWVvdXQgIT0gbnVsbCkgewogICAgICAgcmVhZFRpbWVPdXRNaWxsaXMgPQpAQCAtOTYsMTUgKzEwNCwzOSBAQAogICAgIHJldHVybiBlbnY7CiAgIH0KIAotICBEaXJDb250ZXh0IG9wZW4oKSB0aHJvd3MgTmFtaW5nRXhjZXB0aW9uIHsKKyAgRGlyQ29udGV4dCBvcGVuKCkgdGhyb3dzIE5hbWluZ0V4Y2VwdGlvbiwgTG9naW5FeGNlcHRpb24gewogICAgIGZpbmFsIFByb3BlcnRpZXMgZW52ID0gY3JlYXRlQ29udGV4dFByb3BlcnRpZXMoKTsKLSAgICBpZiAodXNlcm5hbWUgIT0gbnVsbCkgewotICAgICAgZW52LnB1dChDb250ZXh0LlNFQ1VSSVRZX0FVVEhFTlRJQ0FUSU9OLCAic2ltcGxlIik7Ci0gICAgICBlbnYucHV0KENvbnRleHQuU0VDVVJJVFlfUFJJTkNJUEFMLCB1c2VybmFtZSk7Ci0gICAgICBlbnYucHV0KENvbnRleHQuU0VDVVJJVFlfQ1JFREVOVElBTFMsIHBhc3N3b3JkICE9IG51bGwgPyBwYXNzd29yZCA6ICIiKTsKLSAgICAgIGVudi5wdXQoQ29udGV4dC5SRUZFUlJBTCwgcmVmZXJyYWwgIT0gbnVsbCA/IHJlZmVycmFsIDogImlnbm9yZSIpOworICAgIGVudi5wdXQoQ29udGV4dC5TRUNVUklUWV9BVVRIRU5USUNBVElPTiwgYXV0aGVudGljYXRpb24gIT0gbnVsbCA/IGF1dGhlbnRpY2F0aW9uIDogInNpbXBsZSIpOworICAgIGVudi5wdXQoQ29udGV4dC5SRUZFUlJBTCwgcmVmZXJyYWwgIT0gbnVsbCA/IHJlZmVycmFsIDogImlnbm9yZSIpOworICAgIGlmICgiR1NTQVBJIi5lcXVhbHMoYXV0aGVudGljYXRpb24pKSB7CisgICAgICByZXR1cm4ga2VyYmVyb3NPcGVuKGVudik7CisgICAgfSBlbHNlIHsKKyAgICAgICBlbnYucHV0KENvbnRleHQuU0VDVVJJVFlfUFJJTkNJUEFMLCB1c2VybmFtZSk7CisgICAgICAgZW52LnB1dChDb250ZXh0LlNFQ1VSSVRZX0NSRURFTlRJQUxTLCBwYXNzd29yZCAhPSBudWxsID8gcGFzc3dvcmQgOiAiIik7CisgICAgICAgcmV0dXJuIG5ldyBJbml0aWFsRGlyQ29udGV4dChlbnYpOwogICAgIH0KLSAgICByZXR1cm4gbmV3IEluaXRpYWxEaXJDb250ZXh0KGVudik7CisgIH0KKworICBwcml2YXRlIERpckNvbnRleHQga2VyYmVyb3NPcGVuKGZpbmFsIFByb3BlcnRpZXMgZW52KSB0aHJvd3MgTG9naW5FeGNlcHRpb24sCisgICAgICBOYW1pbmdFeGNlcHRpb24geworICAgIExvZ2luQ29udGV4dCBjdHggPSBuZXcgTG9naW5Db250ZXh0KCJLZXJiZXJvc0xvZ2luIik7CisgICAgY3R4LmxvZ2luKCk7CisgICAgU3ViamVjdCBzdWJqZWN0ID0gY3R4LmdldFN1YmplY3QoKTsKKyAgICB0cnkgeworICAgICAgcmV0dXJuIFN1YmplY3QuZG9BcyhzdWJqZWN0LCBuZXcgUHJpdmlsZWdlZEV4Y2VwdGlvbkFjdGlvbjxEaXJDb250ZXh0PigpIHsKKyAgICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgICBwdWJsaWMgRGlyQ29udGV4dCBydW4oKSB0aHJvd3MgTmFtaW5nRXhjZXB0aW9uIHsKKyAgICAgICAgICAgIHJldHVybiBuZXcgSW5pdGlhbERpckNvbnRleHQoZW52KTsKKyAgICAgICAgICB9CisgICAgICAgIH0pOworICAgIH0gY2F0Y2ggKFByaXZpbGVnZWRBY3Rpb25FeGNlcHRpb24gZSkgeworICAgICAgVGhyb3dhYmxlcy5wcm9wYWdhdGVJZlBvc3NpYmxlKGUuZ2V0RXhjZXB0aW9uKCksIE5hbWluZ0V4Y2VwdGlvbi5jbGFzcyk7CisgICAgICBUaHJvd2FibGVzLnByb3BhZ2F0ZUlmUG9zc2libGUoZS5nZXRFeGNlcHRpb24oKSwgUnVudGltZUV4Y2VwdGlvbi5jbGFzcyk7CisgICAgICBMZGFwUmVhbG0ubG9nLndhcm4oIkludGVybmFsIGVycm9yIiwgZS5nZXRFeGNlcHRpb24oKSk7CisgICAgICByZXR1cm4gbnVsbDsKKyAgICB9IGZpbmFsbHkgeworICAgICAgY3R4LmxvZ291dCgpOworICAgIH0KICAgfQogCiAgIERpckNvbnRleHQgYXV0aGVudGljYXRlKFN0cmluZyBkbiwgU3RyaW5nIHBhc3N3b3JkKSB0aHJvd3MgQWNjb3VudEV4Y2VwdGlvbiB7CkBAIC0yNTYsNiArMjg4LDcgQEAKICAgICBmaW5hbCBMaXN0PFN0cmluZz4gZ3JvdXBCYXNlczsKICAgICBmaW5hbCBTZWFyY2hTY29wZSBncm91cFNjb3BlOwogICAgIGZpbmFsIFBhcmFtZXRlcml6ZWRTdHJpbmcgZ3JvdXBQYXR0ZXJuOworICAgIGZpbmFsIFBhcmFtZXRlcml6ZWRTdHJpbmcgZ3JvdXBOYW1lOwogICAgIGZpbmFsIExpc3Q8TGRhcFF1ZXJ5PiBncm91cE1lbWJlclF1ZXJ5TGlzdDsKIAogICAgIExkYXBTY2hlbWEoZmluYWwgRGlyQ29udGV4dCBjdHgpIHsKQEAgLTI3MSw2ICszMDQsNyBAQAogICAgICAgZ3JvdXBCYXNlcyA9IExkYXBSZWFsbS5vcHRpb25hbExpc3QoY29uZmlnLCAiZ3JvdXBCYXNlIik7CiAgICAgICBncm91cFNjb3BlID0gTGRhcFJlYWxtLnNjb3BlKGNvbmZpZywgImdyb3VwU2NvcGUiKTsKICAgICAgIGdyb3VwUGF0dGVybiA9IExkYXBSZWFsbS5wYXJhbVN0cmluZyhjb25maWcsICJncm91cFBhdHRlcm4iLCB0eXBlLmdyb3VwUGF0dGVybigpKTsKKyAgICAgIGdyb3VwTmFtZSA9IExkYXBSZWFsbS5wYXJhbVN0cmluZyhjb25maWcsICJncm91cE5hbWUiLCB0eXBlLmdyb3VwTmFtZSgpKTsKICAgICAgIGZpbmFsIFN0cmluZyBncm91cE1lbWJlclBhdHRlcm4gPQogICAgICAgICAgIExkYXBSZWFsbS5vcHRkZWYoY29uZmlnLCAiZ3JvdXBNZW1iZXJQYXR0ZXJuIiwgdHlwZS5ncm91cE1lbWJlclBhdHRlcm4oKSk7CiAKZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYXV0aC9sZGFwL0xkYXBHcm91cEJhY2tlbmQuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYXV0aC9sZGFwL0xkYXBHcm91cEJhY2tlbmQuamF2YQppbmRleCA1YzMwZTVjLi5iMmY5NDQzIDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2F1dGgvbGRhcC9MZGFwR3JvdXBCYWNrZW5kLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hdXRoL2xkYXAvTGRhcEdyb3VwQmFja2VuZC5qYXZhCkBAIC00MSw2ICs0MSw3IEBACiAKIGltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbjsKIGltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbnM7CitpbXBvcnQgamF2YS51dGlsLkhhc2hTZXQ7CiBpbXBvcnQgamF2YS51dGlsLk1hcDsKIGltcG9ydCBqYXZhLnV0aWwuU2V0OwogaW1wb3J0IGphdmEudXRpbC5jb25jdXJyZW50LkV4ZWN1dGlvbkV4Y2VwdGlvbjsKQEAgLTUwLDYgKzUxLDcgQEAKIGltcG9ydCBqYXZheC5uYW1pbmcuZGlyZWN0b3J5LkRpckNvbnRleHQ7CiBpbXBvcnQgamF2YXgubmFtaW5nLmxkYXAuTGRhcE5hbWU7CiBpbXBvcnQgamF2YXgubmFtaW5nLmxkYXAuUmRuOworaW1wb3J0IGphdmF4LnNlY3VyaXR5LmF1dGgubG9naW4uTG9naW5FeGNlcHRpb247CiAKIC8qKgogICogSW1wbGVtZW50YXRpb24gb2YgR3JvdXBCYWNrZW5kIGZvciB0aGUgTERBUCBncm91cCBzeXN0ZW0uCkBAIC04MSwxMSArODMsMTEgQEAKICAgICByZXR1cm4gdXVpZC5nZXQoKS5zdGFydHNXaXRoKExEQVBfVVVJRCk7CiAgIH0KIAotICBwcml2YXRlIHN0YXRpYyBHcm91cFJlZmVyZW5jZSBncm91cFJlZmVyZW5jZShMZGFwUXVlcnkuUmVzdWx0IHJlcykKLSAgICAgIHRocm93cyBOYW1pbmdFeGNlcHRpb24geworICBwcml2YXRlIHN0YXRpYyBHcm91cFJlZmVyZW5jZSBncm91cFJlZmVyZW5jZShQYXJhbWV0ZXJpemVkU3RyaW5nIHAsCisgICAgICBMZGFwUXVlcnkuUmVzdWx0IHJlcykgdGhyb3dzIE5hbWluZ0V4Y2VwdGlvbiB7CiAgICAgcmV0dXJuIG5ldyBHcm91cFJlZmVyZW5jZSgKICAgICAgICAgbmV3IEFjY291bnRHcm91cC5VVUlEKExEQVBfVVVJRCArIHJlcy5nZXRETigpKSwKLSAgICAgICAgTERBUF9OQU1FICsgY25Gb3IocmVzLmdldEROKCkpKTsKKyAgICAgICAgTERBUF9OQU1FICsgTGRhcFJlYWxtLmFwcGx5KHAsIHJlcykpOwogICB9CiAKICAgcHJpdmF0ZSBzdGF0aWMgU3RyaW5nIGNuRm9yKFN0cmluZyBkbikgewpAQCAtMjAzLDEzICsyMDUsMTQgQEAKICAgICAgICAgTGRhcFNjaGVtYSBzY2hlbWEgPSBoZWxwZXIuZ2V0U2NoZW1hKGN0eCk7CiAgICAgICAgIFBhcmFtZXRlcml6ZWRTdHJpbmcgZmlsdGVyID0gUGFyYW1ldGVyaXplZFN0cmluZy5hc2lzKAogICAgICAgICAgICAgc2NoZW1hLmdyb3VwUGF0dGVybi5yZXBsYWNlKEdST1VQTkFNRSwgbmFtZSkudG9TdHJpbmcoKSk7Ci0gICAgICAgIFNldDxTdHJpbmc+IHJldHVybkF0dHJzID0gQ29sbGVjdGlvbnMuPFN0cmluZz5lbXB0eVNldCgpOworICAgICAgICBTZXQ8U3RyaW5nPiByZXR1cm5BdHRycyA9CisgICAgICAgICAgICBuZXcgSGFzaFNldDxTdHJpbmc+KHNjaGVtYS5ncm91cE5hbWUuZ2V0UGFyYW1ldGVyTmFtZXMoKSk7CiAgICAgICAgIE1hcDxTdHJpbmcsIFN0cmluZz4gcGFyYW1zID0gQ29sbGVjdGlvbnMuZW1wdHlNYXAoKTsKICAgICAgICAgZm9yIChTdHJpbmcgZ3JvdXBCYXNlIDogc2NoZW1hLmdyb3VwQmFzZXMpIHsKICAgICAgICAgICBMZGFwUXVlcnkgcXVlcnkgPSBuZXcgTGRhcFF1ZXJ5KAogICAgICAgICAgICAgICBncm91cEJhc2UsIHNjaGVtYS5ncm91cFNjb3BlLCBmaWx0ZXIsIHJldHVybkF0dHJzKTsKICAgICAgICAgICBmb3IgKExkYXBRdWVyeS5SZXN1bHQgcmVzIDogcXVlcnkucXVlcnkoY3R4LCBwYXJhbXMpKSB7Ci0gICAgICAgICAgICBvdXQuYWRkKGdyb3VwUmVmZXJlbmNlKHJlcykpOworICAgICAgICAgICAgb3V0LmFkZChncm91cFJlZmVyZW5jZShzY2hlbWEuZ3JvdXBOYW1lLCByZXMpKTsKICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICAgIH0gZmluYWxseSB7CkBAIC0yMjEsNiArMjI0LDggQEAKICAgICAgIH0KICAgICB9IGNhdGNoIChOYW1pbmdFeGNlcHRpb24gZSkgewogICAgICAgbG9nLndhcm4oIkNhbm5vdCBxdWVyeSBMREFQIGZvciBncm91cHMgbWF0Y2hpbmcgcmVxdWVzdGVkIG5hbWUiLCBlKTsKKyAgICB9IGNhdGNoIChMb2dpbkV4Y2VwdGlvbiBlKSB7CisgICAgICBsb2cud2FybigiQ2Fubm90IHF1ZXJ5IExEQVAgZm9yIGdyb3VwcyBtYXRjaGluZyByZXF1ZXN0ZWQgbmFtZSIsIGUpOwogICAgIH0KICAgICByZXR1cm4gb3V0OwogICB9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2F1dGgvbGRhcC9MZGFwUmVhbG0uamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYXV0aC9sZGFwL0xkYXBSZWFsbS5qYXZhCmluZGV4IDcyZWI3ZWMuLmZjMTEwMmUgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYXV0aC9sZGFwL0xkYXBSZWFsbS5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYXV0aC9sZGFwL0xkYXBSZWFsbS5qYXZhCkBAIC01Niw2ICs1Niw3IEBACiBpbXBvcnQgamF2YXgubmFtaW5nLk5hbWU7CiBpbXBvcnQgamF2YXgubmFtaW5nLk5hbWluZ0V4Y2VwdGlvbjsKIGltcG9ydCBqYXZheC5uYW1pbmcuZGlyZWN0b3J5LkRpckNvbnRleHQ7CitpbXBvcnQgamF2YXguc2VjdXJpdHkuYXV0aC5sb2dpbi5Mb2dpbkV4Y2VwdGlvbjsKIAogQFNpbmdsZXRvbgogY2xhc3MgTGRhcFJlYWxtIGltcGxlbWVudHMgUmVhbG0gewpAQCAtMTY3LDcgKzE2OCw3IEBACiAgICAgcmV0dXJuICFyZWFkT25seUFjY291bnRGaWVsZHMuY29udGFpbnMoZmllbGQpOwogICB9CiAKLSAgcHJpdmF0ZSBzdGF0aWMgU3RyaW5nIGFwcGx5KFBhcmFtZXRlcml6ZWRTdHJpbmcgcCwgTGRhcFF1ZXJ5LlJlc3VsdCBtKQorICBzdGF0aWMgU3RyaW5nIGFwcGx5KFBhcmFtZXRlcml6ZWRTdHJpbmcgcCwgTGRhcFF1ZXJ5LlJlc3VsdCBtKQogICAgICAgdGhyb3dzIE5hbWluZ0V4Y2VwdGlvbiB7CiAgICAgaWYgKHAgPT0gbnVsbCkgewogICAgICAgcmV0dXJuIG51bGw7CkBAIC0yNDAsNiArMjQxLDkgQEAKICAgICB9IGNhdGNoIChOYW1pbmdFeGNlcHRpb24gZSkgewogICAgICAgbG9nLmVycm9yKCJDYW5ub3QgcXVlcnkgTERBUCB0byBhdXRlbnRpY2F0ZSB1c2VyIiwgZSk7CiAgICAgICB0aHJvdyBuZXcgQXV0aGVudGljYXRpb25VbmF2YWlsYWJsZUV4Y2VwdGlvbigiQ2Fubm90IHF1ZXJ5IExEQVAgZm9yIGFjY291bnQiLCBlKTsKKyAgICB9IGNhdGNoIChMb2dpbkV4Y2VwdGlvbiBlKSB7CisgICAgICBsb2cuZXJyb3IoIkNhbm5vdCBhdXRoZW50aWNhdGUgc2VydmVyIHZpYSBKQUFTIiwgZSk7CisgICAgICB0aHJvdyBuZXcgQXV0aGVudGljYXRpb25VbmF2YWlsYWJsZUV4Y2VwdGlvbigiQ2Fubm90IHF1ZXJ5IExEQVAgZm9yIGFjY291bnQiLCBlKTsKICAgICB9CiAgIH0KIApkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hdXRoL2xkYXAvTGRhcFR5cGUuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYXV0aC9sZGFwL0xkYXBUeXBlLmphdmEKaW5kZXggM2M0YTU0Yi4uZmQ1YmIzMCAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hdXRoL2xkYXAvTGRhcFR5cGUuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2F1dGgvbGRhcC9MZGFwVHlwZS5qYXZhCkBAIC0zNiw2ICszNiw4IEBACiAKICAgYWJzdHJhY3QgU3RyaW5nIGdyb3VwTWVtYmVyUGF0dGVybigpOwogCisgIGFic3RyYWN0IFN0cmluZyBncm91cE5hbWUoKTsKKwogICBhYnN0cmFjdCBTdHJpbmcgYWNjb3VudEZ1bGxOYW1lKCk7CiAKICAgYWJzdHJhY3QgU3RyaW5nIGFjY291bnRFbWFpbEFkZHJlc3MoKTsKQEAgLTU4LDYgKzYwLDExIEBACiAgICAgfQogCiAgICAgQE92ZXJyaWRlCisgICAgU3RyaW5nIGdyb3VwTmFtZSgpIHsKKyAgICAgIHJldHVybiAiY24iOworICAgIH0KKworICAgIEBPdmVycmlkZQogICAgIFN0cmluZyBhY2NvdW50RnVsbE5hbWUoKSB7CiAgICAgICByZXR1cm4gImRpc3BsYXlOYW1lIjsKICAgICB9CkBAIC0xMDEsNiArMTA4LDExIEBACiAgICAgfQogCiAgICAgQE92ZXJyaWRlCisgICAgU3RyaW5nIGdyb3VwTmFtZSgpIHsKKyAgICAgIHJldHVybiAiY24iOworICAgIH0KKworICAgIEBPdmVycmlkZQogICAgIFN0cmluZyBncm91cE1lbWJlclBhdHRlcm4oKSB7CiAgICAgICByZXR1cm4gbnVsbDsgLy8gQWN0aXZlIERpcmVjdG9yeSB1c2VzIG1lbWJlck9mIGluIHRoZSBhY2NvdW50CiAgICAgfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL3Byb2plY3QvQnJhbmNoQ3JlYXRpb25Ob3RBbGxvd2VkRXhjZXB0aW9uLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NoYW5nZWRldGFpbC9QYXRoQ29uZmxpY3RFeGNlcHRpb24uamF2YQpzaW1pbGFyaXR5IGluZGV4IDYyJQpyZW5hbWUgZnJvbSBnZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvcHJvamVjdC9CcmFuY2hDcmVhdGlvbk5vdEFsbG93ZWRFeGNlcHRpb24uamF2YQpyZW5hbWUgdG8gZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2VkZXRhaWwvUGF0aENvbmZsaWN0RXhjZXB0aW9uLmphdmEKaW5kZXggOThjZGMzMi4uN2UyZjJkNyAxMDA2NDQKLS0tIGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL3Byb2plY3QvQnJhbmNoQ3JlYXRpb25Ob3RBbGxvd2VkRXhjZXB0aW9uLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2VkZXRhaWwvUGF0aENvbmZsaWN0RXhjZXB0aW9uLmphdmEKQEAgLTEsNCArMSw0IEBACi0vLyBDb3B5cmlnaHQgKEMpIDIwMTAgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKIC8vCiAvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKIC8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KQEAgLTEyLDE1ICsxMiwxMyBAQAogLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAogLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCiAKLXBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuaHR0cGQucnBjLnByb2plY3Q7CitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jaGFuZ2VkZXRhaWw7CiAKLXB1YmxpYyBjbGFzcyBCcmFuY2hDcmVhdGlvbk5vdEFsbG93ZWRFeGNlcHRpb24gZXh0ZW5kcyBFeGNlcHRpb24gewotCisvKiogSW5kaWNhdGVzIGEgcGF0aCBjb25mbGljdCBkdXJpbmcgcmViYXNlIG9yIG1lcmdlICovCitwdWJsaWMgY2xhc3MgUGF0aENvbmZsaWN0RXhjZXB0aW9uIGV4dGVuZHMgRXhjZXB0aW9uIHsKICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgbG9uZyBzZXJpYWxWZXJzaW9uVUlEID0gMUw7CiAKLSAgcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgTUVTU0FHRSA9ICJCcmFuY2ggY3JlYXRpb24gaXMgbm90IGFsbG93ZWQgdW5kZXI6ICI7Ci0KLSAgcHVibGljIEJyYW5jaENyZWF0aW9uTm90QWxsb3dlZEV4Y2VwdGlvbihmaW5hbCBTdHJpbmcgcmVmbmFtZVByZWZpeCkgewotICAgIHN1cGVyKE1FU1NBR0UgKyByZWZuYW1lUHJlZml4KTsKKyAgcHVibGljIFBhdGhDb25mbGljdEV4Y2VwdGlvbihTdHJpbmcgbXNnKSB7CisgICAgc3VwZXIobXNnKTsKICAgfQogfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2VkZXRhaWwvUmViYXNlQ2hhbmdlLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NoYW5nZWRldGFpbC9SZWJhc2VDaGFuZ2UuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4yNjk4NzY4Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2VkZXRhaWwvUmViYXNlQ2hhbmdlLmphdmEKQEAgLTAsMCArMSw0MzggQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY2hhbmdlZGV0YWlsOworCitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5TZXRzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5DaGFuZ2VIb29rUnVubmVyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5CcmFuY2g7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQ2hhbmdlLlN0YXR1czsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQ2hhbmdlTWVzc2FnZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0QW5jZXN0b3I7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0QXBwcm92YWw7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0SW5mbzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUmV2SWQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuc2VydmVyLlJldmlld0RiOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5BcHByb3ZhbHNVdGlsOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5DaGFuZ2VVdGlsOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5HZXJyaXRQZXJzb25JZGVudDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZXh0ZW5zaW9ucy5ldmVudHMuR2l0UmVmZXJlbmNlVXBkYXRlZDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LkdpdFJlcG9zaXRvcnlNYW5hZ2VyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuTWVyZ2VVdGlsOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5tYWlsLkVtYWlsRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5tYWlsLlJlYmFzZWRQYXRjaFNldFNlbmRlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIubWFpbC5SZXBsYWNlUGF0Y2hTZXRTZW5kZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnBhdGNoLlBhdGNoU2V0SW5mb0ZhY3Rvcnk7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuQ2hhbmdlQ29udHJvbDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5JbnZhbGlkQ2hhbmdlT3BlcmF0aW9uRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0Lk5vU3VjaENoYW5nZUV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuQXRvbWljVXBkYXRlOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5Pcm1FeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OworCitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuQ29tbWl0QnVpbGRlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5PYmplY3RJZDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5PYmplY3RJbnNlcnRlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5QZXJzb25JZGVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5SZWY7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuUmVmVXBkYXRlOworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLlJlcG9zaXRvcnk7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5tZXJnZS5UaHJlZVdheU1lcmdlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LnJldndhbGsuUmV2Q29tbWl0OworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQucmV2d2Fsay5SZXZXYWxrOworCitpbXBvcnQgamF2YS5pby5JT0V4Y2VwdGlvbjsKK2ltcG9ydCBqYXZhLnNxbC5UaW1lc3RhbXA7CitpbXBvcnQgamF2YS51dGlsLkFycmF5czsKK2ltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbnM7CitpbXBvcnQgamF2YS51dGlsLkxpc3Q7CitpbXBvcnQgamF2YS51dGlsLlNldDsKKworcHVibGljIGNsYXNzIFJlYmFzZUNoYW5nZSB7CisKKyAgcHVibGljIGludGVyZmFjZSBGYWN0b3J5IHsKKyAgICBSZWJhc2VDaGFuZ2UgY3JlYXRlKCk7CisgIH0KKworICBwcml2YXRlIGZpbmFsIENoYW5nZUNvbnRyb2wuRmFjdG9yeSBjaGFuZ2VDb250cm9sRmFjdG9yeTsKKyAgcHJpdmF0ZSBmaW5hbCBQYXRjaFNldEluZm9GYWN0b3J5IHBhdGNoU2V0SW5mb0ZhY3Rvcnk7CisgIHByaXZhdGUgZmluYWwgUmV2aWV3RGIgZGI7CisgIHByaXZhdGUgZmluYWwgR2l0UmVwb3NpdG9yeU1hbmFnZXIgZ2l0TWFuYWdlcjsKKyAgcHJpdmF0ZSBmaW5hbCBQZXJzb25JZGVudCBteUlkZW50OworICBwcml2YXRlIGZpbmFsIEdpdFJlZmVyZW5jZVVwZGF0ZWQgcmVwbGljYXRpb247CisgIHByaXZhdGUgZmluYWwgUmViYXNlZFBhdGNoU2V0U2VuZGVyLkZhY3RvcnkgcmViYXNlZFBhdGNoU2V0U2VuZGVyRmFjdG9yeTsKKyAgcHJpdmF0ZSBmaW5hbCBDaGFuZ2VIb29rUnVubmVyIGhvb2tzOworICBwcml2YXRlIGZpbmFsIEFwcHJvdmFsc1V0aWwgYXBwcm92YWxzVXRpbDsKKworICBASW5qZWN0CisgIFJlYmFzZUNoYW5nZShmaW5hbCBDaGFuZ2VDb250cm9sLkZhY3RvcnkgY2hhbmdlQ29udHJvbEZhY3RvcnksCisgICAgICBmaW5hbCBQYXRjaFNldEluZm9GYWN0b3J5IHBhdGNoU2V0SW5mb0ZhY3RvcnksIGZpbmFsIFJldmlld0RiIGRiLAorICAgICAgQEdlcnJpdFBlcnNvbklkZW50IGZpbmFsIFBlcnNvbklkZW50IG15SWRlbnQsCisgICAgICBmaW5hbCBHaXRSZXBvc2l0b3J5TWFuYWdlciBnaXRNYW5hZ2VyLAorICAgICAgZmluYWwgR2l0UmVmZXJlbmNlVXBkYXRlZCByZXBsaWNhdGlvbiwKKyAgICAgIGZpbmFsIFJlYmFzZWRQYXRjaFNldFNlbmRlci5GYWN0b3J5IHJlYmFzZWRQYXRjaFNldFNlbmRlckZhY3RvcnksCisgICAgICBmaW5hbCBDaGFuZ2VIb29rUnVubmVyIGhvb2tzLCBmaW5hbCBBcHByb3ZhbHNVdGlsIGFwcHJvdmFsc1V0aWwpIHsKKyAgICB0aGlzLmNoYW5nZUNvbnRyb2xGYWN0b3J5ID0gY2hhbmdlQ29udHJvbEZhY3Rvcnk7CisgICAgdGhpcy5wYXRjaFNldEluZm9GYWN0b3J5ID0gcGF0Y2hTZXRJbmZvRmFjdG9yeTsKKyAgICB0aGlzLmRiID0gZGI7CisgICAgdGhpcy5naXRNYW5hZ2VyID0gZ2l0TWFuYWdlcjsKKyAgICB0aGlzLm15SWRlbnQgPSBteUlkZW50OworICAgIHRoaXMucmVwbGljYXRpb24gPSByZXBsaWNhdGlvbjsKKyAgICB0aGlzLnJlYmFzZWRQYXRjaFNldFNlbmRlckZhY3RvcnkgPSByZWJhc2VkUGF0Y2hTZXRTZW5kZXJGYWN0b3J5OworICAgIHRoaXMuaG9va3MgPSBob29rczsKKyAgICB0aGlzLmFwcHJvdmFsc1V0aWwgPSBhcHByb3ZhbHNVdGlsOworICB9CisKKyAgLyoqCisgICAqIFJlYmFzZXMgdGhlIGNoYW5nZSBvZiB0aGUgZ2l2ZW4gcGF0Y2ggc2V0LgorICAgKgorICAgKiBJZiB0aGUgcGF0Y2ggc2V0IGhhcyBubyBkZXBlbmRlbmN5IHRvIGFuIG9wZW4gY2hhbmdlLCB0aGVuIHRoZSBjaGFuZ2UgaXMKKyAgICogcmViYXNlZCBvbiB0aGUgdGlwIG9mIHRoZSBkZXN0aW5hdGlvbiBicmFuY2guCisgICAqCisgICAqIElmIHRoZSBwYXRjaCBzZXQgZGVwZW5kcyBvbiBhbiBvcGVuIGNoYW5nZSwgaXQgaXMgcmViYXNlZCBvbiB0aGUgbGF0ZXN0CisgICAqIHBhdGNoIHNldCBvZiB0aGlzIGNoYW5nZS4KKyAgICoKKyAgICogVGhlIHJlYmFzZWQgY29tbWl0IGlzIGFkZGVkIGFzIG5ldyBwYXRjaCBzZXQgdG8gdGhlIGNoYW5nZS4KKyAgICoKKyAgICogRS1tYWlsIG5vdGlmaWNhdGlvbiBhbmQgdHJpZ2dlcmluZyBvZiBob29rcyBoYXBwZW5zIGZvciB0aGUgY3JlYXRpb24gb2YgdGhlCisgICAqIG5ldyBwYXRjaCBzZXQuCisgICAqCisgICAqIEBwYXJhbSBwYXRjaFNldElkIHRoZSBpZCBvZiB0aGUgcGF0Y2ggc2V0CisgICAqIEBwYXJhbSB1cGxvYWRlciB0aGUgdXNlciB0aGF0IGNyZWF0ZXMgdGhlIHJlYmFzZWQgcGF0Y2ggc2V0CisgICAqIEB0aHJvd3MgTm9TdWNoQ2hhbmdlRXhjZXB0aW9uIHRocm93biBpZiB0aGUgY2hhbmdlIHRvIHdoaWNoIHRoZSBwYXRjaCBzZXQKKyAgICogICAgICAgICBiZWxvbmdzIGRvZXMgbm90IGV4aXN0IG9yIGlzIG5vdCB2aXNpYmxlIHRvIHRoZSB1c2VyCisgICAqIEB0aHJvd3MgRW1haWxFeGNlcHRpb24gdGhyb3duIGlmIHNlbmRpbmcgdGhlIGUtbWFpbCB0byBub3RpZnkgYWJvdXQgdGhlIG5ldworICAgKiAgICAgICAgIHBhdGNoIHNldCBmYWlscworICAgKiBAdGhyb3dzIE9ybUV4Y2VwdGlvbiB0aHJvd24gaW4gY2FzZSBhY2Nlc3NpbmcgdGhlIGRhdGFiYXNlIGZhaWxzCisgICAqIEB0aHJvd3MgSU9FeGNlcHRpb24gdGhyb3duIGlmIHJlYmFzZSBpcyBub3QgcG9zc2libGUgb3Igbm90IG5lZWRlZAorICAgKiBAdGhyb3dzIEludmFsaWRDaGFuZ2VPcGVyYXRpb25FeGNlcHRpb24gdGhyb3duIGlmIHJlYmFzZSBpcyBub3QgYWxsb3dlZAorICAgKi8KKyAgcHVibGljIHZvaWQgcmViYXNlKGZpbmFsIFBhdGNoU2V0LklkIHBhdGNoU2V0SWQsIGZpbmFsIEFjY291bnQuSWQgdXBsb2FkZXIpCisgICAgICB0aHJvd3MgTm9TdWNoQ2hhbmdlRXhjZXB0aW9uLCBFbWFpbEV4Y2VwdGlvbiwgT3JtRXhjZXB0aW9uLCBJT0V4Y2VwdGlvbiwKKyAgICAgIEludmFsaWRDaGFuZ2VPcGVyYXRpb25FeGNlcHRpb24geworICAgIGZpbmFsIENoYW5nZS5JZCBjaGFuZ2VJZCA9IHBhdGNoU2V0SWQuZ2V0UGFyZW50S2V5KCk7CisgICAgZmluYWwgQ2hhbmdlQ29udHJvbCBjaGFuZ2VDb250cm9sID0KKyAgICAgICAgY2hhbmdlQ29udHJvbEZhY3RvcnkudmFsaWRhdGVGb3IoY2hhbmdlSWQpOworICAgIGZpbmFsIENoYW5nZSBjaGFuZ2UgPSBjaGFuZ2VDb250cm9sLmdldENoYW5nZSgpOworICAgIFJlcG9zaXRvcnkgZ2l0ID0gbnVsbDsKKyAgICBSZXZXYWxrIHJ3ID0gbnVsbDsKKyAgICBPYmplY3RJbnNlcnRlciBpbnNlcnRlciA9IG51bGw7CisgICAgdHJ5IHsKKyAgICAgIGdpdCA9IGdpdE1hbmFnZXIub3BlblJlcG9zaXRvcnkoY2hhbmdlLmdldFByb2plY3QoKSk7CisgICAgICBydyA9IG5ldyBSZXZXYWxrKGdpdCk7CisgICAgICBpbnNlcnRlciA9IGdpdC5uZXdPYmplY3RJbnNlcnRlcigpOworCisgICAgICBmaW5hbCBMaXN0PFBhdGNoU2V0QXBwcm92YWw+IG9sZFBhdGNoU2V0QXBwcm92YWxzID0KKyAgICAgICAgICBkYi5wYXRjaFNldEFwcHJvdmFscygpLmJ5Q2hhbmdlKGNoYW5nZS5nZXRJZCgpKS50b0xpc3QoKTsKKworICAgICAgZmluYWwgUmV2Q29tbWl0IGJhc2VDb21taXQgPQorICAgICAgICAgIGZpbmRCYXNlQ29tbWl0KGdpdCwgcncsIHBhdGNoU2V0SWQsIGNoYW5nZS5nZXREZXN0KCkpOworICAgICAgZmluYWwgUGF0Y2hTZXQgbmV3UGF0Y2hTZXQgPQorICAgICAgICAgIHJlYmFzZShnaXQsIHJ3LCBpbnNlcnRlciwgcGF0Y2hTZXRJZCwgY2hhbmdlLCB1cGxvYWRlciwgYmFzZUNvbW1pdCwKKyAgICAgICAgICAgICAgdHJ1ZSk7CisKKyAgICAgIGZpbmFsIFNldDxBY2NvdW50LklkPiBvbGRSZXZpZXdlcnMgPSBTZXRzLm5ld0hhc2hTZXQoKTsKKyAgICAgIGZpbmFsIFNldDxBY2NvdW50LklkPiBvbGRDQyA9IFNldHMubmV3SGFzaFNldCgpOworICAgICAgZm9yIChQYXRjaFNldEFwcHJvdmFsIGEgOiBvbGRQYXRjaFNldEFwcHJvdmFscykgeworICAgICAgICBpZiAoYS5nZXRWYWx1ZSgpICE9IDApIHsKKyAgICAgICAgICBvbGRSZXZpZXdlcnMuYWRkKGEuZ2V0QWNjb3VudElkKCkpOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgIG9sZENDLmFkZChhLmdldEFjY291bnRJZCgpKTsKKyAgICAgICAgfQorICAgICAgfQorICAgICAgZmluYWwgUmVwbGFjZVBhdGNoU2V0U2VuZGVyIGNtID0KKyAgICAgICAgICByZWJhc2VkUGF0Y2hTZXRTZW5kZXJGYWN0b3J5LmNyZWF0ZShjaGFuZ2UpOworICAgICAgY20uc2V0RnJvbSh1cGxvYWRlcik7CisgICAgICBjbS5zZXRQYXRjaFNldChuZXdQYXRjaFNldCk7CisgICAgICBjbS5hZGRSZXZpZXdlcnMob2xkUmV2aWV3ZXJzKTsKKyAgICAgIGNtLmFkZEV4dHJhQ0Mob2xkQ0MpOworICAgICAgY20uc2VuZCgpOworCisgICAgICBob29rcy5kb1BhdGNoc2V0Q3JlYXRlZEhvb2soY2hhbmdlLCBuZXdQYXRjaFNldCwgZGIpOworICAgIH0gY2F0Y2ggKFBhdGhDb25mbGljdEV4Y2VwdGlvbiBlKSB7CisgICAgICB0aHJvdyBuZXcgSU9FeGNlcHRpb24oZS5nZXRNZXNzYWdlKCkpOworICAgIH0gZmluYWxseSB7CisgICAgICBpZiAoaW5zZXJ0ZXIgIT0gbnVsbCkgeworICAgICAgICBpbnNlcnRlci5yZWxlYXNlKCk7CisgICAgICB9CisgICAgICBpZiAocncgIT0gbnVsbCkgeworICAgICAgICBydy5yZWxlYXNlKCk7CisgICAgICB9CisgICAgICBpZiAoZ2l0ICE9IG51bGwpIHsKKyAgICAgICAgZ2l0LmNsb3NlKCk7CisgICAgICB9CisgICAgfQorICB9CisKKyAgLyoqCisgICAqIEZpbmRzIHRoZSBjb21taXQgb24gd2hpY2ggdGhlIGdpdmVuIHBhdGNoIHNldCBzaG91bGQgYmUgYmFzZWQuCisgICAqCisgICAqIEBwYXJhbSBnaXQgdGhlIHJlcG9zaXRvcnkKKyAgICogQHBhcmFtIHJ3IHRoZSBSZXZXYWxrCisgICAqIEBwYXJhbSBwYXRjaFNldElkIHRoZSBpZCBvZiB0aGUgcGF0Y2ggc2V0IGZvciB3aGljaCB0aGUgbmV3IGJhc2UgY29tbWl0CisgICAqICAgICAgICBzaG91bGQgYmUgZm91bmQKKyAgICogQHBhcmFtIGRlc3RCcmFuY2ggdGhlIGRlc3RpbmF0aW9uIGJyYW5jaAorICAgKiBAcmV0dXJuIHRoZSBjb21taXQgb24gd2hpY2ggdGhlIGdpdmVuIHBhdGNoIHNldCBzaG91bGQgYmUgYmFzZWQKKyAgICogQHRocm93cyBJT0V4Y2VwdGlvbiB0aHJvd24gaWYgcmViYXNlIGlzIG5vdCBwb3NzaWJsZSBvciBub3QgbmVlZGVkCisgICAqIEB0aHJvd3MgT3JtRXhjZXB0aW9uIHRocm93biBpbiBjYXNlIGFjY2Vzc2luZyB0aGUgZGF0YWJhc2UgZmFpbHMKKyAgICovCisgIHByaXZhdGUgUmV2Q29tbWl0IGZpbmRCYXNlQ29tbWl0KGZpbmFsIFJlcG9zaXRvcnkgZ2l0LCBmaW5hbCBSZXZXYWxrIHJ3LAorICAgICAgZmluYWwgUGF0Y2hTZXQuSWQgcGF0Y2hTZXRJZCwgZmluYWwgQnJhbmNoLk5hbWVLZXkgZGVzdEJyYW5jaCkKKyAgICAgIHRocm93cyBJT0V4Y2VwdGlvbiwgT3JtRXhjZXB0aW9uIHsKKyAgICBSZXZDb21taXQgYmFzZUNvbW1pdCA9IG51bGw7CisKKyAgICBmaW5hbCBMaXN0PFBhdGNoU2V0QW5jZXN0b3I+IHBhdGNoU2V0QW5jZXN0b3JzID0KKyAgICAgICAgZGIucGF0Y2hTZXRBbmNlc3RvcnMoKS5hbmNlc3RvcnNPZihwYXRjaFNldElkKS50b0xpc3QoKTsKKyAgICBpZiAocGF0Y2hTZXRBbmNlc3RvcnMuc2l6ZSgpID4gMSkgeworICAgICAgdGhyb3cgbmV3IElPRXhjZXB0aW9uKAorICAgICAgICAgICJUaGUgcGF0Y2ggc2V0IHlvdSBhcmUgdHJ5aW5nIHRvIHJlYmFzZSBpcyBkZXBlbmRlbnQgb24gc2V2ZXJhbCBvdGhlciBwYXRjaCBzZXRzOiAiCisgICAgICAgICAgICAgICsgcGF0Y2hTZXRBbmNlc3RvcnMudG9TdHJpbmcoKSk7CisgICAgfQorICAgIGlmIChwYXRjaFNldEFuY2VzdG9ycy5zaXplKCkgPT0gMSkgeworICAgICAgZmluYWwgTGlzdDxQYXRjaFNldD4gZGVwUGF0Y2hTZXRMaXN0ID0KKyAgICAgICAgICBkYi5wYXRjaFNldHMoKQorICAgICAgICAgICAgICAuYnlSZXZpc2lvbihwYXRjaFNldEFuY2VzdG9ycy5nZXQoMCkuZ2V0QW5jZXN0b3JSZXZpc2lvbigpKQorICAgICAgICAgICAgICAudG9MaXN0KCk7CisgICAgICBpZiAoIWRlcFBhdGNoU2V0TGlzdC5pc0VtcHR5KCkpIHsKKyAgICAgICAgZmluYWwgUGF0Y2hTZXQgZGVwUGF0Y2hTZXQgPSBkZXBQYXRjaFNldExpc3QuZ2V0KDApOworCisgICAgICAgIGZpbmFsIENoYW5nZS5JZCBkZXBDaGFuZ2VJZCA9IGRlcFBhdGNoU2V0LmdldElkKCkuZ2V0UGFyZW50S2V5KCk7CisgICAgICAgIGZpbmFsIENoYW5nZSBkZXBDaGFuZ2UgPSBkYi5jaGFuZ2VzKCkuZ2V0KGRlcENoYW5nZUlkKTsKKworICAgICAgICBpZiAoZGVwQ2hhbmdlLmdldFN0YXR1cygpID09IFN0YXR1cy5BQkFORE9ORUQpIHsKKyAgICAgICAgICB0aHJvdyBuZXcgSU9FeGNlcHRpb24oIkNhbm5vdCByZWJhc2UgYWdhaW5zdCBhbiBhYmFuZG9uZWQgY2hhbmdlOiAiCisgICAgICAgICAgICAgICsgZGVwQ2hhbmdlLmdldEtleSgpLnRvU3RyaW5nKCkpOworICAgICAgICB9CisgICAgICAgIGlmIChkZXBDaGFuZ2UuZ2V0U3RhdHVzKCkuaXNPcGVuKCkpIHsKKyAgICAgICAgICBmaW5hbCBQYXRjaFNldCBsYXRlc3REZXBQYXRjaFNldCA9CisgICAgICAgICAgICAgIGRiLnBhdGNoU2V0cygpLmdldChkZXBDaGFuZ2UuY3VycmVudFBhdGNoU2V0SWQoKSk7CisgICAgICAgICAgaWYgKCFkZXBQYXRjaFNldC5nZXRJZCgpLmVxdWFscyhkZXBDaGFuZ2UuY3VycmVudFBhdGNoU2V0SWQoKSkpIHsKKyAgICAgICAgICAgIGJhc2VDb21taXQgPQorICAgICAgICAgICAgICAgIHJ3LnBhcnNlQ29tbWl0KE9iamVjdElkLmZyb21TdHJpbmcobGF0ZXN0RGVwUGF0Y2hTZXQKKyAgICAgICAgICAgICAgICAgICAgLmdldFJldmlzaW9uKCkuZ2V0KCkpKTsKKyAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgdGhyb3cgbmV3IElPRXhjZXB0aW9uKAorICAgICAgICAgICAgICAgICJDaGFuZ2UgaXMgYWxyZWFkeSBiYXNlZCBvbiB0aGUgbGF0ZXN0IHBhdGNoIHNldCBvZiB0aGUgZGVwZW5kZW50IGNoYW5nZS4iKTsKKyAgICAgICAgICB9CisgICAgICAgIH0KKyAgICAgIH0KKyAgICB9CisKKyAgICBpZiAoYmFzZUNvbW1pdCA9PSBudWxsKSB7CisgICAgICAvLyBXZSBhcmUgZGVwZW5kZW50IG9uIGEgbWVyZ2VkIFBhdGNoU2V0IG9yIGhhdmUgbm8gUGF0Y2hTZXQKKyAgICAgIC8vIGRlcGVuZGVuY2llcyBhdCBhbGwuCisgICAgICBmaW5hbCBSZWYgZGVzdFJlZiA9IGdpdC5nZXRSZWYoZGVzdEJyYW5jaC5nZXQoKSk7CisgICAgICBpZiAoZGVzdFJlZiA9PSBudWxsKSB7CisgICAgICAgIHRocm93IG5ldyBJT0V4Y2VwdGlvbigiVGhlIGRlc3RpbmF0aW9uIGJyYW5jaCBkb2VzIG5vdCBleGlzdDogIgorICAgICAgICAgICAgKyBkZXN0QnJhbmNoLmdldCgpKTsKKyAgICAgIH0KKyAgICAgIGJhc2VDb21taXQgPSBydy5wYXJzZUNvbW1pdChkZXN0UmVmLmdldE9iamVjdElkKCkpOworICAgIH0KKworICAgIHJldHVybiBiYXNlQ29tbWl0OworICB9CisKKyAgLyoqCisgICAqIFJlYmFzZXMgdGhlIGNoYW5nZSBvZiB0aGUgZ2l2ZW4gcGF0Y2ggc2V0IG9uIHRoZSBnaXZlbiBiYXNlIGNvbW1pdC4KKyAgICoKKyAgICogVGhlIHJlYmFzZWQgY29tbWl0IGlzIGFkZGVkIGFzIG5ldyBwYXRjaCBzZXQgdG8gdGhlIGNoYW5nZS4KKyAgICoKKyAgICogRS1tYWlsIG5vdGlmaWNhdGlvbiBhbmQgdHJpZ2dlcmluZyBvZiBob29rcyBpcyBOT1QgZG9uZSBmb3IgdGhlIGNyZWF0aW9uIG9mCisgICAqIHRoZSBuZXcgcGF0Y2ggc2V0LgorICAgKgorICAgKiBAcGFyYW0gZ2l0IHRoZSByZXBvc2l0b3J5CisgICAqIEBwYXJhbSByZXZXYWxrIHRoZSBSZXZXYWxrCisgICAqIEBwYXJhbSBpbnNlcnRlciB0aGUgb2JqZWN0IGluc2VydGVyCisgICAqIEBwYXJhbSBwYXRjaFNldElkIHRoZSBpZCBvZiB0aGUgcGF0Y2ggc2V0CisgICAqIEBwYXJhbSBjaGcgdGhlIGNoYW5nZSB0aGF0IHNob3VsZCBiZSByZWJhc2VkCisgICAqIEBwYXJhbSB1cGxvYWRlciB0aGUgdXNlciB0aGF0IGNyZWF0ZXMgdGhlIHJlYmFzZWQgcGF0Y2ggc2V0CisgICAqIEBwYXJhbSBiYXNlQ29tbWl0IHRoZSBjb21taXQgdGhhdCBzaG91bGQgYmUgdGhlIG5ldyBiYXNlCisgICAqIEBwYXJhbSB1c2VDb250ZW50TWVyZ2UgZmxhZyB0aGF0IGRlY2lkZXMgaWYgY29udGVudCBtZXJnZSBzaG91bGQgYmUgZG9uZQorICAgKiBAcmV0dXJuIHRoZSBuZXcgcGF0Y2ggc2V0IHdoaWNoIGlzIGJhc2VkIG9uIHRoZSBnaXZlbiBiYXNlIGNvbW1pdAorICAgKiBAdGhyb3dzIE5vU3VjaENoYW5nZUV4Y2VwdGlvbiB0aHJvd24gaWYgdGhlIGNoYW5nZSB0byB3aGljaCB0aGUgcGF0Y2ggc2V0CisgICAqICAgICAgICAgYmVsb25ncyBkb2VzIG5vdCBleGlzdCBvciBpcyBub3QgdmlzaWJsZSB0byB0aGUgdXNlcgorICAgKiBAdGhyb3dzIE9ybUV4Y2VwdGlvbiB0aHJvd24gaW4gY2FzZSBhY2Nlc3NpbmcgdGhlIGRhdGFiYXNlIGZhaWxzCisgICAqIEB0aHJvd3MgSU9FeGNlcHRpb24gdGhyb3duIGlmIHJlYmFzZSBpcyBub3QgcG9zc2libGUgb3Igbm90IG5lZWRlZAorICAgKiBAdGhyb3dzIEludmFsaWRDaGFuZ2VPcGVyYXRpb25FeGNlcHRpb24gdGhyb3duIGlmIHJlYmFzZSBpcyBub3QgYWxsb3dlZAorICAgKi8KKyAgcHVibGljIFBhdGNoU2V0IHJlYmFzZShmaW5hbCBSZXBvc2l0b3J5IGdpdCwgZmluYWwgUmV2V2FsayByZXZXYWxrLAorICAgICAgZmluYWwgT2JqZWN0SW5zZXJ0ZXIgaW5zZXJ0ZXIsIGZpbmFsIFBhdGNoU2V0LklkIHBhdGNoU2V0SWQsCisgICAgICBmaW5hbCBDaGFuZ2UgY2hnLCBmaW5hbCBBY2NvdW50LklkIHVwbG9hZGVyLCBmaW5hbCBSZXZDb21taXQgYmFzZUNvbW1pdCwKKyAgICAgIGZpbmFsIGJvb2xlYW4gdXNlQ29udGVudE1lcmdlKSB0aHJvd3MgTm9TdWNoQ2hhbmdlRXhjZXB0aW9uLAorICAgICAgT3JtRXhjZXB0aW9uLCBJT0V4Y2VwdGlvbiwgSW52YWxpZENoYW5nZU9wZXJhdGlvbkV4Y2VwdGlvbiwKKyAgICAgIFBhdGhDb25mbGljdEV4Y2VwdGlvbiB7CisgICAgQ2hhbmdlIGNoYW5nZSA9IGNoZzsKKyAgICBmaW5hbCBDaGFuZ2VDb250cm9sIGNoYW5nZUNvbnRyb2wgPQorICAgICAgICBjaGFuZ2VDb250cm9sRmFjdG9yeS52YWxpZGF0ZUZvcihjaGFuZ2UpOworICAgIGlmICghY2hhbmdlQ29udHJvbC5jYW5SZWJhc2UoKSkgeworICAgICAgdGhyb3cgbmV3IEludmFsaWRDaGFuZ2VPcGVyYXRpb25FeGNlcHRpb24oCisgICAgICAgICAgIkNhbm5vdCByZWJhc2U6IE5ldyBwYXRjaCBzZXRzIGFyZSBub3QgYWxsb3dlZCB0byBiZSBhZGRlZCB0byBjaGFuZ2U6ICIKKyAgICAgICAgICAgICAgKyBjaGFuZ2UuZ2V0SWQoKS50b1N0cmluZygpKTsKKyAgICB9CisKKyAgICBmaW5hbCBQYXRjaFNldCBvcmlnaW5hbFBhdGNoU2V0ID0gZGIucGF0Y2hTZXRzKCkuZ2V0KHBhdGNoU2V0SWQpOworCisgICAgZmluYWwgUmV2Q29tbWl0IHJlYmFzZWRDb21taXQ7CisgICAgT2JqZWN0SWQgb2xkSWQgPSBPYmplY3RJZC5mcm9tU3RyaW5nKG9yaWdpbmFsUGF0Y2hTZXQuZ2V0UmV2aXNpb24oKS5nZXQoKSk7CisgICAgT2JqZWN0SWQgbmV3SWQgPQorICAgICAgICByZWJhc2VDb21taXQoZ2l0LCBpbnNlcnRlciwgcmV2V2Fsay5wYXJzZUNvbW1pdChvbGRJZCksIGJhc2VDb21taXQsCisgICAgICAgICAgICB1c2VDb250ZW50TWVyZ2UsIG15SWRlbnQpOworCisgICAgcmViYXNlZENvbW1pdCA9IHJldldhbGsucGFyc2VDb21taXQobmV3SWQpOworCisgICAgY2hhbmdlLm5leHRQYXRjaFNldElkKCk7CisgICAgZmluYWwgUGF0Y2hTZXQgbmV3UGF0Y2hTZXQgPSBuZXcgUGF0Y2hTZXQoY2hhbmdlLmN1cnJQYXRjaFNldElkKCkpOworICAgIG5ld1BhdGNoU2V0LnNldENyZWF0ZWRPbihuZXcgVGltZXN0YW1wKFN5c3RlbS5jdXJyZW50VGltZU1pbGxpcygpKSk7CisgICAgbmV3UGF0Y2hTZXQuc2V0VXBsb2FkZXIodXBsb2FkZXIpOworICAgIG5ld1BhdGNoU2V0LnNldFJldmlzaW9uKG5ldyBSZXZJZChyZWJhc2VkQ29tbWl0Lm5hbWUoKSkpOworICAgIG5ld1BhdGNoU2V0LnNldERyYWZ0KG9yaWdpbmFsUGF0Y2hTZXQuaXNEcmFmdCgpKTsKKworICAgIGZpbmFsIFBhdGNoU2V0SW5mbyBpbmZvID0KKyAgICAgICAgcGF0Y2hTZXRJbmZvRmFjdG9yeS5nZXQocmViYXNlZENvbW1pdCwgbmV3UGF0Y2hTZXQuZ2V0SWQoKSk7CisKKyAgICBmaW5hbCBSZWZVcGRhdGUgcnUgPSBnaXQudXBkYXRlUmVmKG5ld1BhdGNoU2V0LmdldFJlZk5hbWUoKSk7CisgICAgcnUuc2V0RXhwZWN0ZWRPbGRPYmplY3RJZChPYmplY3RJZC56ZXJvSWQoKSk7CisgICAgcnUuc2V0TmV3T2JqZWN0SWQocmViYXNlZENvbW1pdCk7CisgICAgcnUuZGlzYWJsZVJlZkxvZygpOworICAgIGlmIChydS51cGRhdGUocmV2V2FsaykgIT0gUmVmVXBkYXRlLlJlc3VsdC5ORVcpIHsKKyAgICAgIHRocm93IG5ldyBJT0V4Y2VwdGlvbihTdHJpbmcuZm9ybWF0KCJGYWlsZWQgdG8gY3JlYXRlIHJlZiAlcyBpbiAlczogJXMiLAorICAgICAgICAgIG5ld1BhdGNoU2V0LmdldFJlZk5hbWUoKSwgY2hhbmdlLmdldERlc3QoKS5nZXRQYXJlbnRLZXkoKS5nZXQoKSwKKyAgICAgICAgICBydS5nZXRSZXN1bHQoKSkpOworICAgIH0KKyAgICByZXBsaWNhdGlvbi5maXJlKGNoYW5nZS5nZXRQcm9qZWN0KCksIHJ1LmdldE5hbWUoKSk7CisKKyAgICBkYi5jaGFuZ2VzKCkuYmVnaW5UcmFuc2FjdGlvbihjaGFuZ2UuZ2V0SWQoKSk7CisgICAgdHJ5IHsKKyAgICAgIENoYW5nZSB1cGRhdGVkQ2hhbmdlOworCisgICAgICB1cGRhdGVkQ2hhbmdlID0KKyAgICAgICAgICBkYi5jaGFuZ2VzKCkuYXRvbWljVXBkYXRlKGNoYW5nZS5nZXRJZCgpLCBuZXcgQXRvbWljVXBkYXRlPENoYW5nZT4oKSB7CisgICAgICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgICAgIHB1YmxpYyBDaGFuZ2UgdXBkYXRlKENoYW5nZSBjaGFuZ2UpIHsKKyAgICAgICAgICAgICAgaWYgKGNoYW5nZS5nZXRTdGF0dXMoKS5pc09wZW4oKSkgeworICAgICAgICAgICAgICAgIGNoYW5nZS51cGRhdGVOdW1iZXJPZlBhdGNoU2V0cyhuZXdQYXRjaFNldC5nZXRQYXRjaFNldElkKCkpOworICAgICAgICAgICAgICAgIHJldHVybiBjaGFuZ2U7CisgICAgICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAgICAgcmV0dXJuIG51bGw7CisgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0KKyAgICAgICAgICB9KTsKKyAgICAgIGlmICh1cGRhdGVkQ2hhbmdlICE9IG51bGwpIHsKKyAgICAgICAgY2hhbmdlID0gdXBkYXRlZENoYW5nZTsKKyAgICAgIH0gZWxzZSB7CisgICAgICAgIHRocm93IG5ldyBJbnZhbGlkQ2hhbmdlT3BlcmF0aW9uRXhjZXB0aW9uKFN0cmluZy5mb3JtYXQoCisgICAgICAgICAgICAiQ2hhbmdlICVzIGlzIGNsb3NlZCIsIGNoYW5nZS5nZXRJZCgpKSk7CisgICAgICB9CisKKyAgICAgIENoYW5nZVV0aWwuaW5zZXJ0QW5jZXN0b3JzKGRiLCBuZXdQYXRjaFNldC5nZXRJZCgpLCByZWJhc2VkQ29tbWl0KTsKKyAgICAgIGRiLnBhdGNoU2V0cygpLmluc2VydChDb2xsZWN0aW9ucy5zaW5nbGV0b24obmV3UGF0Y2hTZXQpKTsKKyAgICAgIHVwZGF0ZWRDaGFuZ2UgPQorICAgICAgICAgIGRiLmNoYW5nZXMoKS5hdG9taWNVcGRhdGUoY2hhbmdlLmdldElkKCksIG5ldyBBdG9taWNVcGRhdGU8Q2hhbmdlPigpIHsKKyAgICAgICAgICAgIEBPdmVycmlkZQorICAgICAgICAgICAgcHVibGljIENoYW5nZSB1cGRhdGUoQ2hhbmdlIGNoYW5nZSkgeworICAgICAgICAgICAgICBpZiAoY2hhbmdlLmdldFN0YXR1cygpLmlzQ2xvc2VkKCkpIHsKKyAgICAgICAgICAgICAgICByZXR1cm4gbnVsbDsKKyAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICBpZiAoIWNoYW5nZS5jdXJyZW50UGF0Y2hTZXRJZCgpLmVxdWFscyhwYXRjaFNldElkKSkgeworICAgICAgICAgICAgICAgIHJldHVybiBudWxsOworICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgIGlmIChjaGFuZ2UuZ2V0U3RhdHVzKCkgIT0gQ2hhbmdlLlN0YXR1cy5EUkFGVCkgeworICAgICAgICAgICAgICAgIGNoYW5nZS5zZXRTdGF0dXMoQ2hhbmdlLlN0YXR1cy5ORVcpOworICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgIGNoYW5nZS5zZXRMYXN0U2hhMU1lcmdlVGVzdGVkKG51bGwpOworICAgICAgICAgICAgICBjaGFuZ2Uuc2V0Q3VycmVudFBhdGNoU2V0KGluZm8pOworICAgICAgICAgICAgICBDaGFuZ2VVdGlsLnVwZGF0ZWQoY2hhbmdlKTsKKyAgICAgICAgICAgICAgcmV0dXJuIGNoYW5nZTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICB9KTsKKyAgICAgIGlmICh1cGRhdGVkQ2hhbmdlICE9IG51bGwpIHsKKyAgICAgICAgY2hhbmdlID0gdXBkYXRlZENoYW5nZTsKKyAgICAgIH0gZWxzZSB7CisgICAgICAgIHRocm93IG5ldyBJbnZhbGlkQ2hhbmdlT3BlcmF0aW9uRXhjZXB0aW9uKFN0cmluZy5mb3JtYXQoCisgICAgICAgICAgICAiQ2hhbmdlICVzIHdhcyBtb2RpZmllZCIsIGNoYW5nZS5nZXRJZCgpKSk7CisgICAgICB9CisKKyAgICAgIGFwcHJvdmFsc1V0aWwuY29weVZldG9zVG9MYXRlc3RQYXRjaFNldChjaGFuZ2UpOworCisgICAgICBmaW5hbCBDaGFuZ2VNZXNzYWdlIGNtc2cgPQorICAgICAgICAgIG5ldyBDaGFuZ2VNZXNzYWdlKG5ldyBDaGFuZ2VNZXNzYWdlLktleShjaGFuZ2UuZ2V0SWQoKSwKKyAgICAgICAgICAgICAgQ2hhbmdlVXRpbC5tZXNzYWdlVVVJRChkYikpLCB1cGxvYWRlciwgcGF0Y2hTZXRJZCk7CisgICAgICBjbXNnLnNldE1lc3NhZ2UoIlBhdGNoIFNldCAiICsgcGF0Y2hTZXRJZC5nZXQoKSArICI6IFJlYmFzZWQiKTsKKyAgICAgIGRiLmNoYW5nZU1lc3NhZ2VzKCkuaW5zZXJ0KENvbGxlY3Rpb25zLnNpbmdsZXRvbihjbXNnKSk7CisgICAgICBkYi5jb21taXQoKTsKKyAgICB9IGZpbmFsbHkgeworICAgICAgZGIucm9sbGJhY2soKTsKKyAgICB9CisKKyAgICByZXR1cm4gbmV3UGF0Y2hTZXQ7CisgIH0KKworICAvKioKKyAgICogUmViYXNlcyBhIGNvbW1pdC4KKyAgICoKKyAgICogQHBhcmFtIGdpdCByZXBvc2l0b3J5IHRvIGZpbmQgY29tbWl0cyBpbgorICAgKiBAcGFyYW0gaW5zZXJ0ZXIgaW5zZXJ0ZXIgdG8gaGFuZGxlIG5ldyB0cmVlcyBhbmQgYmxvYnMKKyAgICogQHBhcmFtIG9yaWdpbmFsIFRoZSBjb21taXQgdG8gcmViYXNlCisgICAqIEBwYXJhbSBiYXNlIEJhc2UgdG8gcmViYXNlIGFnYWluc3QKKyAgICogQHBhcmFtIHVzZUNvbnRlbnRNZXJnZSBmbGFnIHRvIGRlY2lkZSBpZiBjb250ZW50IG1lcmdlIHNob3VsZCBiZSBkb25lCisgICAqIEBwYXJhbSBjb21taXR0ZXJJZGVudCBjb21taXR0ZXIgaWRlbnRpdHkKKyAgICogQHJldHVybiB0aGUgaWQgb2YgdGhlIHJlYmFzZWQgY29tbWl0CisgICAqIEB0aHJvd3MgSU9FeGNlcHRpb24gTWVyZ2VkIGZhaWxlZAorICAgKiBAdGhyb3dzIFBhdGhDb25mbGljdEV4Y2VwdGlvbiB0aGUgcmViYXNlIGZhaWxlZCBkdWUgdG8gYSBwYXRoIGNvbmZsaWN0CisgICAqLworICBwcml2YXRlIHN0YXRpYyBPYmplY3RJZCByZWJhc2VDb21taXQoZmluYWwgUmVwb3NpdG9yeSBnaXQsCisgICAgICBmaW5hbCBPYmplY3RJbnNlcnRlciBpbnNlcnRlciwgZmluYWwgUmV2Q29tbWl0IG9yaWdpbmFsLAorICAgICAgZmluYWwgUmV2Q29tbWl0IGJhc2UsIGZpbmFsIGJvb2xlYW4gdXNlQ29udGVudE1lcmdlLAorICAgICAgZmluYWwgUGVyc29uSWRlbnQgY29tbWl0dGVySWRlbnQpIHRocm93cyBJT0V4Y2VwdGlvbiwKKyAgICAgIFBhdGhDb25mbGljdEV4Y2VwdGlvbiB7CisgICAgaWYgKG9yaWdpbmFsLmdldFBhcmVudENvdW50KCkgPT0gMCkgeworICAgICAgdGhyb3cgbmV3IElPRXhjZXB0aW9uKAorICAgICAgICAgICJDb21taXRzIHdpdGggbm8gcGFyZW50cyBjYW5ub3QgYmUgcmViYXNlZCAoaXMgdGhpcyB0aGUgaW5pdGlhbCBjb21taXQ/KS4iKTsKKyAgICB9CisKKyAgICBpZiAob3JpZ2luYWwuZ2V0UGFyZW50Q291bnQoKSA+IDEpIHsKKyAgICAgIHRocm93IG5ldyBJT0V4Y2VwdGlvbigKKyAgICAgICAgICAiUGF0Y2ggc2V0cyB3aXRoIG11bHRpcGxlIHBhcmVudHMgY2Fubm90IGJlIHJlYmFzZWQgKG1lcmdlIGNvbW1pdHMpLiIKKyAgICAgICAgICAgICAgKyAiIFBhcmVudHM6ICIgKyBBcnJheXMudG9TdHJpbmcob3JpZ2luYWwuZ2V0UGFyZW50cygpKSk7CisgICAgfQorCisgICAgZmluYWwgUmV2Q29tbWl0IHBhcmVudENvbW1pdCA9IG9yaWdpbmFsLmdldFBhcmVudCgwKTsKKworICAgIGlmIChiYXNlLmVxdWFscyhwYXJlbnRDb21taXQpKSB7CisgICAgICB0aHJvdyBuZXcgSU9FeGNlcHRpb24oIkNoYW5nZSBpcyBhbHJlYWR5IHVwIHRvIGRhdGUuIik7CisgICAgfQorCisgICAgZmluYWwgVGhyZWVXYXlNZXJnZXIgbWVyZ2VyID0gTWVyZ2VVdGlsLm5ld1RocmVlV2F5TWVyZ2VyKGdpdCwgaW5zZXJ0ZXIsIHVzZUNvbnRlbnRNZXJnZSk7CisgICAgbWVyZ2VyLnNldEJhc2UocGFyZW50Q29tbWl0KTsKKyAgICBtZXJnZXIubWVyZ2Uob3JpZ2luYWwsIGJhc2UpOworCisgICAgaWYgKG1lcmdlci5nZXRSZXN1bHRUcmVlSWQoKSA9PSBudWxsKSB7CisgICAgICB0aHJvdyBuZXcgUGF0aENvbmZsaWN0RXhjZXB0aW9uKAorICAgICAgICAgICJUaGUgcmViYXNlIGZhaWxlZCBzaW5jZSBjb25mbGljdHMgb2NjdXJlZCBkdXJpbmcgdGhlIG1lcmdlLiIpOworICAgIH0KKworICAgIGZpbmFsIENvbW1pdEJ1aWxkZXIgY2IgPSBuZXcgQ29tbWl0QnVpbGRlcigpOworICAgIGNiLnNldFRyZWVJZChtZXJnZXIuZ2V0UmVzdWx0VHJlZUlkKCkpOworICAgIGNiLnNldFBhcmVudElkKGJhc2UpOworICAgIGNiLnNldEF1dGhvcihvcmlnaW5hbC5nZXRBdXRob3JJZGVudCgpKTsKKyAgICBjYi5zZXRNZXNzYWdlKG9yaWdpbmFsLmdldEZ1bGxNZXNzYWdlKCkpOworICAgIGNiLnNldENvbW1pdHRlcihjb21taXR0ZXJJZGVudCk7CisgICAgZmluYWwgT2JqZWN0SWQgb2JqZWN0SWQgPSBpbnNlcnRlci5pbnNlcnQoY2IpOworICAgIGluc2VydGVyLmZsdXNoKCk7CisgICAgcmV0dXJuIG9iamVjdElkOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NvbmZpZy9Db25maWdTZWN0aW9uLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NvbmZpZy9Db25maWdTZWN0aW9uLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMDU3Y2U5OQotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY29uZmlnL0NvbmZpZ1NlY3Rpb24uamF2YQpAQCAtMCwwICsxLDM3IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZzsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLkNvbmZpZzsKKworLyoqIFByb3ZpZGVzIGFjY2VzcyB0byBvbmUgc2VjdGlvbiBmcm9tIHtAbGluayBDb25maWd9ICovCitwdWJsaWMgY2xhc3MgQ29uZmlnU2VjdGlvbiB7CisKKyAgcHJpdmF0ZSBmaW5hbCBDb25maWcgY2ZnOworICBwcml2YXRlIGZpbmFsIFN0cmluZyBzZWN0aW9uOworCisgIHB1YmxpYyBDb25maWdTZWN0aW9uKENvbmZpZyBjZmcsIFN0cmluZyBzZWN0aW9uKSB7CisgICAgdGhpcy5jZmcgPSBjZmc7CisgICAgdGhpcy5zZWN0aW9uID0gc2VjdGlvbjsKKyAgfQorCisgIHB1YmxpYyBTdHJpbmcgb3B0aW9uYWwoU3RyaW5nIG5hbWUpIHsKKyAgICByZXR1cm4gY2ZnLmdldFN0cmluZyhzZWN0aW9uLCBudWxsLCBuYW1lKTsKKyAgfQorCisgIHB1YmxpYyBTdHJpbmcgcmVxdWlyZWQoU3RyaW5nIG5hbWUpIHsKKyAgICByZXR1cm4gQ29uZmlnVXRpbC5nZXRSZXF1aXJlZChjZmcsIHNlY3Rpb24sIG5hbWUpOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NvbmZpZy9Db25maWdVdGlsLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NvbmZpZy9Db25maWdVdGlsLmphdmEKaW5kZXggNjA2OGM1MC4uMDE4MmM0MCAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jb25maWcvQ29uZmlnVXRpbC5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY29uZmlnL0NvbmZpZ1V0aWwuamF2YQpAQCAtMjI4LDcgKzIyOCw3IEBACiAgICAqLwogICBwdWJsaWMgc3RhdGljIGxvbmcgZ2V0VGltZVVuaXQoZmluYWwgU3RyaW5nIHZhbHVlU3RyaW5nLCBsb25nIGRlZmF1bHRWYWx1ZSwKICAgICAgIFRpbWVVbml0IHdhbnRVbml0KSB7Ci0gICAgTWF0Y2hlciBtID0gUGF0dGVybi5jb21waWxlKCJeKFsxLTldWzAtOV0qKVxccyooLiopJCIpLm1hdGNoZXIodmFsdWVTdHJpbmcpOworICAgIE1hdGNoZXIgbSA9IFBhdHRlcm4uY29tcGlsZSgiXigwfFsxLTldWzAtOV0qKVxccyooLiopJCIpLm1hdGNoZXIodmFsdWVTdHJpbmcpOwogICAgIGlmICghbS5tYXRjaGVzKCkpIHsKICAgICAgIHJldHVybiBkZWZhdWx0VmFsdWU7CiAgICAgfQpAQCAtMjg2LDYgKzI4NiwxNSBAQAogICAgIH0KICAgfQogCisgIHB1YmxpYyBzdGF0aWMgU3RyaW5nIGdldFJlcXVpcmVkKENvbmZpZyBjZmcsIFN0cmluZyBzZWN0aW9uLCBTdHJpbmcgbmFtZSkgeworICAgIGZpbmFsIFN0cmluZyB2ID0gY2ZnLmdldFN0cmluZyhzZWN0aW9uLCBudWxsLCBuYW1lKTsKKyAgICBpZiAodiA9PSBudWxsIHx8ICIiLmVxdWFscyh2KSkgeworICAgICAgdGhyb3cgbmV3IElsbGVnYWxBcmd1bWVudEV4Y2VwdGlvbigiTm8gIiArIHNlY3Rpb24gKyAiLiIgKyBuYW1lCisgICAgICAgICAgKyAiIGNvbmZpZ3VyZWQiKTsKKyAgICB9CisgICAgcmV0dXJuIHY7CisgIH0KKwogICBwcml2YXRlIHN0YXRpYyBib29sZWFuIG1hdGNoKGZpbmFsIFN0cmluZyBhLCBmaW5hbCBTdHJpbmcuLi4gY2FzZXMpIHsKICAgICBmb3IgKGZpbmFsIFN0cmluZyBiIDogY2FzZXMpIHsKICAgICAgIGlmIChlcXVhbHNJZ25vcmVDYXNlKGEsIGIpKSB7CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NvbmZpZy9HZXJyaXRHbG9iYWxNb2R1bGUuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY29uZmlnL0dlcnJpdEdsb2JhbE1vZHVsZS5qYXZhCmluZGV4IDJhNjY3MDYuLjFmYmRmODUgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY29uZmlnL0dlcnJpdEdsb2JhbE1vZHVsZS5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY29uZmlnL0dlcnJpdEdsb2JhbE1vZHVsZS5qYXZhCkBAIC01Miw2ICs1Miw3IEBACiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNhY2hlLkNhY2hlUmVtb3ZhbExpc3RlbmVyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5ldmVudHMuRXZlbnRGYWN0b3J5OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5leHRlbnNpb25zLmV2ZW50cy5HaXRSZWZlcmVuY2VVcGRhdGVkOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuQ2hhbmdlQ2FjaGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5DaGFuZ2VNZXJnZVF1ZXVlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuR2l0TW9kdWxlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuTWVyZ2VRdWV1ZTsKQEAgLTEyNSw2ICsxMjYsOCBAQAogICAgIGluc3RhbGwoUHJvamVjdENhY2hlSW1wbC5tb2R1bGUoKSk7CiAgICAgaW5zdGFsbChTZWN0aW9uU29ydENhY2hlLm1vZHVsZSgpKTsKICAgICBpbnN0YWxsKFRhZ0NhY2hlLm1vZHVsZSgpKTsKKyAgICBpbnN0YWxsKENoYW5nZUNhY2hlLm1vZHVsZSgpKTsKKwogICAgIGluc3RhbGwobmV3IEFjY2Vzc0NvbnRyb2xNb2R1bGUoKSk7CiAgICAgaW5zdGFsbChuZXcgR2l0TW9kdWxlKCkpOwogICAgIGluc3RhbGwobmV3IFByb2xvZ01vZHVsZSgpKTsKQEAgLTE3Niw2ICsxNzksNyBAQAogICAgIER5bmFtaWNTZXQuc2V0T2YoYmluZGVyKCksIENhY2hlUmVtb3ZhbExpc3RlbmVyLmNsYXNzKTsKICAgICBEeW5hbWljU2V0LnNldE9mKGJpbmRlcigpLCBHaXRSZWZlcmVuY2VVcGRhdGVkTGlzdGVuZXIuY2xhc3MpOwogICAgIER5bmFtaWNTZXQuc2V0T2YoYmluZGVyKCksIE5ld1Byb2plY3RDcmVhdGVkTGlzdGVuZXIuY2xhc3MpOworICAgIER5bmFtaWNTZXQuYmluZChiaW5kZXIoKSwgR2l0UmVmZXJlbmNlVXBkYXRlZExpc3RlbmVyLmNsYXNzKS50byhDaGFuZ2VDYWNoZS5jbGFzcyk7CiAKICAgICBiaW5kKEFub255bW91c1VzZXIuY2xhc3MpOwogICB9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NvbmZpZy9HZXJyaXRSZXF1ZXN0TW9kdWxlLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NvbmZpZy9HZXJyaXRSZXF1ZXN0TW9kdWxlLmphdmEKaW5kZXggYmE1NGM1Ni4uYjQxMTU1YiAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jb25maWcvR2Vycml0UmVxdWVzdE1vZHVsZS5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY29uZmlnL0dlcnJpdFJlcXVlc3RNb2R1bGUuamF2YQpAQCAtMjksNiArMjksNyBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LlZpc2libGVHcm91cHM7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNoYW5nZWRldGFpbC5EZWxldGVEcmFmdFBhdGNoU2V0OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jaGFuZ2VkZXRhaWwuUHVibGlzaERyYWZ0OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jaGFuZ2VkZXRhaWwuUmViYXNlQ2hhbmdlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jaGFuZ2VkZXRhaWwuU3VibWl0OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuQXN5bmNSZWNlaXZlQ29tbWl0czsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LkJhbkNvbW1pdDsKQEAgLTk1LDYgKzk2LDcgQEAKICAgICBmYWN0b3J5KERlbGV0ZURyYWZ0UGF0Y2hTZXQuRmFjdG9yeS5jbGFzcyk7CiAgICAgZmFjdG9yeShQdWJsaXNoQ29tbWVudHMuRmFjdG9yeS5jbGFzcyk7CiAgICAgZmFjdG9yeShQdWJsaXNoRHJhZnQuRmFjdG9yeS5jbGFzcyk7CisgICAgZmFjdG9yeShSZWJhc2VDaGFuZ2UuRmFjdG9yeS5jbGFzcyk7CiAgICAgZmFjdG9yeShSZXBsYWNlUGF0Y2hTZXRTZW5kZXIuRmFjdG9yeS5jbGFzcyk7CiAgICAgZmFjdG9yeShSZWJhc2VkUGF0Y2hTZXRTZW5kZXIuRmFjdG9yeS5jbGFzcyk7CiAgICAgZmFjdG9yeShBYmFuZG9uZWRTZW5kZXIuRmFjdG9yeS5jbGFzcyk7CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NvbmZpZy9NYXN0ZXJOb2RlU3RhcnR1cC5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jb25maWcvTWFzdGVyTm9kZVN0YXJ0dXAuamF2YQppbmRleCBiYjk1ZGNhLi5iZjk2YTIyIDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NvbmZpZy9NYXN0ZXJOb2RlU3RhcnR1cC5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY29uZmlnL01hc3Rlck5vZGVTdGFydHVwLmphdmEKQEAgLTE0LDM1ICsxNCw2MCBAQAogCiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWc7CiAKK2ltcG9ydCBzdGF0aWMgamF2YS51dGlsLmNvbmN1cnJlbnQuVGltZVVuaXQuTUlOVVRFUzsKK2ltcG9ydCBzdGF0aWMgamF2YS51dGlsLmNvbmN1cnJlbnQuVGltZVVuaXQuU0VDT05EUzsKKwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMuZXZlbnRzLkxpZmVjeWNsZUxpc3RlbmVyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmxpZmVjeWNsZS5MaWZlY3ljbGVNb2R1bGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5SZWxvYWRTdWJtaXRRdWV1ZU9wOwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5TaW5nbGV0b247CiAKLWltcG9ydCBqYXZhLnV0aWwuY29uY3VycmVudC5UaW1lVW5pdDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5Db25maWc7CisKK2ltcG9ydCBqYXZhLnV0aWwuY29uY3VycmVudC5TY2hlZHVsZWRGdXR1cmU7CiAKIC8qKiBDb25maWd1cmF0aW9uIGZvciBhIG1hc3RlciBub2RlIGluIGEgY2x1c3RlciBvZiBzZXJ2ZXJzLiAqLwogcHVibGljIGNsYXNzIE1hc3Rlck5vZGVTdGFydHVwIGV4dGVuZHMgTGlmZWN5Y2xlTW9kdWxlIHsKICAgQE92ZXJyaWRlCiAgIHB1YmxpYyB2b2lkIGNvbmZpZ3VyZSgpIHsKLSAgICBsaXN0ZW5lcigpLnRvKE9uU3RhcnQuY2xhc3MpOworICAgIGxpc3RlbmVyKCkudG8oTGlmZWN5Y2xlLmNsYXNzKTsKICAgfQogCi0gIHN0YXRpYyBjbGFzcyBPblN0YXJ0IGltcGxlbWVudHMgTGlmZWN5Y2xlTGlzdGVuZXIgeworICBAU2luZ2xldG9uCisgIHN0YXRpYyBjbGFzcyBMaWZlY3ljbGUgaW1wbGVtZW50cyBMaWZlY3ljbGVMaXN0ZW5lciB7CisgICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgaW50IElOSVRJQUxfREVMQVlfUyA9IDE1OworCiAgICAgcHJpdmF0ZSBmaW5hbCBSZWxvYWRTdWJtaXRRdWV1ZU9wLkZhY3Rvcnkgc3VibWl0OworICAgIHByaXZhdGUgZmluYWwgbG9uZyBkZWxheTsKKyAgICBwcml2YXRlIHZvbGF0aWxlIFNjaGVkdWxlZEZ1dHVyZTw/PiBoYW5kbGU7CiAKICAgICBASW5qZWN0Ci0gICAgT25TdGFydChmaW5hbCBSZWxvYWRTdWJtaXRRdWV1ZU9wLkZhY3Rvcnkgc3VibWl0KSB7CisgICAgTGlmZWN5Y2xlKFJlbG9hZFN1Ym1pdFF1ZXVlT3AuRmFjdG9yeSBzdWJtaXQsCisgICAgICAgIEBHZXJyaXRTZXJ2ZXJDb25maWcgQ29uZmlnIGNvbmZpZykgewogICAgICAgdGhpcy5zdWJtaXQgPSBzdWJtaXQ7CisgICAgICB0aGlzLmRlbGF5ID0gQ29uZmlnVXRpbC5nZXRUaW1lVW5pdChjb25maWcsCisgICAgICAgICAgImNoYW5nZU1lcmdlIiwgbnVsbCwgImNoZWNrRnJlcXVlbmN5IiwKKyAgICAgICAgICBTRUNPTkRTLmNvbnZlcnQoNSwgTUlOVVRFUyksIFNFQ09ORFMpOwogICAgIH0KIAogICAgIEBPdmVycmlkZQogICAgIHB1YmxpYyB2b2lkIHN0YXJ0KCkgewotICAgICAgc3VibWl0LmNyZWF0ZSgpLnN0YXJ0KDE1LCBUaW1lVW5pdC5TRUNPTkRTKTsKKyAgICAgIGlmIChkZWxheSA+IDApIHsKKyAgICAgICAgaGFuZGxlID0gc3VibWl0LmNyZWF0ZSgpCisgICAgICAgICAgICAuc3RhcnRXaXRoRml4ZWREZWxheShJTklUSUFMX0RFTEFZX1MsIGRlbGF5LCBTRUNPTkRTKTsKKyAgICAgIH0gZWxzZSB7CisgICAgICAgIGhhbmRsZSA9IHN1Ym1pdC5jcmVhdGUoKS5zdGFydChJTklUSUFMX0RFTEFZX1MsIFNFQ09ORFMpOworICAgICAgfQogICAgIH0KIAogICAgIEBPdmVycmlkZQogICAgIHB1YmxpYyB2b2lkIHN0b3AoKSB7CisgICAgICBTY2hlZHVsZWRGdXR1cmU8Pz4gZiA9IGhhbmRsZTsKKyAgICAgIGlmIChmICE9IG51bGwpIHsKKyAgICAgICAgaGFuZGxlID0gbnVsbDsKKyAgICAgICAgZi5jYW5jZWwodHJ1ZSk7CisgICAgICB9CiAgICAgfQogICB9CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2RvY3VtZW50YXRpb24vTWFya2Rvd25Gb3JtYXR0ZXIuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZG9jdW1lbnRhdGlvbi9NYXJrZG93bkZvcm1hdHRlci5qYXZhCmluZGV4IDZiYjdiYTguLmFmMDhkMWUgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZG9jdW1lbnRhdGlvbi9NYXJrZG93bkZvcm1hdHRlci5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZG9jdW1lbnRhdGlvbi9NYXJrZG93bkZvcm1hdHRlci5qYXZhCkBAIC0xMzYsOCArMTM2LDEyIEBACiAgICAgSW5wdXRTdHJlYW0gaW4gPSB1cmwub3BlblN0cmVhbSgpOwogICAgIHRyeSB7CiAgICAgICBUZW1wb3JhcnlCdWZmZXIuSGVhcCB0bXAgPSBuZXcgVGVtcG9yYXJ5QnVmZmVyLkhlYXAoMTI4ICogMTAyNCk7Ci0gICAgICB0bXAuY29weShpbik7Ci0gICAgICByZXR1cm4gbmV3IFN0cmluZyh0bXAudG9CeXRlQXJyYXkoKSwgIlVURi04Iik7CisgICAgICB0cnkgeworICAgICAgICB0bXAuY29weShpbik7CisgICAgICAgIHJldHVybiBuZXcgU3RyaW5nKHRtcC50b0J5dGVBcnJheSgpLCAiVVRGLTgiKTsKKyAgICAgIH0gZmluYWxseSB7CisgICAgICAgIHRtcC5jbG9zZSgpOworICAgICAgfQogICAgIH0gZmluYWxseSB7CiAgICAgICBpbi5jbG9zZSgpOwogICAgIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZXZlbnRzL0V2ZW50RmFjdG9yeS5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9ldmVudHMvRXZlbnRGYWN0b3J5LmphdmEKaW5kZXggZjA3YWUwYy4uNDg0NmI4MiAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9ldmVudHMvRXZlbnRGYWN0b3J5LmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9ldmVudHMvRXZlbnRGYWN0b3J5LmphdmEKQEAgLTIxLDYgKzIxLDcgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQnJhbmNoOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5DaGFuZ2U7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZU1lc3NhZ2U7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaExpbmVDb21tZW50OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXRBbmNlc3RvcjsKQEAgLTM1LDYgKzM2LDggQEAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucGF0Y2guUGF0Y2hMaXN0Q2FjaGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnBhdGNoLlBhdGNoTGlzdEVudHJ5OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wYXRjaC5QYXRjaExpc3ROb3RBdmFpbGFibGVFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnBhdGNoLlBhdGNoU2V0SW5mb0ZhY3Rvcnk7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnBhdGNoLlBhdGNoU2V0SW5mb05vdEF2YWlsYWJsZUV4Y2VwdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5TY2hlbWFGYWN0b3J5OwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKQEAgLTQ4LDggKzUxLDggQEAKIAogaW1wb3J0IGphdmEudXRpbC5BcnJheUxpc3Q7CiBpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb247Ci1pbXBvcnQgamF2YS51dGlsLk1hcDsKIGltcG9ydCBqYXZhLnV0aWwuTGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuTWFwOwogCiBpbXBvcnQgamF2YXguYW5ub3RhdGlvbi5OdWxsYWJsZTsKIApAQCAtNjEsMTIgKzY0LDE0IEBACiAgIHByaXZhdGUgZmluYWwgQXBwcm92YWxUeXBlcyBhcHByb3ZhbFR5cGVzOwogICBwcml2YXRlIGZpbmFsIFBhdGNoTGlzdENhY2hlIHBhdGNoTGlzdENhY2hlOwogICBwcml2YXRlIGZpbmFsIFNjaGVtYUZhY3Rvcnk8UmV2aWV3RGI+IHNjaGVtYTsKKyAgcHJpdmF0ZSBmaW5hbCBQYXRjaFNldEluZm9GYWN0b3J5IHBzSW5mb0ZhY3Rvcnk7CiAgIHByaXZhdGUgZmluYWwgUGVyc29uSWRlbnQgbXlJZGVudDsKIAogICBASW5qZWN0CiAgIEV2ZW50RmFjdG9yeShBY2NvdW50Q2FjaGUgYWNjb3VudENhY2hlLAogICAgICAgQENhbm9uaWNhbFdlYlVybCBATnVsbGFibGUgUHJvdmlkZXI8U3RyaW5nPiB1cmxQcm92aWRlciwKICAgICAgIEFwcHJvdmFsVHlwZXMgYXBwcm92YWxUeXBlcywKKyAgICAgIGZpbmFsIFBhdGNoU2V0SW5mb0ZhY3RvcnkgcHNpZiwKICAgICAgIFBhdGNoTGlzdENhY2hlIHBhdGNoTGlzdENhY2hlLCBTY2hlbWFGYWN0b3J5PFJldmlld0RiPiBzY2hlbWEsCiAgICAgICBAR2Vycml0UGVyc29uSWRlbnQgUGVyc29uSWRlbnQgbXlJZGVudCkgewogICAgIHRoaXMuYWNjb3VudENhY2hlID0gYWNjb3VudENhY2hlOwpAQCAtNzQsNiArNzksNyBAQAogICAgIHRoaXMuYXBwcm92YWxUeXBlcyA9IGFwcHJvdmFsVHlwZXM7CiAgICAgdGhpcy5wYXRjaExpc3RDYWNoZSA9IHBhdGNoTGlzdENhY2hlOwogICAgIHRoaXMuc2NoZW1hID0gc2NoZW1hOworICAgIHRoaXMucHNJbmZvRmFjdG9yeSA9IHBzaWY7CiAgICAgdGhpcy5teUlkZW50ID0gbXlJZGVudDsKICAgfQogCkBAIC0yOTEsNiArMjk3LDggQEAKICAgICAgICAgUGF0Y2hBdHRyaWJ1dGUgcCA9IG5ldyBQYXRjaEF0dHJpYnV0ZSgpOwogICAgICAgICBwLmZpbGUgPSBwYXRjaC5nZXROZXdOYW1lKCk7CiAgICAgICAgIHAudHlwZSA9IHBhdGNoLmdldENoYW5nZVR5cGUoKTsKKyAgICAgICAgcC5kZWxldGlvbnMgLT0gcGF0Y2guZ2V0RGVsZXRpb25zKCk7CisgICAgICAgIHAuaW5zZXJ0aW9ucyA9IHBhdGNoLmdldEluc2VydGlvbnMoKTsKICAgICAgICAgcGF0Y2hTZXRBdHRyaWJ1dGUuZmlsZXMuYWRkKHApOwogICAgICAgfQogICAgIH0gY2F0Y2ggKFBhdGNoTGlzdE5vdEF2YWlsYWJsZUV4Y2VwdGlvbiBlKSB7CkBAIC0zMjgsNiArMzM2LDcgQEAKICAgICBwLnJlZiA9IHBhdGNoU2V0LmdldFJlZk5hbWUoKTsKICAgICBwLnVwbG9hZGVyID0gYXNBY2NvdW50QXR0cmlidXRlKHBhdGNoU2V0LmdldFVwbG9hZGVyKCkpOwogICAgIHAuY3JlYXRlZE9uID0gcGF0Y2hTZXQuZ2V0Q3JlYXRlZE9uKCkuZ2V0VGltZSgpIC8gMTAwMEw7CisgICAgZmluYWwgUGF0Y2hTZXQuSWQgcElkID0gcGF0Y2hTZXQuZ2V0SWQoKTsKICAgICB0cnkgewogICAgICAgZmluYWwgUmV2aWV3RGIgZGIgPSBzY2hlbWEub3BlbigpOwogICAgICAgdHJ5IHsKQEAgLTMzNiwxMSArMzQ1LDI4IEBACiAgICAgICAgICAgICBwYXRjaFNldC5nZXRJZCgpKSkgewogICAgICAgICAgIHAucGFyZW50cy5hZGQoYS5nZXRBbmNlc3RvclJldmlzaW9uKCkuZ2V0KCkpOwogICAgICAgICB9CisKKyAgICAgICAgcC5hdXRob3IgPSBhc0FjY291bnRBdHRyaWJ1dGUoLy8KKyAgICAgICAgICAgIHBzSW5mb0ZhY3RvcnkuZ2V0KGRiLCBwSWQpLmdldEF1dGhvcigpLmdldEFjY291bnQoKSk7CisKKyAgICAgICAgQ2hhbmdlIGNoYW5nZSA9IGRiLmNoYW5nZXMoKS5nZXQocElkLmdldFBhcmVudEtleSgpKTsKKyAgICAgICAgTGlzdDxQYXRjaD4gbGlzdCA9CisgICAgICAgICAgICBwYXRjaExpc3RDYWNoZS5nZXQoY2hhbmdlLCBwYXRjaFNldCkudG9QYXRjaExpc3QocElkKTsKKyAgICAgICAgZm9yIChQYXRjaCBwZSA6IGxpc3QpIHsKKyAgICAgICAgICBpZiAoIVBhdGNoLkNPTU1JVF9NU0cuZXF1YWxzKHBlLmdldEZpbGVOYW1lKCkpKSB7CisgICAgICAgICAgICBwLnNpemVEZWxldGlvbnMgLT0gcGUuZ2V0RGVsZXRpb25zKCk7CisgICAgICAgICAgICBwLnNpemVJbnNlcnRpb25zICs9IHBlLmdldEluc2VydGlvbnMoKTsKKyAgICAgICAgICB9CisgICAgICAgIH0KICAgICAgIH0gZmluYWxseSB7CiAgICAgICAgIGRiLmNsb3NlKCk7CiAgICAgICB9CiAgICAgfSBjYXRjaCAoT3JtRXhjZXB0aW9uIGUpIHsKICAgICAgIGxvZy5lcnJvcigiQ2Fubm90IGxvYWQgcGF0Y2ggc2V0IGRhdGEgZm9yICIgKyBwYXRjaFNldC5nZXRJZCgpLCBlKTsKKyAgICB9IGNhdGNoIChQYXRjaFNldEluZm9Ob3RBdmFpbGFibGVFeGNlcHRpb24gZSkgeworICAgICAgbG9nLmVycm9yKFN0cmluZy5mb3JtYXQoIkNhbm5vdCBnZXQgYXV0aG9yRW1haWwgZm9yICVzLiIsIHBJZCksIGUpOworICAgIH0gY2F0Y2ggKFBhdGNoTGlzdE5vdEF2YWlsYWJsZUV4Y2VwdGlvbiBlKSB7CisgICAgICBsb2cuZXJyb3IoU3RyaW5nLmZvcm1hdCgiQ2Fubm90IGdldCBzaXplIGluZm9ybWF0aW9uIGZvciAlcy4iLCBwSWQpLCBlKTsKICAgICB9CiAgICAgcmV0dXJuIHA7CiAgIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZXZlbnRzL01lcmdlRmFpbGVkRXZlbnQuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZXZlbnRzL01lcmdlRmFpbGVkRXZlbnQuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5lNmZmNTI1Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9ldmVudHMvTWVyZ2VGYWlsZWRFdmVudC5qYXZhCkBAIC0wLDAgKzEsMjMgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZXZlbnRzOworCitwdWJsaWMgY2xhc3MgTWVyZ2VGYWlsZWRFdmVudCBleHRlbmRzIENoYW5nZUV2ZW50IHsKKyAgICBwdWJsaWMgZmluYWwgU3RyaW5nIHR5cGUgPSAibWVyZ2UtZmFpbGVkIjsKKyAgICBwdWJsaWMgQ2hhbmdlQXR0cmlidXRlIGNoYW5nZTsKKyAgICBwdWJsaWMgUGF0Y2hTZXRBdHRyaWJ1dGUgcGF0Y2hTZXQ7CisgICAgcHVibGljIEFjY291bnRBdHRyaWJ1dGUgc3VibWl0dGVyOworICAgIHB1YmxpYyBTdHJpbmcgcmVhc29uOworfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9ldmVudHMvUGF0Y2hBdHRyaWJ1dGUuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZXZlbnRzL1BhdGNoQXR0cmlidXRlLmphdmEKaW5kZXggMzgwMmZkZC4uMGQyYjA1NCAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9ldmVudHMvUGF0Y2hBdHRyaWJ1dGUuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2V2ZW50cy9QYXRjaEF0dHJpYnV0ZS5qYXZhCkBAIC0xOSw0ICsxOSw2IEBACiBwdWJsaWMgY2xhc3MgUGF0Y2hBdHRyaWJ1dGUgewogICAgIHB1YmxpYyBTdHJpbmcgZmlsZTsKICAgICBwdWJsaWMgQ2hhbmdlVHlwZSB0eXBlOworICAgIHB1YmxpYyBpbnQgaW5zZXJ0aW9uczsKKyAgICBwdWJsaWMgaW50IGRlbGV0aW9uczsKIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZXZlbnRzL1BhdGNoU2V0QXR0cmlidXRlLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2V2ZW50cy9QYXRjaFNldEF0dHJpYnV0ZS5qYXZhCmluZGV4IGY3MjZjZTMuLjExMjNlNWYgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZXZlbnRzL1BhdGNoU2V0QXR0cmlidXRlLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9ldmVudHMvUGF0Y2hTZXRBdHRyaWJ1dGUuamF2YQpAQCAtMjMsOCArMjMsMTEgQEAKICAgcHVibGljIFN0cmluZyByZWY7CiAgIHB1YmxpYyBBY2NvdW50QXR0cmlidXRlIHVwbG9hZGVyOwogICBwdWJsaWMgTG9uZyBjcmVhdGVkT247CisgIHB1YmxpYyBBY2NvdW50QXR0cmlidXRlIGF1dGhvcjsKIAogICBwdWJsaWMgTGlzdDxBcHByb3ZhbEF0dHJpYnV0ZT4gYXBwcm92YWxzOwogICBwdWJsaWMgTGlzdDxQYXRjaFNldENvbW1lbnRBdHRyaWJ1dGU+IGNvbW1lbnRzOwogICBwdWJsaWMgTGlzdDxQYXRjaEF0dHJpYnV0ZT4gZmlsZXM7CisgIHB1YmxpYyBpbnQgc2l6ZUluc2VydGlvbnM7CisgIHB1YmxpYyBpbnQgc2l6ZURlbGV0aW9uczsKIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZXZlbnRzL1F1ZXJ5U3RhdHMuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZXZlbnRzL1F1ZXJ5U3RhdHMuamF2YQppbmRleCAxYzVlN2Q3Li5lY2YyYjlhIDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2V2ZW50cy9RdWVyeVN0YXRzLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9ldmVudHMvUXVlcnlTdGF0cy5qYXZhCkBAIC0xOCw0ICsxOCw1IEBACiAgIHB1YmxpYyBmaW5hbCBTdHJpbmcgdHlwZSA9ICJzdGF0cyI7CiAgIHB1YmxpYyBpbnQgcm93Q291bnQ7CiAgIHB1YmxpYyBsb25nIHJ1blRpbWVNaWxsaXNlY29uZHM7CisgIHB1YmxpYyBTdHJpbmcgcmVzdW1lU29ydEtleTsKIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZXZlbnRzL1Jldmlld2VyQWRkZWRFdmVudC5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9ldmVudHMvUmV2aWV3ZXJBZGRlZEV2ZW50LmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYTg4MWQ4ZAotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZXZlbnRzL1Jldmlld2VyQWRkZWRFdmVudC5qYXZhCkBAIC0wLDAgKzEsMjIgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZXZlbnRzOworCitwdWJsaWMgY2xhc3MgUmV2aWV3ZXJBZGRlZEV2ZW50IGV4dGVuZHMgQ2hhbmdlRXZlbnQgeworICAgIHB1YmxpYyBmaW5hbCBTdHJpbmcgdHlwZSA9ICJyZXZpZXdlci1hZGRlZCI7CisgICAgcHVibGljIENoYW5nZUF0dHJpYnV0ZSBjaGFuZ2U7CisgICAgcHVibGljIFBhdGNoU2V0QXR0cmlidXRlIHBhdGNoU2V0OworICAgIHB1YmxpYyBBY2NvdW50QXR0cmlidXRlIHJldmlld2VyOworfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvQmFuQ29tbWl0LmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9CYW5Db21taXQuamF2YQppbmRleCBjMGUwMGFhLi43OWUzNWJlIDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9CYW5Db21taXQuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9CYW5Db21taXQuamF2YQpAQCAtOTIsNyArOTIsOCBAQAogICAgICAgICAgIGJhbkNvbW1pdE5vdGVzLnNldChjb21taXRUb0JhbiwgY3JlYXRlTm90ZUNvbnRlbnQocmVhc29uLCBpbnNlcnRlcikpOwogICAgICAgICB9CiAgICAgICAgIGluc2VydGVyLmZsdXNoKCk7Ci0gICAgICAgIE5vdGVzQnJhbmNoVXRpbCBub3Rlc0JyYW5jaFV0aWwgPSBub3Rlc0JyYW5jaFV0aWxGYWN0b3J5LmNyZWF0ZShyZXBvKTsKKyAgICAgICAgTm90ZXNCcmFuY2hVdGlsIG5vdGVzQnJhbmNoVXRpbCA9IG5vdGVzQnJhbmNoVXRpbEZhY3RvcnkuY3JlYXRlKHJlcG8sCisgICAgICAgICAgICBpbnNlcnRlcik7CiAgICAgICAgIE5vdGVNYXAgbmV3bHlDcmVhdGVkID0KICAgICAgICAgICAgIG5vdGVzQnJhbmNoVXRpbC5jb21taXROZXdOb3RlcyhiYW5Db21taXROb3RlcywgUkVGX1JFSkVDVF9DT01NSVRTLAogICAgICAgICAgICAgICAgIGNyZWF0ZVBlcnNvbklkZW50KCksIGJ1aWxkQ29tbWl0TWVzc2FnZShjb21taXRzVG9CYW4sIHJlYXNvbikpOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvQ2hhbmdlQ2FjaGUuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L0NoYW5nZUNhY2hlLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYmYyYTE5ZgotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L0NoYW5nZUNhY2hlLmphdmEKQEAgLTAsMCArMSwxMDEgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS5wYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQ7CisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdDsKKworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNhY2hlLkNhY2hlTG9hZGVyOworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNhY2hlLkxvYWRpbmdDYWNoZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLmV2ZW50cy5HaXRSZWZlcmVuY2VVcGRhdGVkTGlzdGVuZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUHJvamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5zZXJ2ZXIuUmV2aWV3RGI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNhY2hlLkNhY2hlTW9kdWxlOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5TY2hlbWFGYWN0b3J5OworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Nb2R1bGU7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuU2luZ2xldG9uOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlR5cGVMaXRlcmFsOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0Lm5hbWUuTmFtZWQ7CisKK2ltcG9ydCBvcmcuc2xmNGouTG9nZ2VyOworaW1wb3J0IG9yZy5zbGY0ai5Mb2dnZXJGYWN0b3J5OworCitpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb25zOworaW1wb3J0IGphdmEudXRpbC5MaXN0OworaW1wb3J0IGphdmEudXRpbC5jb25jdXJyZW50LkV4ZWN1dGlvbkV4Y2VwdGlvbjsKKworQFNpbmdsZXRvbgorcHVibGljIGNsYXNzIENoYW5nZUNhY2hlIGltcGxlbWVudHMgR2l0UmVmZXJlbmNlVXBkYXRlZExpc3RlbmVyIHsKKyAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgTG9nZ2VyIGxvZyA9CisgICAgICBMb2dnZXJGYWN0b3J5LmdldExvZ2dlcihDaGFuZ2VDYWNoZS5jbGFzcyk7CisgIHByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZyBJRF9DQUNIRSA9ICJjaGFuZ2VzIjsKKworICBwdWJsaWMgc3RhdGljIE1vZHVsZSBtb2R1bGUoKSB7CisgICAgcmV0dXJuIG5ldyBDYWNoZU1vZHVsZSgpIHsKKyAgICAgIEBPdmVycmlkZQorICAgICAgcHJvdGVjdGVkIHZvaWQgY29uZmlndXJlKCkgeworICAgICAgICBjYWNoZShJRF9DQUNIRSwKKyAgICAgICAgICAgIFByb2plY3QuTmFtZUtleS5jbGFzcywKKyAgICAgICAgICAgIG5ldyBUeXBlTGl0ZXJhbDxMaXN0PENoYW5nZT4+KCkge30pCisgICAgICAgICAgLm1heGltdW1XZWlnaHQoMTAyNCkKKyAgICAgICAgICAubG9hZGVyKExvYWRlci5jbGFzcyk7CisgICAgICB9CisgICAgfTsKKyAgfQorCisgIHByaXZhdGUgZmluYWwgTG9hZGluZ0NhY2hlPFByb2plY3QuTmFtZUtleSwgTGlzdDxDaGFuZ2U+PiBjYWNoZTsKKworICBASW5qZWN0CisgIENoYW5nZUNhY2hlKEBOYW1lZChJRF9DQUNIRSkgTG9hZGluZ0NhY2hlPFByb2plY3QuTmFtZUtleSwgTGlzdDxDaGFuZ2U+PiBjYWNoZSkgeworICAgIHRoaXMuY2FjaGUgPSBjYWNoZTsKKyAgfQorCisgIExpc3Q8Q2hhbmdlPiBnZXQoUHJvamVjdC5OYW1lS2V5IG5hbWUpIHsKKyAgICB0cnkgeworICAgICAgcmV0dXJuIGNhY2hlLmdldChuYW1lKTsKKyAgICB9IGNhdGNoIChFeGVjdXRpb25FeGNlcHRpb24gZSkgeworICAgICAgbG9nLndhcm4oIkNhbm5vdCBmZXRjaCBjaGFuZ2VzIGZvciAiICsgbmFtZSwgZSk7CisgICAgICByZXR1cm4gQ29sbGVjdGlvbnMuZW1wdHlMaXN0KCk7CisgICAgfQorICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyB2b2lkIG9uR2l0UmVmZXJlbmNlVXBkYXRlZChHaXRSZWZlcmVuY2VVcGRhdGVkTGlzdGVuZXIuRXZlbnQgZXZlbnQpIHsKKyAgICBmb3IgKEdpdFJlZmVyZW5jZVVwZGF0ZWRMaXN0ZW5lci5VcGRhdGUgdSA6IGV2ZW50LmdldFVwZGF0ZXMoKSkgeworICAgICAgaWYgKHUuZ2V0UmVmTmFtZSgpLnN0YXJ0c1dpdGgoInJlZnMvY2hhbmdlcy8iKSkgeworICAgICAgICBjYWNoZS5pbnZhbGlkYXRlKG5ldyBQcm9qZWN0Lk5hbWVLZXkoZXZlbnQuZ2V0UHJvamVjdE5hbWUoKSkpOworICAgICAgICBicmVhazsKKyAgICAgIH0KKyAgICB9CisgIH0KKworICBzdGF0aWMgY2xhc3MgTG9hZGVyIGV4dGVuZHMgQ2FjaGVMb2FkZXI8UHJvamVjdC5OYW1lS2V5LCBMaXN0PENoYW5nZT4+IHsKKyAgICBwcml2YXRlIGZpbmFsIFNjaGVtYUZhY3Rvcnk8UmV2aWV3RGI+IHNjaGVtYTsKKworICAgIEBJbmplY3QKKyAgICBMb2FkZXIoU2NoZW1hRmFjdG9yeTxSZXZpZXdEYj4gc2NoZW1hKSB7CisgICAgICB0aGlzLnNjaGVtYSA9IHNjaGVtYTsKKyAgICB9CisKKyAgICBAT3ZlcnJpZGUKKyAgICBwdWJsaWMgTGlzdDxDaGFuZ2U+IGxvYWQoUHJvamVjdC5OYW1lS2V5IGtleSkgdGhyb3dzIEV4Y2VwdGlvbiB7CisgICAgICBmaW5hbCBSZXZpZXdEYiBkYiA9IHNjaGVtYS5vcGVuKCk7CisgICAgICB0cnkgeworICAgICAgICByZXR1cm4gQ29sbGVjdGlvbnMudW5tb2RpZmlhYmxlTGlzdChkYi5jaGFuZ2VzKCkuYnlQcm9qZWN0KGtleSkudG9MaXN0KCkpOworICAgICAgfSBmaW5hbGx5IHsKKyAgICAgICAgZGIuY2xvc2UoKTsKKyAgICAgIH0KKyAgICB9CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L0NoYW5nZU1lcmdlUXVldWUuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L0NoYW5nZU1lcmdlUXVldWUuamF2YQppbmRleCA2ZDFiMTU1Li5mNmM1ZjBhIDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9DaGFuZ2VNZXJnZVF1ZXVlLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvQ2hhbmdlTWVyZ2VRdWV1ZS5qYXZhCkBAIC0yNDMsNiArMjQzLDcgQEAKICAgICAgIGRlc3QgPSBkOwogICAgIH0KIAorICAgIEBPdmVycmlkZQogICAgIHB1YmxpYyB2b2lkIHJ1bigpIHsKICAgICAgIHVuc2NoZWR1bGUodGhpcyk7CiAgICAgICBtZXJnZUltcGwoZGVzdCk7CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9DaGVycnlQaWNrLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9DaGVycnlQaWNrLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYWNmNDU5MAotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L0NoZXJyeVBpY2suamF2YQpAQCAtMCwwICsxLDM4MyBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQ7CisKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5NZXJnZVV0aWwuY2FuQ2hlcnJ5UGljazsKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5NZXJnZVV0aWwuY29tbWl0OworaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0Lk1lcmdlVXRpbC5oYXNNaXNzaW5nRGVwZW5kZW5jaWVzOworaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0Lk1lcmdlVXRpbC5tYXJrQ2xlYW5NZXJnZXM7CitpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuTWVyZ2VVdGlsLm1lcmdlT25lQ29tbWl0OworaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0Lk1lcmdlVXRpbC5uZXdUaHJlZVdheU1lcmdlcjsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkFwcHJvdmFsVHlwZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5BcHByb3ZhbFR5cGVzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BcHByb3ZhbENhdGVnb3J5OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5DaGFuZ2U7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldEFuY2VzdG9yOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldEFwcHJvdmFsOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5SZXZJZDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZXh0ZW5zaW9ucy5ldmVudHMuR2l0UmVmZXJlbmNlVXBkYXRlZDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucGF0Y2guUGF0Y2hTZXRJbmZvRmFjdG9yeTsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlByb3ZpZGVyOworCitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuQ29tbWl0QnVpbGRlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5PYmplY3RJZDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5QZXJzb25JZGVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5SZWZVcGRhdGU7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5tZXJnZS5NZXJnZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5tZXJnZS5UaHJlZVdheU1lcmdlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LnJldndhbGsuRm9vdGVyS2V5OworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQucmV2d2Fsay5Gb290ZXJMaW5lOworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQucmV2d2Fsay5SZXZDb21taXQ7CitpbXBvcnQgb3JnLnNsZjRqLkxvZ2dlcjsKK2ltcG9ydCBvcmcuc2xmNGouTG9nZ2VyRmFjdG9yeTsKKworaW1wb3J0IGphdmEuaW8uSU9FeGNlcHRpb247CitpbXBvcnQgamF2YS5zcWwuVGltZXN0YW1wOworaW1wb3J0IGphdmEudXRpbC5BcnJheUxpc3Q7CitpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb25zOworaW1wb3J0IGphdmEudXRpbC5Db21wYXJhdG9yOworaW1wb3J0IGphdmEudXRpbC5IYXNoTWFwOworaW1wb3J0IGphdmEudXRpbC5MaXN0OworaW1wb3J0IGphdmEudXRpbC5NYXA7CisKK3B1YmxpYyBjbGFzcyBDaGVycnlQaWNrIGV4dGVuZHMgU3VibWl0U3RyYXRlZ3kgeworICBwcml2YXRlIHN0YXRpYyBmaW5hbCBMb2dnZXIgbG9nID0gTG9nZ2VyRmFjdG9yeS5nZXRMb2dnZXIoQ2hlcnJ5UGljay5jbGFzcyk7CisKKyAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgQXBwcm92YWxDYXRlZ29yeS5JZCBDUlZXID0gLy8KKyAgICAgIG5ldyBBcHByb3ZhbENhdGVnb3J5LklkKCJDUlZXIik7CisgIHByaXZhdGUgc3RhdGljIGZpbmFsIEFwcHJvdmFsQ2F0ZWdvcnkuSWQgVlJJRiA9IC8vCisgICAgICBuZXcgQXBwcm92YWxDYXRlZ29yeS5JZCgiVlJJRiIpOworICBwcml2YXRlIHN0YXRpYyBmaW5hbCBGb290ZXJLZXkgUkVWSUVXRURfT04gPSBuZXcgRm9vdGVyS2V5KCJSZXZpZXdlZC1vbiIpOworICBwcml2YXRlIHN0YXRpYyBmaW5hbCBGb290ZXJLZXkgQ0hBTkdFX0lEID0gbmV3IEZvb3RlcktleSgiQ2hhbmdlLUlkIik7CisKKyAgcHJpdmF0ZSBmaW5hbCBQYXRjaFNldEluZm9GYWN0b3J5IHBhdGNoU2V0SW5mb0ZhY3Rvcnk7CisgIHByaXZhdGUgZmluYWwgUHJvdmlkZXI8U3RyaW5nPiB1cmxQcm92aWRlcjsKKyAgcHJpdmF0ZSBmaW5hbCBBcHByb3ZhbFR5cGVzIGFwcHJvdmFsVHlwZXM7CisgIHByaXZhdGUgZmluYWwgR2l0UmVmZXJlbmNlVXBkYXRlZCByZXBsaWNhdGlvbjsKKyAgcHJpdmF0ZSBmaW5hbCBNYXA8Q2hhbmdlLklkLCBDb2RlUmV2aWV3Q29tbWl0PiBuZXdDb21taXRzOworCisgIENoZXJyeVBpY2soZmluYWwgU3VibWl0U3RyYXRlZ3kuQXJndW1lbnRzIGFyZ3MsCisgICAgICBmaW5hbCBQYXRjaFNldEluZm9GYWN0b3J5IHBhdGNoU2V0SW5mb0ZhY3RvcnksCisgICAgICBmaW5hbCBQcm92aWRlcjxTdHJpbmc+IHVybFByb3ZpZGVyLCBmaW5hbCBBcHByb3ZhbFR5cGVzIGFwcHJvdmFsVHlwZXMsCisgICAgICBmaW5hbCBHaXRSZWZlcmVuY2VVcGRhdGVkIHJlcGxpY2F0aW9uKSB7CisgICAgc3VwZXIoYXJncyk7CisKKyAgICB0aGlzLnBhdGNoU2V0SW5mb0ZhY3RvcnkgPSBwYXRjaFNldEluZm9GYWN0b3J5OworICAgIHRoaXMudXJsUHJvdmlkZXIgPSB1cmxQcm92aWRlcjsKKyAgICB0aGlzLmFwcHJvdmFsVHlwZXMgPSBhcHByb3ZhbFR5cGVzOworICAgIHRoaXMucmVwbGljYXRpb24gPSByZXBsaWNhdGlvbjsKKyAgICB0aGlzLm5ld0NvbW1pdHMgPSBuZXcgSGFzaE1hcDxDaGFuZ2UuSWQsIENvZGVSZXZpZXdDb21taXQ+KCk7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHJvdGVjdGVkIENvZGVSZXZpZXdDb21taXQgX3J1bihmaW5hbCBDb2RlUmV2aWV3Q29tbWl0IG1lcmdlVGlwLAorICAgICAgZmluYWwgTGlzdDxDb2RlUmV2aWV3Q29tbWl0PiB0b01lcmdlKSB0aHJvd3MgTWVyZ2VFeGNlcHRpb24geworICAgIENvZGVSZXZpZXdDb21taXQgbmV3TWVyZ2VUaXAgPSBtZXJnZVRpcDsKKyAgICB3aGlsZSAoIXRvTWVyZ2UuaXNFbXB0eSgpKSB7CisgICAgICBmaW5hbCBDb2RlUmV2aWV3Q29tbWl0IG4gPSB0b01lcmdlLnJlbW92ZSgwKTsKKyAgICAgIGZpbmFsIFRocmVlV2F5TWVyZ2VyIG0gPQorICAgICAgICAgIG5ld1RocmVlV2F5TWVyZ2VyKGFyZ3MucmVwbywgYXJncy5pbnNlcnRlciwgYXJncy51c2VDb250ZW50TWVyZ2UpOworICAgICAgdHJ5IHsKKyAgICAgICAgaWYgKG5ld01lcmdlVGlwID09IG51bGwpIHsKKyAgICAgICAgICAvLyBUaGUgYnJhbmNoIGlzIHVuYm9ybi4gVGFrZSBhIGZhc3QtZm9yd2FyZCByZXNvbHV0aW9uIHRvCisgICAgICAgICAgLy8gY3JlYXRlIHRoZSBicmFuY2guCisgICAgICAgICAgLy8KKyAgICAgICAgICBuZXdNZXJnZVRpcCA9IG47CisgICAgICAgICAgbi5zdGF0dXNDb2RlID0gQ29tbWl0TWVyZ2VTdGF0dXMuQ0xFQU5fTUVSR0U7CisKKyAgICAgICAgfSBlbHNlIGlmIChuLmdldFBhcmVudENvdW50KCkgPT0gMCkgeworICAgICAgICAgIC8vIFJlZnVzZSB0byBtZXJnZSBhIHJvb3QgY29tbWl0IGludG8gYW4gZXhpc3RpbmcgYnJhbmNoLAorICAgICAgICAgIC8vIHdlIGNhbm5vdCBvYnRhaW4gYSBkZWx0YSBmb3IgdGhlIGNoZXJyeS1waWNrIHRvIGFwcGx5LgorICAgICAgICAgIC8vCisgICAgICAgICAgbi5zdGF0dXNDb2RlID0gQ29tbWl0TWVyZ2VTdGF0dXMuQ0FOTk9UX0NIRVJSWV9QSUNLX1JPT1Q7CisKKyAgICAgICAgfSBlbHNlIGlmIChuLmdldFBhcmVudENvdW50KCkgPT0gMSkgeworICAgICAgICAgIC8vIElmIHRoZXJlIGlzIG9ubHkgb25lIHBhcmVudCwgYSBjaGVycnktcGljayBjYW4gYmUgZG9uZSBieQorICAgICAgICAgIC8vIHRha2luZyB0aGUgZGVsdGEgcmVsYXRpdmUgdG8gdGhhdCBvbmUgcGFyZW50IGFuZCByZWRvaW5nCisgICAgICAgICAgLy8gdGhhdCBvbiB0aGUgY3VycmVudCBtZXJnZSB0aXAuCisgICAgICAgICAgLy8KKyAgICAgICAgICBtLnNldEJhc2Uobi5nZXRQYXJlbnQoMCkpOworICAgICAgICAgIGlmIChtLm1lcmdlKG5ld01lcmdlVGlwLCBuKSkgeworICAgICAgICAgICAgbmV3TWVyZ2VUaXAgPSB3cml0ZUNoZXJyeVBpY2tDb21taXQobSwgbmV3TWVyZ2VUaXAsIG4pOworCisgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIG4uc3RhdHVzQ29kZSA9IENvbW1pdE1lcmdlU3RhdHVzLlBBVEhfQ09ORkxJQ1Q7CisgICAgICAgICAgfQorCisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgLy8gVGhlcmUgYXJlIG11bHRpcGxlIHBhcmVudHMsIHNvIHRoaXMgaXMgYSBtZXJnZSBjb21taXQuIFdlCisgICAgICAgICAgLy8gZG9uJ3Qgd2FudCB0byBjaGVycnktcGljayB0aGUgbWVyZ2UgYXMgY2xpZW50cyBjYW4ndCBlYXNpbHkKKyAgICAgICAgICAvLyByZWJhc2UgdGhlaXIgaGlzdG9yeSB3aXRoIHRoYXQgbWVyZ2UgcHJlc2VudCBhbmQgcmVwbGFjZWQKKyAgICAgICAgICAvLyBieSBhbiBlcXVpdmFsZW50IG1lcmdlIHdpdGggYSBkaWZmZXJlbnQgZmlyc3QgcGFyZW50LiBTbworICAgICAgICAgIC8vIGluc3RlYWQgYmVoYXZlIGFzIHRob3VnaCBNRVJHRV9JRl9ORUNFU1NBUlkgd2FzIGNvbmZpZ3VyZWQuCisgICAgICAgICAgLy8KKyAgICAgICAgICBpZiAoIWhhc01pc3NpbmdEZXBlbmRlbmNpZXMoYXJncy5tZXJnZVNvcnRlciwgbikpIHsKKyAgICAgICAgICAgIGlmIChhcmdzLnJ3LmlzTWVyZ2VkSW50byhuZXdNZXJnZVRpcCwgbikpIHsKKyAgICAgICAgICAgICAgbmV3TWVyZ2VUaXAgPSBuOworICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgbmV3TWVyZ2VUaXAgPQorICAgICAgICAgICAgICAgICAgbWVyZ2VPbmVDb21taXQoYXJncy5kYiwgYXJncy5pZGVudGlmaWVkVXNlckZhY3RvcnksCisgICAgICAgICAgICAgICAgICAgICAgYXJncy5teUlkZW50LCBhcmdzLnJlcG8sIGFyZ3MucncsIGFyZ3MuaW5zZXJ0ZXIsCisgICAgICAgICAgICAgICAgICAgICAgYXJncy5jYW5NZXJnZUZsYWcsIGFyZ3MudXNlQ29udGVudE1lcmdlLCBhcmdzLmRlc3RCcmFuY2gsCisgICAgICAgICAgICAgICAgICAgICAgbmV3TWVyZ2VUaXAsIG4pOworICAgICAgICAgICB9CisgICAgICAgICAgICBmaW5hbCBQYXRjaFNldEFwcHJvdmFsIHN1Ym1pdEFwcHJvdmFsID0KKyAgICAgICAgICAgICAgICBtYXJrQ2xlYW5NZXJnZXMoYXJncy5kYiwgYXJncy5ydywgYXJncy5jYW5NZXJnZUZsYWcsCisgICAgICAgICAgICAgICAgICAgIG5ld01lcmdlVGlwLCBhcmdzLmFscmVhZHlBY2NlcHRlZCk7CisgICAgICAgICAgICBzZXRSZWZMb2dJZGVudChzdWJtaXRBcHByb3ZhbCk7CisKKyAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgLy8gT25lIG9yIG1vcmUgZGVwZW5kZW5jaWVzIHdlcmUgbm90IG1ldC4gVGhlIHN0YXR1cyB3YXMKKyAgICAgICAgICAgIC8vIGFscmVhZHkgbWFya2VkIG9uIHRoZSBjb21taXQgc28gd2UgaGF2ZSBub3RoaW5nIGZ1cnRoZXIKKyAgICAgICAgICAgIC8vIHRvIHBlcmZvcm0gYXQgdGhpcyB0aW1lLgorICAgICAgICAgICAgLy8KKyAgICAgICAgICB9CisgICAgICAgIH0KKworICAgICAgfSBjYXRjaCAoSU9FeGNlcHRpb24gZSkgeworICAgICAgICB0aHJvdyBuZXcgTWVyZ2VFeGNlcHRpb24oIkNhbm5vdCBtZXJnZSAiICsgbi5uYW1lKCksIGUpOworICAgICAgfSBjYXRjaCAoT3JtRXhjZXB0aW9uIGUpIHsKKyAgICAgICAgdGhyb3cgbmV3IE1lcmdlRXhjZXB0aW9uKCJDYW5ub3QgbWVyZ2UgIiArIG4ubmFtZSgpLCBlKTsKKyAgICAgIH0KKyAgICB9CisgICAgcmV0dXJuIG5ld01lcmdlVGlwOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBNYXA8Q2hhbmdlLklkLCBDb2RlUmV2aWV3Q29tbWl0PiBnZXROZXdDb21taXRzKCkgeworICAgIHJldHVybiBuZXdDb21taXRzOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBib29sZWFuIGRyeVJ1bihmaW5hbCBDb2RlUmV2aWV3Q29tbWl0IG1lcmdlVGlwLAorICAgICAgZmluYWwgQ29kZVJldmlld0NvbW1pdCB0b01lcmdlKSB0aHJvd3MgTWVyZ2VFeGNlcHRpb24geworICAgIHJldHVybiBjYW5DaGVycnlQaWNrKGFyZ3MubWVyZ2VTb3J0ZXIsIGFyZ3MucmVwbywgYXJncy51c2VDb250ZW50TWVyZ2UsCisgICAgICAgIG1lcmdlVGlwLCBhcmdzLnJ3LCB0b01lcmdlKTsKKyAgfQorCisgIHByaXZhdGUgQ29kZVJldmlld0NvbW1pdCB3cml0ZUNoZXJyeVBpY2tDb21taXQoZmluYWwgTWVyZ2VyIG0sCisgICAgICBmaW5hbCBDb2RlUmV2aWV3Q29tbWl0IG1lcmdlVGlwLCBmaW5hbCBDb2RlUmV2aWV3Q29tbWl0IG4pCisgICAgICB0aHJvd3MgSU9FeGNlcHRpb24sIE9ybUV4Y2VwdGlvbiB7CisgICAgYXJncy5ydy5wYXJzZUJvZHkobik7CisKKyAgICBmaW5hbCBMaXN0PEZvb3RlckxpbmU+IGZvb3RlcnMgPSBuLmdldEZvb3RlckxpbmVzKCk7CisgICAgZmluYWwgU3RyaW5nQnVpbGRlciBtc2didWYgPSBuZXcgU3RyaW5nQnVpbGRlcigpOworICAgIG1zZ2J1Zi5hcHBlbmQobi5nZXRGdWxsTWVzc2FnZSgpKTsKKworICAgIGlmIChtc2didWYubGVuZ3RoKCkgPT0gMCkgeworICAgICAgLy8gV1RGLCBhbiBlbXB0eSBjb21taXQgbWVzc2FnZT8KKyAgICAgIG1zZ2J1Zi5hcHBlbmQoIjxubyBjb21taXQgbWVzc2FnZSBwcm92aWRlZD4iKTsKKyAgICB9CisgICAgaWYgKG1zZ2J1Zi5jaGFyQXQobXNnYnVmLmxlbmd0aCgpIC0gMSkgIT0gJ1xuJykgeworICAgICAgLy8gTWlzc2luZyBhIHRyYWlsaW5nIExGPyBDb3JyZWN0IGl0IChwZXJoYXBzIHRoZSBlZGl0b3Igd2FzIGJyb2tlbikuCisgICAgICBtc2didWYuYXBwZW5kKCdcbicpOworICAgIH0KKyAgICBpZiAoZm9vdGVycy5pc0VtcHR5KCkpIHsKKyAgICAgIC8vIERvZXNuJ3QgZW5kIGluIGEgIlNpZ25lZC1vZmYtYnk6IC4uLiIgc3R5bGUgbGluZT8gQWRkIGFub3RoZXIgbGluZQorICAgICAgLy8gYnJlYWsgdG8gc3RhcnQgYSBuZXcgcGFyYWdyYXBoIGZvciB0aGUgcmV2aWV3ZWQtYnkgdGFnIGxpbmVzLgorICAgICAgLy8KKyAgICAgIG1zZ2J1Zi5hcHBlbmQoJ1xuJyk7CisgICAgfQorCisgICAgaWYgKCFjb250YWlucyhmb290ZXJzLCBDSEFOR0VfSUQsIG4uY2hhbmdlLmdldEtleSgpLmdldCgpKSkgeworICAgICAgbXNnYnVmLmFwcGVuZChDSEFOR0VfSUQuZ2V0TmFtZSgpKTsKKyAgICAgIG1zZ2J1Zi5hcHBlbmQoIjogIik7CisgICAgICBtc2didWYuYXBwZW5kKG4uY2hhbmdlLmdldEtleSgpLmdldCgpKTsKKyAgICAgIG1zZ2J1Zi5hcHBlbmQoJ1xuJyk7CisgICAgfQorCisgICAgZmluYWwgU3RyaW5nIHNpdGVVcmwgPSB1cmxQcm92aWRlci5nZXQoKTsKKyAgICBpZiAoc2l0ZVVybCAhPSBudWxsKSB7CisgICAgICBmaW5hbCBTdHJpbmcgdXJsID0gc2l0ZVVybCArIG4ucGF0Y2hzZXRJZC5nZXRQYXJlbnRLZXkoKS5nZXQoKTsKKyAgICAgIGlmICghY29udGFpbnMoZm9vdGVycywgUkVWSUVXRURfT04sIHVybCkpIHsKKyAgICAgICAgbXNnYnVmLmFwcGVuZChSRVZJRVdFRF9PTi5nZXROYW1lKCkpOworICAgICAgICBtc2didWYuYXBwZW5kKCI6ICIpOworICAgICAgICBtc2didWYuYXBwZW5kKHVybCk7CisgICAgICAgIG1zZ2J1Zi5hcHBlbmQoJ1xuJyk7CisgICAgICB9CisgICAgfQorCisgICAgUGF0Y2hTZXRBcHByb3ZhbCBzdWJtaXRBdWRpdCA9IG51bGw7CisgICAgTGlzdDxQYXRjaFNldEFwcHJvdmFsPiBhcHByb3ZhbExpc3QgPSBudWxsOworICAgIHRyeSB7CisgICAgICBhcHByb3ZhbExpc3QgPQorICAgICAgICAgIGFyZ3MuZGIucGF0Y2hTZXRBcHByb3ZhbHMoKS5ieVBhdGNoU2V0KG4ucGF0Y2hzZXRJZCkudG9MaXN0KCk7CisgICAgICBDb2xsZWN0aW9ucy5zb3J0KGFwcHJvdmFsTGlzdCwgbmV3IENvbXBhcmF0b3I8UGF0Y2hTZXRBcHByb3ZhbD4oKSB7CisgICAgICAgIEBPdmVycmlkZQorICAgICAgICBwdWJsaWMgaW50IGNvbXBhcmUoZmluYWwgUGF0Y2hTZXRBcHByb3ZhbCBhLCBmaW5hbCBQYXRjaFNldEFwcHJvdmFsIGIpIHsKKyAgICAgICAgICByZXR1cm4gYS5nZXRHcmFudGVkKCkuY29tcGFyZVRvKGIuZ2V0R3JhbnRlZCgpKTsKKyAgICAgICAgfQorICAgICAgfSk7CisKKyAgICAgIGZvciAoZmluYWwgUGF0Y2hTZXRBcHByb3ZhbCBhIDogYXBwcm92YWxMaXN0KSB7CisgICAgICAgIGlmIChhLmdldFZhbHVlKCkgPD0gMCkgeworICAgICAgICAgIC8vIE5lZ2F0aXZlIHZvdGVzIGFyZW4ndCBjb3VudGVkLgorICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICB9CisKKyAgICAgICAgaWYgKEFwcHJvdmFsQ2F0ZWdvcnkuU1VCTUlULmVxdWFscyhhLmdldENhdGVnb3J5SWQoKSkpIHsKKyAgICAgICAgICAvLyBTdWJtaXQgaXMgdHJlYXRlZCBzcGVjaWFsbHksIGJlbG93IChiZWNvbWVzIGNvbW1pdHRlcikKKyAgICAgICAgICAvLworICAgICAgICAgIGlmIChzdWJtaXRBdWRpdCA9PSBudWxsCisgICAgICAgICAgICAgIHx8IGEuZ2V0R3JhbnRlZCgpLmNvbXBhcmVUbyhzdWJtaXRBdWRpdC5nZXRHcmFudGVkKCkpID4gMCkgeworICAgICAgICAgICAgc3VibWl0QXVkaXQgPSBhOworICAgICAgICAgIH0KKyAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgfQorCisgICAgICAgIGZpbmFsIEFjY291bnQgYWNjID0KKyAgICAgICAgICAgIGFyZ3MuaWRlbnRpZmllZFVzZXJGYWN0b3J5LmNyZWF0ZShhLmdldEFjY291bnRJZCgpKS5nZXRBY2NvdW50KCk7CisgICAgICAgIGZpbmFsIFN0cmluZ0J1aWxkZXIgaWRlbnRidWYgPSBuZXcgU3RyaW5nQnVpbGRlcigpOworICAgICAgICBpZiAoYWNjLmdldEZ1bGxOYW1lKCkgIT0gbnVsbCAmJiBhY2MuZ2V0RnVsbE5hbWUoKS5sZW5ndGgoKSA+IDApIHsKKyAgICAgICAgICBpZiAoaWRlbnRidWYubGVuZ3RoKCkgPiAwKSB7CisgICAgICAgICAgICBpZGVudGJ1Zi5hcHBlbmQoJyAnKTsKKyAgICAgICAgICB9CisgICAgICAgICAgaWRlbnRidWYuYXBwZW5kKGFjYy5nZXRGdWxsTmFtZSgpKTsKKyAgICAgICAgfQorICAgICAgICBpZiAoYWNjLmdldFByZWZlcnJlZEVtYWlsKCkgIT0gbnVsbAorICAgICAgICAgICAgJiYgYWNjLmdldFByZWZlcnJlZEVtYWlsKCkubGVuZ3RoKCkgPiAwKSB7CisgICAgICAgICAgaWYgKGlzU2lnbmVkT2ZmQnkoZm9vdGVycywgYWNjLmdldFByZWZlcnJlZEVtYWlsKCkpKSB7CisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICB9CisgICAgICAgICAgaWYgKGlkZW50YnVmLmxlbmd0aCgpID4gMCkgeworICAgICAgICAgICAgaWRlbnRidWYuYXBwZW5kKCcgJyk7CisgICAgICAgICAgfQorICAgICAgICAgIGlkZW50YnVmLmFwcGVuZCgnPCcpOworICAgICAgICAgIGlkZW50YnVmLmFwcGVuZChhY2MuZ2V0UHJlZmVycmVkRW1haWwoKSk7CisgICAgICAgICAgaWRlbnRidWYuYXBwZW5kKCc+Jyk7CisgICAgICAgIH0KKyAgICAgICAgaWYgKGlkZW50YnVmLmxlbmd0aCgpID09IDApIHsKKyAgICAgICAgICAvLyBOb3RoaW5nIHJlYXNvbmFibGUgdG8gZGVzY3JpYmUgdGhlbSBieT8gSWdub3JlIHRoZW0uCisgICAgICAgICAgY29udGludWU7CisgICAgICAgIH0KKworICAgICAgICBmaW5hbCBTdHJpbmcgdGFnOworICAgICAgICBpZiAoQ1JWVy5lcXVhbHMoYS5nZXRDYXRlZ29yeUlkKCkpKSB7CisgICAgICAgICAgdGFnID0gIlJldmlld2VkLWJ5IjsKKyAgICAgICAgfSBlbHNlIGlmIChWUklGLmVxdWFscyhhLmdldENhdGVnb3J5SWQoKSkpIHsKKyAgICAgICAgICB0YWcgPSAiVGVzdGVkLWJ5IjsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICBmaW5hbCBBcHByb3ZhbFR5cGUgYXQgPSBhcHByb3ZhbFR5cGVzLmJ5SWQoYS5nZXRDYXRlZ29yeUlkKCkpOworICAgICAgICAgIGlmIChhdCA9PSBudWxsKSB7CisgICAgICAgICAgICAvLyBBIGRlcHJlY2F0ZWQvZGVsZXRlZCBhcHByb3ZhbCB0eXBlLCBpZ25vcmUgaXQuCisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICB9CisgICAgICAgICAgdGFnID0gYXQuZ2V0Q2F0ZWdvcnkoKS5nZXROYW1lKCkucmVwbGFjZSgnICcsICctJyk7CisgICAgICAgIH0KKworICAgICAgICBpZiAoIWNvbnRhaW5zKGZvb3RlcnMsIG5ldyBGb290ZXJLZXkodGFnKSwgaWRlbnRidWYudG9TdHJpbmcoKSkpIHsKKyAgICAgICAgICBtc2didWYuYXBwZW5kKHRhZyk7CisgICAgICAgICAgbXNnYnVmLmFwcGVuZCgiOiAiKTsKKyAgICAgICAgICBtc2didWYuYXBwZW5kKGlkZW50YnVmKTsKKyAgICAgICAgICBtc2didWYuYXBwZW5kKCdcbicpOworICAgICAgICB9CisgICAgICB9CisgICAgfSBjYXRjaCAoT3JtRXhjZXB0aW9uIGUpIHsKKyAgICAgIGxvZy5lcnJvcigiQ2FuJ3QgcmVhZCBhcHByb3ZhbCByZWNvcmRzIGZvciAiICsgbi5wYXRjaHNldElkLCBlKTsKKyAgICB9CisKKyAgICBmaW5hbCBDb21taXRCdWlsZGVyIG1lcmdlQ29tbWl0ID0gbmV3IENvbW1pdEJ1aWxkZXIoKTsKKyAgICBtZXJnZUNvbW1pdC5zZXRUcmVlSWQobS5nZXRSZXN1bHRUcmVlSWQoKSk7CisgICAgbWVyZ2VDb21taXQuc2V0UGFyZW50SWQobWVyZ2VUaXApOworICAgIG1lcmdlQ29tbWl0LnNldEF1dGhvcihuLmdldEF1dGhvcklkZW50KCkpOworICAgIG1lcmdlQ29tbWl0LnNldENvbW1pdHRlcih0b0NvbW1pdHRlcklkZW50KHN1Ym1pdEF1ZGl0KSk7CisgICAgbWVyZ2VDb21taXQuc2V0TWVzc2FnZShtc2didWYudG9TdHJpbmcoKSk7CisKKyAgICBmaW5hbCBPYmplY3RJZCBpZCA9IGNvbW1pdChhcmdzLmluc2VydGVyLCBtZXJnZUNvbW1pdCk7CisgICAgZmluYWwgQ29kZVJldmlld0NvbW1pdCBuZXdDb21taXQgPQorICAgICAgICAoQ29kZVJldmlld0NvbW1pdCkgYXJncy5ydy5wYXJzZUNvbW1pdChpZCk7CisKKyAgICBuLmNoYW5nZS5uZXh0UGF0Y2hTZXRJZCgpOworCisgICAgZmluYWwgUGF0Y2hTZXQgcHMgPSBuZXcgUGF0Y2hTZXQobi5jaGFuZ2UuY3VyclBhdGNoU2V0SWQoKSk7CisgICAgcHMuc2V0Q3JlYXRlZE9uKG5ldyBUaW1lc3RhbXAoU3lzdGVtLmN1cnJlbnRUaW1lTWlsbGlzKCkpKTsKKyAgICBwcy5zZXRVcGxvYWRlcihzdWJtaXRBdWRpdC5nZXRBY2NvdW50SWQoKSk7CisgICAgcHMuc2V0UmV2aXNpb24obmV3IFJldklkKGlkLmdldE5hbWUoKSkpOworICAgIGluc2VydEFuY2VzdG9ycyhwcy5nZXRJZCgpLCBuZXdDb21taXQpOworICAgIGFyZ3MuZGIucGF0Y2hTZXRzKCkuaW5zZXJ0KENvbGxlY3Rpb25zLnNpbmdsZXRvbihwcykpOworCisgICAgbi5jaGFuZ2Uuc2V0Q3VycmVudFBhdGNoU2V0KHBhdGNoU2V0SW5mb0ZhY3RvcnkuZ2V0KG5ld0NvbW1pdCwgcHMuZ2V0SWQoKSkpOworICAgIGFyZ3MuZGIuY2hhbmdlcygpLnVwZGF0ZShDb2xsZWN0aW9ucy5zaW5nbGV0b25MaXN0KG4uY2hhbmdlKSk7CisKKyAgICBpZiAoYXBwcm92YWxMaXN0ICE9IG51bGwpIHsKKyAgICAgIGZvciAoUGF0Y2hTZXRBcHByb3ZhbCBhIDogYXBwcm92YWxMaXN0KSB7CisgICAgICAgIGFyZ3MuZGIucGF0Y2hTZXRBcHByb3ZhbHMoKS5pbnNlcnQoCisgICAgICAgICAgICBDb2xsZWN0aW9ucy5zaW5nbGV0b24obmV3IFBhdGNoU2V0QXBwcm92YWwocHMuZ2V0SWQoKSwgYSkpKTsKKyAgICAgIH0KKyAgICB9CisKKyAgICBmaW5hbCBSZWZVcGRhdGUgcnUgPSBhcmdzLnJlcG8udXBkYXRlUmVmKHBzLmdldFJlZk5hbWUoKSk7CisgICAgcnUuc2V0RXhwZWN0ZWRPbGRPYmplY3RJZChPYmplY3RJZC56ZXJvSWQoKSk7CisgICAgcnUuc2V0TmV3T2JqZWN0SWQobmV3Q29tbWl0KTsKKyAgICBydS5kaXNhYmxlUmVmTG9nKCk7CisgICAgaWYgKHJ1LnVwZGF0ZShhcmdzLnJ3KSAhPSBSZWZVcGRhdGUuUmVzdWx0Lk5FVykgeworICAgICAgdGhyb3cgbmV3IElPRXhjZXB0aW9uKFN0cmluZy5mb3JtYXQoIkZhaWxlZCB0byBjcmVhdGUgcmVmICVzIGluICVzOiAlcyIsCisgICAgICAgICAgcHMuZ2V0UmVmTmFtZSgpLCBuLmNoYW5nZS5nZXREZXN0KCkuZ2V0UGFyZW50S2V5KCkuZ2V0KCksCisgICAgICAgICAgcnUuZ2V0UmVzdWx0KCkpKTsKKyAgICB9CisgICAgcmVwbGljYXRpb24uZmlyZShuLmNoYW5nZS5nZXRQcm9qZWN0KCksIHJ1LmdldE5hbWUoKSk7CisKKyAgICBuZXdDb21taXQuY29weUZyb20obik7CisgICAgbmV3Q29tbWl0LnN0YXR1c0NvZGUgPSBDb21taXRNZXJnZVN0YXR1cy5DTEVBTl9QSUNLOworICAgIG5ld0NvbW1pdHMucHV0KG5ld0NvbW1pdC5wYXRjaHNldElkLmdldFBhcmVudEtleSgpLCBuZXdDb21taXQpOworICAgIHNldFJlZkxvZ0lkZW50KHN1Ym1pdEF1ZGl0KTsKKyAgICByZXR1cm4gbmV3Q29tbWl0OworICB9CisKKyAgcHJpdmF0ZSB2b2lkIGluc2VydEFuY2VzdG9ycyhQYXRjaFNldC5JZCBpZCwgUmV2Q29tbWl0IHNyYykKKyAgICAgIHRocm93cyBPcm1FeGNlcHRpb24geworICAgIGZpbmFsIGludCBjbnQgPSBzcmMuZ2V0UGFyZW50Q291bnQoKTsKKyAgICBMaXN0PFBhdGNoU2V0QW5jZXN0b3I+IHRvSW5zZXJ0ID0gbmV3IEFycmF5TGlzdDxQYXRjaFNldEFuY2VzdG9yPihjbnQpOworICAgIGZvciAoaW50IHAgPSAwOyBwIDwgY250OyBwKyspIHsKKyAgICAgIFBhdGNoU2V0QW5jZXN0b3IgYTsKKworICAgICAgYSA9IG5ldyBQYXRjaFNldEFuY2VzdG9yKG5ldyBQYXRjaFNldEFuY2VzdG9yLklkKGlkLCBwICsgMSkpOworICAgICAgYS5zZXRBbmNlc3RvclJldmlzaW9uKG5ldyBSZXZJZChzcmMuZ2V0UGFyZW50KHApLmdldElkKCkubmFtZSgpKSk7CisgICAgICB0b0luc2VydC5hZGQoYSk7CisgICAgfQorICAgIGFyZ3MuZGIucGF0Y2hTZXRBbmNlc3RvcnMoKS5pbnNlcnQodG9JbnNlcnQpOworICB9CisKKyAgcHJpdmF0ZSBib29sZWFuIGNvbnRhaW5zKExpc3Q8Rm9vdGVyTGluZT4gZm9vdGVycywgRm9vdGVyS2V5IGtleSwgU3RyaW5nIHZhbCkgeworICAgIGZvciAoZmluYWwgRm9vdGVyTGluZSBsaW5lIDogZm9vdGVycykgeworICAgICAgaWYgKGxpbmUubWF0Y2hlcyhrZXkpICYmIHZhbC5lcXVhbHMobGluZS5nZXRWYWx1ZSgpKSkgeworICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgIH0KKyAgICB9CisgICAgcmV0dXJuIGZhbHNlOworICB9CisKKyAgcHJpdmF0ZSBib29sZWFuIGlzU2lnbmVkT2ZmQnkoTGlzdDxGb290ZXJMaW5lPiBmb290ZXJzLCBTdHJpbmcgZW1haWwpIHsKKyAgICBmb3IgKGZpbmFsIEZvb3RlckxpbmUgbGluZSA6IGZvb3RlcnMpIHsKKyAgICAgIGlmIChsaW5lLm1hdGNoZXMoRm9vdGVyS2V5LlNJR05FRF9PRkZfQlkpCisgICAgICAgICAgJiYgZW1haWwuZXF1YWxzKGxpbmUuZ2V0RW1haWxBZGRyZXNzKCkpKSB7CisgICAgICAgIHJldHVybiB0cnVlOworICAgICAgfQorICAgIH0KKyAgICByZXR1cm4gZmFsc2U7CisgIH0KKworICBwcml2YXRlIFBlcnNvbklkZW50IHRvQ29tbWl0dGVySWRlbnQoZmluYWwgUGF0Y2hTZXRBcHByb3ZhbCBhdWRpdCkgeworICAgIGlmIChhdWRpdCAhPSBudWxsKSB7CisgICAgICByZXR1cm4gYXJncy5pZGVudGlmaWVkVXNlckZhY3RvcnkuY3JlYXRlKGF1ZGl0LmdldEFjY291bnRJZCgpKQorICAgICAgICAgIC5uZXdDb21taXR0ZXJJZGVudChhdWRpdC5nZXRHcmFudGVkKCksIGFyZ3MubXlJZGVudC5nZXRUaW1lWm9uZSgpKTsKKyAgICB9CisgICAgcmV0dXJuIGFyZ3MubXlJZGVudDsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvQ29tbWl0TWVyZ2VTdGF0dXMuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L0NvbW1pdE1lcmdlU3RhdHVzLmphdmEKaW5kZXggODc5MDM1MS4uY2FhMDI3ZSAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvQ29tbWl0TWVyZ2VTdGF0dXMuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9Db21taXRNZXJnZVN0YXR1cy5qYXZhCkBAIC0yMiw2ICsyMiw5IEBACiAgIENMRUFOX1BJQ0soIkNoYW5nZSBoYXMgYmVlbiBzdWNjZXNzZnVsbHkgY2hlcnJ5LXBpY2tlZCIpLAogCiAgIC8qKiAqLworICBDTEVBTl9SRUJBU0UoIkNoYW5nZSBoYXMgYmVlbiBzdWNjZXNzZnVsbHkgcmViYXNlZCIpLAorCisgIC8qKiAqLwogICBBTFJFQURZX01FUkdFRCgiIiksCiAKICAgLyoqICovCkBAIC0zOSw2ICs0Miw5IEBACiAgIFJFVklTSU9OX0dPTkUoIiIpLAogCiAgIC8qKiAqLworICBOT19TVUJNSVRfVFlQRSgiIiksCisKKyAgLyoqICovCiAgIENSSVNTX0NST1NTX01FUkdFKCJZb3VyIGNoYW5nZSByZXF1aXJlcyBhIHJlY3Vyc2l2ZSBtZXJnZSB0byByZXNvbHZlLlxuIgogICAgICAgICAgICAgICAgICAgKyAiXG4iCiAgICAgICAgICAgICAgICAgICArICJQbGVhc2UgbWVyZ2UgKG9yIHJlYmFzZSkgdGhlIGNoYW5nZSBsb2NhbGx5IGFuZCB1cGxvYWQgdGhlIHJlc29sdXRpb24gZm9yIHJldmlldy4iKSwKQEAgLTQ5LDYgKzU1LDExIEBACiAgICAgICAgICAgICAgICAgICArICJQbGVhc2UgbWVyZ2UgdGhlIGNoYW5nZSBsb2NhbGx5IGFuZCB1cGxvYWQgdGhlIG1lcmdlIGNvbW1pdCBmb3IgcmV2aWV3LiIpLAogCiAgIC8qKiAqLworICBDQU5OT1RfUkVCQVNFX1JPT1QoIkNhbm5vdCByZWJhc2UgYW4gaW5pdGlhbCBjb21taXQgb250byBhbiBleGlzdGluZyBicmFuY2guXG4iCisgICAgICAgICAgICAgICAgICAgKyAiXG4iCisgICAgICAgICAgICAgICAgICAgKyAiUGxlYXNlIG1lcmdlIHRoZSBjaGFuZ2UgbG9jYWxseSBhbmQgdXBsb2FkIHRoZSBtZXJnZSBjb21taXQgZm9yIHJldmlldy4iKSwKKworICAvKiogKi8KICAgTk9UX0ZBU1RfRk9SV0FSRCgiUHJvamVjdCBwb2xpY3kgcmVxdWlyZXMgYWxsIHN1Ym1pc3Npb25zIHRvIGJlIGEgZmFzdC1mb3J3YXJkLlxuIgogICAgICAgICAgICAgICAgICAgKyAiXG4iCiAgICAgICAgICAgICAgICAgICArICJQbGVhc2UgcmViYXNlIHRoZSBjaGFuZ2UgbG9jYWxseSBhbmQgdXBsb2FkIGFnYWluIGZvciByZXZpZXcuIik7CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9DcmVhdGVDb2RlUmV2aWV3Tm90ZXMuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L0NyZWF0ZUNvZGVSZXZpZXdOb3Rlcy5qYXZhCmluZGV4IDlhMGZlMTcuLjUwNDEyZTMgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L0NyZWF0ZUNvZGVSZXZpZXdOb3Rlcy5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L0NyZWF0ZUNvZGVSZXZpZXdOb3Rlcy5qYXZhCkBAIC0xMTQsNyArMTE0LDggQEAKICAgICAgICAgbWVzc2FnZS5hcHBlbmQoIiogIikuYXBwZW5kKGMuZ2V0U2hvcnRNZXNzYWdlKCkpLmFwcGVuZCgiXG4iKTsKICAgICAgIH0KIAotICAgICAgTm90ZXNCcmFuY2hVdGlsIG5vdGVzQnJhbmNoVXRpbCA9IG5vdGVzQnJhbmNoVXRpbEZhY3RvcnkuY3JlYXRlKGRiKTsKKyAgICAgIE5vdGVzQnJhbmNoVXRpbCBub3Rlc0JyYW5jaFV0aWwgPSBub3Rlc0JyYW5jaFV0aWxGYWN0b3J5LmNyZWF0ZShkYiwKKyAgICAgICAgICBpbnNlcnRlcik7CiAgICAgICBub3Rlc0JyYW5jaFV0aWwuY29tbWl0QWxsTm90ZXMobm90ZXMsIFJFRlNfTk9URVNfUkVWSUVXLCBhdXRob3IsCiAgICAgICAgICAgbWVzc2FnZS50b1N0cmluZygpKTsKICAgICAgIGluc2VydGVyLmZsdXNoKCk7CkBAIC0xNDksNyArMTUwLDggQEAKICAgICAgICAgbm90ZXMuc2V0KGNvbW1pdElkLCBjcmVhdGVOb3RlQ29udGVudChjLCBjb21taXRJZCkpOwogICAgICAgfQogCi0gICAgICBOb3Rlc0JyYW5jaFV0aWwgbm90ZXNCcmFuY2hVdGlsID0gbm90ZXNCcmFuY2hVdGlsRmFjdG9yeS5jcmVhdGUoZGIpOworICAgICAgTm90ZXNCcmFuY2hVdGlsIG5vdGVzQnJhbmNoVXRpbCA9IG5vdGVzQnJhbmNoVXRpbEZhY3RvcnkuY3JlYXRlKGRiLAorICAgICAgICAgIGluc2VydGVyKTsKICAgICAgIG5vdGVzQnJhbmNoVXRpbC5jb21taXRBbGxOb3Rlcyhub3RlcywgUkVGU19OT1RFU19SRVZJRVcsIGF1dGhvciwKICAgICAgICAgICBjb21taXRNZXNzYWdlKTsKICAgICAgIGluc2VydGVyLmZsdXNoKCk7CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9EZWZhdWx0UXVldWVPcC5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvRGVmYXVsdFF1ZXVlT3AuamF2YQppbmRleCA4MmQwNDkzLi5jZmY2OWM2IDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9EZWZhdWx0UXVldWVPcC5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L0RlZmF1bHRRdWV1ZU9wLmphdmEKQEAgLTE0LDYgKzE0LDcgQEAKIAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0OwogCitpbXBvcnQgamF2YS51dGlsLmNvbmN1cnJlbnQuU2NoZWR1bGVkRnV0dXJlOwogaW1wb3J0IGphdmEudXRpbC5jb25jdXJyZW50LlRpbWVVbml0OwogCiBwdWJsaWMgYWJzdHJhY3QgY2xhc3MgRGVmYXVsdFF1ZXVlT3AgaW1wbGVtZW50cyBSdW5uYWJsZSB7CkBAIC0yMyw3ICsyNCwxMyBAQAogICAgIHdvcmtRdWV1ZSA9IHdxOwogICB9CiAKLSAgcHVibGljIHZvaWQgc3RhcnQoZmluYWwgaW50IGRlbGF5LCBmaW5hbCBUaW1lVW5pdCB1bml0KSB7Ci0gICAgd29ya1F1ZXVlLmdldERlZmF1bHRRdWV1ZSgpLnNjaGVkdWxlKHRoaXMsIGRlbGF5LCB1bml0KTsKKyAgcHVibGljIFNjaGVkdWxlZEZ1dHVyZTw/PiBzdGFydChsb25nIGRlbGF5LCBUaW1lVW5pdCB1bml0KSB7CisgICAgcmV0dXJuIHdvcmtRdWV1ZS5nZXREZWZhdWx0UXVldWUoKS5zY2hlZHVsZSh0aGlzLCBkZWxheSwgdW5pdCk7CisgIH0KKworICBwdWJsaWMgU2NoZWR1bGVkRnV0dXJlPD8+IHN0YXJ0V2l0aEZpeGVkRGVsYXkobG9uZyBpbml0aWFsRGVsYXksIGxvbmcgZGVsYXksCisgICAgICBUaW1lVW5pdCB1bml0KSB7CisgICAgcmV0dXJuIHdvcmtRdWV1ZS5nZXREZWZhdWx0UXVldWUoKQorICAgICAgICAuc2NoZWR1bGVXaXRoRml4ZWREZWxheSh0aGlzLCBpbml0aWFsRGVsYXksIGRlbGF5LCB1bml0KTsKICAgfQogfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvRmFzdEZvcndhcmRPbmx5LmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9GYXN0Rm9yd2FyZE9ubHkuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4zMDI3YjQyCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvRmFzdEZvcndhcmRPbmx5LmphdmEKQEAgLTAsMCArMSw2MSBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQ7CisKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5NZXJnZVV0aWwuY2FuRmFzdEZvcndhcmQ7CitpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuTWVyZ2VVdGlsLmdldEZpcnN0RmFzdEZvcndhcmQ7CitpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuTWVyZ2VVdGlsLm1hcmtDbGVhbk1lcmdlczsKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5NZXJnZVV0aWwucmVkdWNlVG9NaW5pbWFsTWVyZ2U7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXRBcHByb3ZhbDsKKworaW1wb3J0IGphdmEudXRpbC5MaXN0OworCitwdWJsaWMgY2xhc3MgRmFzdEZvcndhcmRPbmx5IGV4dGVuZHMgU3VibWl0U3RyYXRlZ3kgeworCisgIEZhc3RGb3J3YXJkT25seShmaW5hbCBTdWJtaXRTdHJhdGVneS5Bcmd1bWVudHMgYXJncykgeworICAgIHN1cGVyKGFyZ3MpOworICB9CisKKyAgQE92ZXJyaWRlCisgIHByb3RlY3RlZCBDb2RlUmV2aWV3Q29tbWl0IF9ydW4oZmluYWwgQ29kZVJldmlld0NvbW1pdCBtZXJnZVRpcCwKKyAgICAgIGZpbmFsIExpc3Q8Q29kZVJldmlld0NvbW1pdD4gdG9NZXJnZSkgdGhyb3dzIE1lcmdlRXhjZXB0aW9uIHsKKyAgICByZWR1Y2VUb01pbmltYWxNZXJnZShhcmdzLm1lcmdlU29ydGVyLCB0b01lcmdlKTsKKyAgICBmaW5hbCBDb2RlUmV2aWV3Q29tbWl0IG5ld01lcmdlVGlwID0KKyAgICAgICAgZ2V0Rmlyc3RGYXN0Rm9yd2FyZChtZXJnZVRpcCwgYXJncy5ydywgdG9NZXJnZSk7CisKKyAgICB3aGlsZSAoIXRvTWVyZ2UuaXNFbXB0eSgpKSB7CisgICAgICBmaW5hbCBDb2RlUmV2aWV3Q29tbWl0IG4gPSB0b01lcmdlLnJlbW92ZSgwKTsKKyAgICAgIG4uc3RhdHVzQ29kZSA9IENvbW1pdE1lcmdlU3RhdHVzLk5PVF9GQVNUX0ZPUldBUkQ7CisgICAgfQorCisgICAgZmluYWwgUGF0Y2hTZXRBcHByb3ZhbCBzdWJtaXRBcHByb3ZhbCA9CisgICAgICAgIG1hcmtDbGVhbk1lcmdlcyhhcmdzLmRiLCBhcmdzLnJ3LCBhcmdzLmNhbk1lcmdlRmxhZywgbmV3TWVyZ2VUaXAsCisgICAgICAgICAgICBhcmdzLmFscmVhZHlBY2NlcHRlZCk7CisgICAgc2V0UmVmTG9nSWRlbnQoc3VibWl0QXBwcm92YWwpOworCisgICAgcmV0dXJuIG5ld01lcmdlVGlwOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBib29sZWFuIHJldHJ5T25Mb2NrRmFpbHVyZSgpIHsKKyAgICByZXR1cm4gZmFsc2U7CisgIH0KKworICBwdWJsaWMgYm9vbGVhbiBkcnlSdW4oZmluYWwgQ29kZVJldmlld0NvbW1pdCBtZXJnZVRpcCwKKyAgICAgIGZpbmFsIENvZGVSZXZpZXdDb21taXQgdG9NZXJnZSkgdGhyb3dzIE1lcmdlRXhjZXB0aW9uIHsKKyAgICByZXR1cm4gY2FuRmFzdEZvcndhcmQoYXJncy5tZXJnZVNvcnRlciwgbWVyZ2VUaXAsIGFyZ3MucncsIHRvTWVyZ2UpOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9NZXJnZUFsd2F5cy5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvTWVyZ2VBbHdheXMuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi41MDFkZWZiCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvTWVyZ2VBbHdheXMuamF2YQpAQCAtMCwwICsxLDYwIEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdDsKKworaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0Lk1lcmdlVXRpbC5tYXJrQ2xlYW5NZXJnZXM7CitpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuTWVyZ2VVdGlsLmNhbk1lcmdlOworaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0Lk1lcmdlVXRpbC5tZXJnZU9uZUNvbW1pdDsKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5NZXJnZVV0aWwucmVkdWNlVG9NaW5pbWFsTWVyZ2U7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXRBcHByb3ZhbDsKKworaW1wb3J0IGphdmEudXRpbC5MaXN0OworCitwdWJsaWMgY2xhc3MgTWVyZ2VBbHdheXMgZXh0ZW5kcyBTdWJtaXRTdHJhdGVneSB7CisKKyAgTWVyZ2VBbHdheXMoZmluYWwgU3VibWl0U3RyYXRlZ3kuQXJndW1lbnRzIGFyZ3MpIHsKKyAgICBzdXBlcihhcmdzKTsKKyAgfQorCisgIEBPdmVycmlkZQorICBwcm90ZWN0ZWQgQ29kZVJldmlld0NvbW1pdCBfcnVuKGZpbmFsIENvZGVSZXZpZXdDb21taXQgbWVyZ2VUaXAsCisgICAgICBmaW5hbCBMaXN0PENvZGVSZXZpZXdDb21taXQ+IHRvTWVyZ2UpIHRocm93cyBNZXJnZUV4Y2VwdGlvbiB7CisgICAgcmVkdWNlVG9NaW5pbWFsTWVyZ2UoYXJncy5tZXJnZVNvcnRlciwgdG9NZXJnZSk7CisKKyAgICBDb2RlUmV2aWV3Q29tbWl0IG5ld01lcmdlVGlwID0gbWVyZ2VUaXA7CisgICAgd2hpbGUgKCF0b01lcmdlLmlzRW1wdHkoKSkgeworICAgICAgbmV3TWVyZ2VUaXAgPQorICAgICAgICAgIG1lcmdlT25lQ29tbWl0KGFyZ3MuZGIsIGFyZ3MuaWRlbnRpZmllZFVzZXJGYWN0b3J5LCBhcmdzLm15SWRlbnQsCisgICAgICAgICAgICAgIGFyZ3MucmVwbywgYXJncy5ydywgYXJncy5pbnNlcnRlciwgYXJncy5jYW5NZXJnZUZsYWcsCisgICAgICAgICAgICAgIGFyZ3MudXNlQ29udGVudE1lcmdlLCBhcmdzLmRlc3RCcmFuY2gsIG1lcmdlVGlwLAorICAgICAgICAgICAgICB0b01lcmdlLnJlbW92ZSgwKSk7CisgICAgfQorCisgICAgZmluYWwgUGF0Y2hTZXRBcHByb3ZhbCBzdWJtaXRBcHByb3ZhbCA9CisgICAgICAgIG1hcmtDbGVhbk1lcmdlcyhhcmdzLmRiLCBhcmdzLnJ3LCBhcmdzLmNhbk1lcmdlRmxhZywgbmV3TWVyZ2VUaXAsCisgICAgICAgICAgICBhcmdzLmFscmVhZHlBY2NlcHRlZCk7CisgICAgc2V0UmVmTG9nSWRlbnQoc3VibWl0QXBwcm92YWwpOworCisgICAgcmV0dXJuIG5ld01lcmdlVGlwOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBib29sZWFuIGRyeVJ1bihmaW5hbCBDb2RlUmV2aWV3Q29tbWl0IG1lcmdlVGlwLAorICAgICAgZmluYWwgQ29kZVJldmlld0NvbW1pdCB0b01lcmdlKSB0aHJvd3MgTWVyZ2VFeGNlcHRpb24geworICAgIHJldHVybiBjYW5NZXJnZShhcmdzLm1lcmdlU29ydGVyLCBhcmdzLnJlcG8sIGFyZ3MudXNlQ29udGVudE1lcmdlLAorICAgICAgICBtZXJnZVRpcCwgdG9NZXJnZSk7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L01lcmdlSWZOZWNlc3NhcnkuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L01lcmdlSWZOZWNlc3NhcnkuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4wNGIzZjJiCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvTWVyZ2VJZk5lY2Vzc2FyeS5qYXZhCkBAIC0wLDAgKzEsNjUgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0OworCitpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuTWVyZ2VVdGlsLmNhbkZhc3RGb3J3YXJkOworaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0Lk1lcmdlVXRpbC5jYW5NZXJnZTsKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5NZXJnZVV0aWwuZ2V0Rmlyc3RGYXN0Rm9yd2FyZDsKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5NZXJnZVV0aWwubWFya0NsZWFuTWVyZ2VzOworaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0Lk1lcmdlVXRpbC5tZXJnZU9uZUNvbW1pdDsKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5NZXJnZVV0aWwucmVkdWNlVG9NaW5pbWFsTWVyZ2U7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXRBcHByb3ZhbDsKKworaW1wb3J0IGphdmEudXRpbC5MaXN0OworCitwdWJsaWMgY2xhc3MgTWVyZ2VJZk5lY2Vzc2FyeSBleHRlbmRzIFN1Ym1pdFN0cmF0ZWd5IHsKKworICBNZXJnZUlmTmVjZXNzYXJ5KGZpbmFsIFN1Ym1pdFN0cmF0ZWd5LkFyZ3VtZW50cyBhcmdzKSB7CisgICAgc3VwZXIoYXJncyk7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHJvdGVjdGVkIENvZGVSZXZpZXdDb21taXQgX3J1bihmaW5hbCBDb2RlUmV2aWV3Q29tbWl0IG1lcmdlVGlwLAorICAgICAgZmluYWwgTGlzdDxDb2RlUmV2aWV3Q29tbWl0PiB0b01lcmdlKSB0aHJvd3MgTWVyZ2VFeGNlcHRpb24geworICAgIHJlZHVjZVRvTWluaW1hbE1lcmdlKGFyZ3MubWVyZ2VTb3J0ZXIsIHRvTWVyZ2UpOworICAgIENvZGVSZXZpZXdDb21taXQgbmV3TWVyZ2VUaXAgPQorICAgICAgICBnZXRGaXJzdEZhc3RGb3J3YXJkKG1lcmdlVGlwLCBhcmdzLnJ3LCB0b01lcmdlKTsKKworICAgIC8vIEZvciBldmVyeSBvdGhlciBjb21taXQgZG8gYSBwYWlyLXdpc2UgbWVyZ2UuCisgICAgd2hpbGUgKCF0b01lcmdlLmlzRW1wdHkoKSkgeworICAgICAgbmV3TWVyZ2VUaXAgPQorICAgICAgICAgIG1lcmdlT25lQ29tbWl0KGFyZ3MuZGIsIGFyZ3MuaWRlbnRpZmllZFVzZXJGYWN0b3J5LCBhcmdzLm15SWRlbnQsCisgICAgICAgICAgICAgIGFyZ3MucmVwbywgYXJncy5ydywgYXJncy5pbnNlcnRlciwgYXJncy5jYW5NZXJnZUZsYWcsCisgICAgICAgICAgICAgIGFyZ3MudXNlQ29udGVudE1lcmdlLCBhcmdzLmRlc3RCcmFuY2gsIG1lcmdlVGlwLAorICAgICAgICAgICAgICB0b01lcmdlLnJlbW92ZSgwKSk7CisgICAgfQorCisgICAgZmluYWwgUGF0Y2hTZXRBcHByb3ZhbCBzdWJtaXRBcHByb3ZhbCA9CisgICAgICAgIG1hcmtDbGVhbk1lcmdlcyhhcmdzLmRiLCBhcmdzLnJ3LCBhcmdzLmNhbk1lcmdlRmxhZywgbmV3TWVyZ2VUaXAsCisgICAgICAgICAgICBhcmdzLmFscmVhZHlBY2NlcHRlZCk7CisgICAgc2V0UmVmTG9nSWRlbnQoc3VibWl0QXBwcm92YWwpOworCisgICAgcmV0dXJuIG5ld01lcmdlVGlwOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBib29sZWFuIGRyeVJ1bihmaW5hbCBDb2RlUmV2aWV3Q29tbWl0IG1lcmdlVGlwLAorICAgICAgZmluYWwgQ29kZVJldmlld0NvbW1pdCB0b01lcmdlKSB0aHJvd3MgTWVyZ2VFeGNlcHRpb24geworICAgIHJldHVybiBjYW5GYXN0Rm9yd2FyZChhcmdzLm1lcmdlU29ydGVyLCBtZXJnZVRpcCwgYXJncy5ydywgdG9NZXJnZSkKKyAgICAgICAgfHwgY2FuTWVyZ2UoYXJncy5tZXJnZVNvcnRlciwgYXJncy5yZXBvLCBhcmdzLnVzZUNvbnRlbnRNZXJnZSwKKyAgICAgICAgICAgIG1lcmdlVGlwLCB0b01lcmdlKTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvTWVyZ2VPcC5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvTWVyZ2VPcC5qYXZhCmluZGV4IDI2ZmQyZWEuLjg5NmUyZjcgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L01lcmdlT3AuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9NZXJnZU9wLmphdmEKQEAgLTE0LDI5ICsxNCwzNCBAQAogCiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQ7CiAKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5NZXJnZVV0aWwuY29tcHV0ZU1lcmdlQ29tbWl0QXV0aG9yOworaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0Lk1lcmdlVXRpbC5nZXRTdWJtaXR0ZXI7CiBpbXBvcnQgc3RhdGljIGphdmEudXRpbC5jb25jdXJyZW50LlRpbWVVbml0Lk1JTExJU0VDT05EUzsKIGltcG9ydCBzdGF0aWMgamF2YS51dGlsLmNvbmN1cnJlbnQuVGltZVVuaXQuTUlOVVRFUzsKK2ltcG9ydCBzdGF0aWMgamF2YS51dGlsLmNvbmN1cnJlbnQuVGltZVVuaXQuU0VDT05EUzsKIAoraW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuQXJyYXlMaXN0TXVsdGltYXA7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5MaXN0TXVsdGltYXA7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLkNoYW5nZUhvb2tzOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkFwcHJvdmFsVHlwZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5BcHByb3ZhbFR5cGVzOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkNhcGFibGU7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuU3VibWl0VHlwZVJlY29yZDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQXBwcm92YWxDYXRlZ29yeTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQnJhbmNoOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5DaGFuZ2U7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZU1lc3NhZ2U7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldEFuY2VzdG9yOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldEFwcHJvdmFsOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5Qcm9qZWN0OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5Qcm9qZWN0LlN1Ym1pdFR5cGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlJldklkOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLnNlcnZlci5SZXZpZXdEYjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuQ2hhbmdlVXRpbDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuR2Vycml0UGVyc29uSWRlbnQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLklkZW50aWZpZWRVc2VyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LkFjY291bnRDYWNoZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLkNhbm9uaWNhbFdlYlVybDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZXh0ZW5zaW9ucy5ldmVudHMuR2l0UmVmZXJlbmNlVXBkYXRlZDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIubWFpbC5NZXJnZUZhaWxTZW5kZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLm1haWwuTWVyZ2VkU2VuZGVyOwpAQCAtNTQsMTQgKzU5LDExIEBACiBpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLk9ybUV4Y2VwdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuU2NoZW1hRmFjdG9yeTsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7Ci1pbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuUHJvdmlkZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuYXNzaXN0ZWRpbmplY3QuQXNzaXN0ZWQ7CiAKIGltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmVycm9ycy5JbmNvcnJlY3RPYmplY3RUeXBlRXhjZXB0aW9uOwotaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQuZXJyb3JzLk1pc3NpbmdPYmplY3RFeGNlcHRpb247CiBpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5lcnJvcnMuUmVwb3NpdG9yeU5vdEZvdW5kRXhjZXB0aW9uOwogaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLkFueU9iamVjdElkOwotaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLkNvbW1pdEJ1aWxkZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuQ29uc3RhbnRzOwogaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLk9iamVjdElkOwogaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLk9iamVjdEluc2VydGVyOwpAQCAtNjksMTEgKzcxLDYgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5SZWY7CiBpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuUmVmVXBkYXRlOwogaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLlJlcG9zaXRvcnk7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5tZXJnZS5NZXJnZVN0cmF0ZWd5OwotaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubWVyZ2UuTWVyZ2VyOwotaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubWVyZ2UuVGhyZWVXYXlNZXJnZXI7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5yZXZ3YWxrLkZvb3RlcktleTsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LnJldndhbGsuRm9vdGVyTGluZTsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LnJldndhbGsuUmV2Q29tbWl0OwogaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQucmV2d2Fsay5SZXZGbGFnOwogaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQucmV2d2Fsay5SZXZTb3J0OwpAQCAtODIsMjEgKzc5LDE1IEBACiBpbXBvcnQgb3JnLnNsZjRqLkxvZ2dlckZhY3Rvcnk7CiAKIGltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOwotaW1wb3J0IGphdmEuaW8uVW5zdXBwb3J0ZWRFbmNvZGluZ0V4Y2VwdGlvbjsKLWltcG9ydCBqYXZhLnNxbC5UaW1lc3RhbXA7CiBpbXBvcnQgamF2YS51dGlsLkFycmF5TGlzdDsKLWltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbjsKIGltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbnM7Ci1pbXBvcnQgamF2YS51dGlsLkNvbXBhcmF0b3I7CiBpbXBvcnQgamF2YS51dGlsLkhhc2hNYXA7CiBpbXBvcnQgamF2YS51dGlsLkhhc2hTZXQ7CiBpbXBvcnQgamF2YS51dGlsLkl0ZXJhdG9yOwogaW1wb3J0IGphdmEudXRpbC5MaXN0OwogaW1wb3J0IGphdmEudXRpbC5NYXA7CitpbXBvcnQgamF2YS51dGlsLk1hcC5FbnRyeTsKIGltcG9ydCBqYXZhLnV0aWwuU2V0OwotaW1wb3J0IGphdmEudXRpbC5UaW1lWm9uZTsKLQotaW1wb3J0IGphdmF4LmFubm90YXRpb24uTnVsbGFibGU7CiAKIC8qKgogICogTWVyZ2VzIGNoYW5nZXMgaW4gc3VibWlzc2lvbiBvcmRlciBpbnRvIGEgc2luZ2xlIGJyYW5jaC4KQEAgLTExOCwxOSArMTA5LDE0IEBACiAgIH0KIAogICBwcml2YXRlIHN0YXRpYyBmaW5hbCBMb2dnZXIgbG9nID0gTG9nZ2VyRmFjdG9yeS5nZXRMb2dnZXIoTWVyZ2VPcC5jbGFzcyk7Ci0gIHByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZyBSX0hFQURTX01BU1RFUiA9Ci0gICAgICBDb25zdGFudHMuUl9IRUFEUyArIENvbnN0YW50cy5NQVNURVI7Ci0gIHByaXZhdGUgc3RhdGljIGZpbmFsIEFwcHJvdmFsQ2F0ZWdvcnkuSWQgQ1JWVyA9Ci0gICAgICBuZXcgQXBwcm92YWxDYXRlZ29yeS5JZCgiQ1JWVyIpOwotICBwcml2YXRlIHN0YXRpYyBmaW5hbCBBcHByb3ZhbENhdGVnb3J5LklkIFZSSUYgPQotICAgICAgbmV3IEFwcHJvdmFsQ2F0ZWdvcnkuSWQoIlZSSUYiKTsKLSAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgRm9vdGVyS2V5IFJFVklFV0VEX09OID0gbmV3IEZvb3RlcktleSgiUmV2aWV3ZWQtb24iKTsKLSAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgRm9vdGVyS2V5IENIQU5HRV9JRCA9IG5ldyBGb290ZXJLZXkoIkNoYW5nZS1JZCIpOwogCiAgIC8qKiBBbW91bnQgb2YgdGltZSB0byB3YWl0IGJldHdlZW4gc3VibWl0IGFuZCBjaGVja2luZyBmb3IgbWlzc2luZyBkZXBzLiAqLwogICBwcml2YXRlIHN0YXRpYyBmaW5hbCBsb25nIERFUEVOREVOQ1lfREVMQVkgPQogICAgICAgTUlMTElTRUNPTkRTLmNvbnZlcnQoMTUsIE1JTlVURVMpOwogCisgIHByaXZhdGUgc3RhdGljIGZpbmFsIGxvbmcgTE9DS19GQUlMVVJFX1JFVFJZX0RFTEFZID0KKyAgICAgIE1JTExJU0VDT05EUy5jb252ZXJ0KDE1LCBTRUNPTkRTKTsKKwogICBwcml2YXRlIGZpbmFsIEdpdFJlcG9zaXRvcnlNYW5hZ2VyIHJlcG9NYW5hZ2VyOwogICBwcml2YXRlIGZpbmFsIFNjaGVtYUZhY3Rvcnk8UmV2aWV3RGI+IHNjaGVtYUZhY3Rvcnk7CiAgIHByaXZhdGUgZmluYWwgUHJvamVjdENhY2hlIHByb2plY3RDYWNoZTsKQEAgLTEzOCw3ICsxMjQsNiBAQAogICBwcml2YXRlIGZpbmFsIEdpdFJlZmVyZW5jZVVwZGF0ZWQgcmVwbGljYXRpb247CiAgIHByaXZhdGUgZmluYWwgTWVyZ2VkU2VuZGVyLkZhY3RvcnkgbWVyZ2VkU2VuZGVyRmFjdG9yeTsKICAgcHJpdmF0ZSBmaW5hbCBNZXJnZUZhaWxTZW5kZXIuRmFjdG9yeSBtZXJnZUZhaWxTZW5kZXJGYWN0b3J5OwotICBwcml2YXRlIGZpbmFsIFByb3ZpZGVyPFN0cmluZz4gdXJsUHJvdmlkZXI7CiAgIHByaXZhdGUgZmluYWwgQXBwcm92YWxUeXBlcyBhcHByb3ZhbFR5cGVzOwogICBwcml2YXRlIGZpbmFsIFBhdGNoU2V0SW5mb0ZhY3RvcnkgcGF0Y2hTZXRJbmZvRmFjdG9yeTsKICAgcHJpdmF0ZSBmaW5hbCBJZGVudGlmaWVkVXNlci5HZW5lcmljRmFjdG9yeSBpZGVudGlmaWVkVXNlckZhY3Rvcnk7CkBAIC0xNDgsMjMgKzEzMywyMyBAQAogICBwcml2YXRlIGZpbmFsIFBlcnNvbklkZW50IG15SWRlbnQ7CiAgIHByaXZhdGUgZmluYWwgQnJhbmNoLk5hbWVLZXkgZGVzdEJyYW5jaDsKICAgcHJpdmF0ZSBQcm9qZWN0IGRlc3RQcm9qZWN0OwotICBwcml2YXRlIGZpbmFsIExpc3Q8Q29kZVJldmlld0NvbW1pdD4gdG9NZXJnZTsKLSAgcHJpdmF0ZSBMaXN0PENoYW5nZT4gc3VibWl0dGVkOworICBwcml2YXRlIGZpbmFsIExpc3RNdWx0aW1hcDxTdWJtaXRUeXBlLCBDb2RlUmV2aWV3Q29tbWl0PiB0b01lcmdlOworICBwcml2YXRlIGZpbmFsIExpc3Q8Q29kZVJldmlld0NvbW1pdD4gcG90ZW50aWFsbHlTdGlsbFN1Ym1pdHRhYmxlOwogICBwcml2YXRlIGZpbmFsIE1hcDxDaGFuZ2UuSWQsIENvZGVSZXZpZXdDb21taXQ+IGNvbW1pdHM7CiAgIHByaXZhdGUgUmV2aWV3RGIgZGI7CiAgIHByaXZhdGUgUmVwb3NpdG9yeSByZXBvOwogICBwcml2YXRlIFJldldhbGsgcnc7Ci0gIHByaXZhdGUgUmV2RmxhZyBDQU5fTUVSR0U7CisgIHByaXZhdGUgUmV2RmxhZyBjYW5NZXJnZUZsYWc7CiAgIHByaXZhdGUgQ29kZVJldmlld0NvbW1pdCBicmFuY2hUaXA7CiAgIHByaXZhdGUgQ29kZVJldmlld0NvbW1pdCBtZXJnZVRpcDsKLSAgcHJpdmF0ZSBTZXQ8UmV2Q29tbWl0PiBhbHJlYWR5QWNjZXB0ZWQ7Ci0gIHByaXZhdGUgUmVmVXBkYXRlIGJyYW5jaFVwZGF0ZTsKICAgcHJpdmF0ZSBPYmplY3RJbnNlcnRlciBpbnNlcnRlcjsKKyAgcHJpdmF0ZSBQZXJzb25JZGVudCByZWZMb2dJZGVudDsKIAogICBwcml2YXRlIGZpbmFsIENoYW5nZUhvb2tzIGhvb2tzOwogICBwcml2YXRlIGZpbmFsIEFjY291bnRDYWNoZSBhY2NvdW50Q2FjaGU7CiAgIHByaXZhdGUgZmluYWwgVGFnQ2FjaGUgdGFnQ2FjaGU7CiAgIHByaXZhdGUgZmluYWwgQ3JlYXRlQ29kZVJldmlld05vdGVzLkZhY3RvcnkgY29kZVJldmlld05vdGVzRmFjdG9yeTsKKyAgcHJpdmF0ZSBmaW5hbCBTdWJtaXRTdHJhdGVneUZhY3Rvcnkgc3VibWl0U3RyYXRlZ3lGYWN0b3J5OwogICBwcml2YXRlIGZpbmFsIFN1Ym1vZHVsZU9wLkZhY3Rvcnkgc3ViT3BGYWN0b3J5OwogICBwcml2YXRlIGZpbmFsIFdvcmtRdWV1ZSB3b3JrUXVldWU7CiAgIHByaXZhdGUgZmluYWwgUmVxdWVzdFNjb3BlUHJvcGFnYXRvciByZXF1ZXN0U2NvcGVQcm9wYWdhdG9yOwpAQCAtMTc0LDcgKzE1OSw2IEBACiAgICAgICBmaW5hbCBQcm9qZWN0Q2FjaGUgcGMsIGZpbmFsIEZ1bmN0aW9uU3RhdGUuRmFjdG9yeSBmcywKICAgICAgIGZpbmFsIEdpdFJlZmVyZW5jZVVwZGF0ZWQgcnEsIGZpbmFsIE1lcmdlZFNlbmRlci5GYWN0b3J5IG1zZiwKICAgICAgIGZpbmFsIE1lcmdlRmFpbFNlbmRlci5GYWN0b3J5IG1mc2YsCi0gICAgICBAQ2Fub25pY2FsV2ViVXJsIEBOdWxsYWJsZSBmaW5hbCBQcm92aWRlcjxTdHJpbmc+IGN3dSwKICAgICAgIGZpbmFsIEFwcHJvdmFsVHlwZXMgYXBwcm92YWxUeXBlcywgZmluYWwgUGF0Y2hTZXRJbmZvRmFjdG9yeSBwc2lmLAogICAgICAgZmluYWwgSWRlbnRpZmllZFVzZXIuR2VuZXJpY0ZhY3RvcnkgaXVmLAogICAgICAgZmluYWwgQ2hhbmdlQ29udHJvbC5HZW5lcmljRmFjdG9yeSBjaGFuZ2VDb250cm9sRmFjdG9yeSwKQEAgLTE4Miw2ICsxNjYsNyBAQAogICAgICAgZmluYWwgTWVyZ2VRdWV1ZSBtZXJnZVF1ZXVlLCBAQXNzaXN0ZWQgZmluYWwgQnJhbmNoLk5hbWVLZXkgYnJhbmNoLAogICAgICAgZmluYWwgQ2hhbmdlSG9va3MgaG9va3MsIGZpbmFsIEFjY291bnRDYWNoZSBhY2NvdW50Q2FjaGUsCiAgICAgICBmaW5hbCBUYWdDYWNoZSB0YWdDYWNoZSwgZmluYWwgQ3JlYXRlQ29kZVJldmlld05vdGVzLkZhY3RvcnkgY3JuZiwKKyAgICAgIGZpbmFsIFN1Ym1pdFN0cmF0ZWd5RmFjdG9yeSBzdWJtaXRTdHJhdGVneUZhY3RvcnksCiAgICAgICBmaW5hbCBTdWJtb2R1bGVPcC5GYWN0b3J5IHN1Yk9wRmFjdG9yeSwKICAgICAgIGZpbmFsIFdvcmtRdWV1ZSB3b3JrUXVldWUsCiAgICAgICBmaW5hbCBSZXF1ZXN0U2NvcGVQcm9wYWdhdG9yIHJlcXVlc3RTY29wZVByb3BhZ2F0b3IpIHsKQEAgLTE5Miw3ICsxNzcsNiBAQAogICAgIHJlcGxpY2F0aW9uID0gcnE7CiAgICAgbWVyZ2VkU2VuZGVyRmFjdG9yeSA9IG1zZjsKICAgICBtZXJnZUZhaWxTZW5kZXJGYWN0b3J5ID0gbWZzZjsKLSAgICB1cmxQcm92aWRlciA9IGN3dTsKICAgICB0aGlzLmFwcHJvdmFsVHlwZXMgPSBhcHByb3ZhbFR5cGVzOwogICAgIHBhdGNoU2V0SW5mb0ZhY3RvcnkgPSBwc2lmOwogICAgIGlkZW50aWZpZWRVc2VyRmFjdG9yeSA9IGl1ZjsKQEAgLTIwMiwxMiArMTg2LDE0IEBACiAgICAgdGhpcy5hY2NvdW50Q2FjaGUgPSBhY2NvdW50Q2FjaGU7CiAgICAgdGhpcy50YWdDYWNoZSA9IHRhZ0NhY2hlOwogICAgIGNvZGVSZXZpZXdOb3Rlc0ZhY3RvcnkgPSBjcm5mOworICAgIHRoaXMuc3VibWl0U3RyYXRlZ3lGYWN0b3J5ID0gc3VibWl0U3RyYXRlZ3lGYWN0b3J5OwogICAgIHRoaXMuc3ViT3BGYWN0b3J5ID0gc3ViT3BGYWN0b3J5OwogICAgIHRoaXMud29ya1F1ZXVlID0gd29ya1F1ZXVlOwogICAgIHRoaXMucmVxdWVzdFNjb3BlUHJvcGFnYXRvciA9IHJlcXVlc3RTY29wZVByb3BhZ2F0b3I7CiAgICAgdGhpcy5teUlkZW50ID0gbXlJZGVudDsKICAgICBkZXN0QnJhbmNoID0gYnJhbmNoOwotICAgIHRvTWVyZ2UgPSBuZXcgQXJyYXlMaXN0PENvZGVSZXZpZXdDb21taXQ+KCk7CisgICAgdG9NZXJnZSA9IEFycmF5TGlzdE11bHRpbWFwLmNyZWF0ZSgpOworICAgIHBvdGVudGlhbGx5U3RpbGxTdWJtaXR0YWJsZSA9IG5ldyBBcnJheUxpc3Q8Q29kZVJldmlld0NvbW1pdD4oKTsKICAgICBjb21taXRzID0gbmV3IEhhc2hNYXA8Q2hhbmdlLklkLCBDb2RlUmV2aWV3Q29tbWl0PigpOwogICB9CiAKQEAgLTIxNiw4ICsyMDIsNiBAQAogICAgICAgc2V0RGVzdFByb2plY3QoKTsKICAgICAgIG9wZW5SZXBvc2l0b3J5KCk7CiAgICAgICBmaW5hbCBSZWYgZGVzdEJyYW5jaFJlZiA9IHJlcG8uZ2V0UmVmKGRlc3RCcmFuY2guZ2V0KCkpOwotICAgICAgc3VibWl0dGVkID0gbmV3IEFycmF5TGlzdDxDaGFuZ2U+KCk7Ci0gICAgICBzdWJtaXR0ZWQuYWRkKGNoYW5nZSk7CiAKICAgICAgIC8vIFRlc3QgbWVyZ2VhYmlsaXR5IG9mIHRoZSBjaGFuZ2UgaWYgdGhlIGxhc3QgbWVyZ2VkIHNoYTEKICAgICAgIC8vIGluIHRoZSBicmFuY2ggaXMgZGlmZmVyZW50IGZyb20gdGhlIGxhc3Qgc2hhMQpAQCAtMjI3LDE3ICsyMTEsMjcgQEAKICAgICAgICAgICB8fCAoZGVzdEJyYW5jaFJlZiAhPSBudWxsICYmICFkZXN0QnJhbmNoUmVmLmdldE9iamVjdElkKCkuZ2V0TmFtZSgpCiAgICAgICAgICAgICAgIC5lcXVhbHMoY2hhbmdlLmdldExhc3RTaGExTWVyZ2VUZXN0ZWQoKS5nZXQoKSkpKSB7CiAgICAgICAgIG9wZW5TY2hlbWEoKTsKLSAgICAgICAgcHJlTWVyZ2UoKTsKKyAgICAgICAgb3BlbkJyYW5jaCgpOworICAgICAgICB2YWxpZGF0ZUNoYW5nZUxpc3QoQ29sbGVjdGlvbnMuc2luZ2xldG9uTGlzdChjaGFuZ2UpKTsKKyAgICAgICAgaWYgKCF0b01lcmdlLmlzRW1wdHkoKSkgeworICAgICAgICAgIGZpbmFsIEVudHJ5PFN1Ym1pdFR5cGUsIENvZGVSZXZpZXdDb21taXQ+IGUgPQorICAgICAgICAgICAgICB0b01lcmdlLmVudHJpZXMoKS5pdGVyYXRvcigpLm5leHQoKTsKKyAgICAgICAgICBmaW5hbCBib29sZWFuIGlzTWVyZ2VhYmxlID0KKyAgICAgICAgICAgICAgY3JlYXRlU3RyYXRlZ3koZS5nZXRLZXkoKSkuZHJ5UnVuKGJyYW5jaFRpcCwgZS5nZXRWYWx1ZSgpKTsKIAotICAgICAgICAvLyB1cGRhdGUgc2hhMSB0ZXN0ZWQgbWVyZ2UuCi0gICAgICAgIGlmIChkZXN0QnJhbmNoUmVmICE9IG51bGwpIHsKLSAgICAgICAgICBjaGFuZ2Uuc2V0TGFzdFNoYTFNZXJnZVRlc3RlZChuZXcgUmV2SWQoZGVzdEJyYW5jaFJlZgotICAgICAgICAgICAgICAuZ2V0T2JqZWN0SWQoKS5nZXROYW1lKCkpKTsKKyAgICAgICAgICAvLyB1cGRhdGUgc2hhMSB0ZXN0ZWQgbWVyZ2UuCisgICAgICAgICAgaWYgKGRlc3RCcmFuY2hSZWYgIT0gbnVsbCkgeworICAgICAgICAgICAgY2hhbmdlLnNldExhc3RTaGExTWVyZ2VUZXN0ZWQobmV3IFJldklkKGRlc3RCcmFuY2hSZWYKKyAgICAgICAgICAgICAgICAuZ2V0T2JqZWN0SWQoKS5nZXROYW1lKCkpKTsKKyAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgY2hhbmdlLnNldExhc3RTaGExTWVyZ2VUZXN0ZWQobmV3IFJldklkKCIiKSk7CisgICAgICAgICAgfQorICAgICAgICAgIGNoYW5nZS5zZXRNZXJnZWFibGUoaXNNZXJnZWFibGUpOworICAgICAgICAgIGRiLmNoYW5nZXMoKS51cGRhdGUoQ29sbGVjdGlvbnMuc2luZ2xldG9uKGNoYW5nZSkpOwogICAgICAgICB9IGVsc2UgewotICAgICAgICAgIGNoYW5nZS5zZXRMYXN0U2hhMU1lcmdlVGVzdGVkKG5ldyBSZXZJZCgiIikpOworICAgICAgICAgIGxvZy5lcnJvcigiVGVzdCBtZXJnZSBhdHRlbXB0IGZvciBjaGFuZ2U6ICIgKyBjaGFuZ2UuZ2V0SWQoKQorICAgICAgICAgICAgICArICIgZmFpbGVkIik7CiAgICAgICAgIH0KLSAgICAgICAgY2hhbmdlLnNldE1lcmdlYWJsZShpc01lcmdlYWJsZShjaGFuZ2UpKTsKLSAgICAgICAgZGIuY2hhbmdlcygpLnVwZGF0ZShDb2xsZWN0aW9ucy5zaW5nbGV0b24oY2hhbmdlKSk7CiAgICAgICB9CiAgICAgfSBjYXRjaCAoTWVyZ2VFeGNlcHRpb24gZSkgewogICAgICAgbG9nLmVycm9yKCJUZXN0IG1lcmdlIGF0dGVtcHQgZm9yIGNoYW5nZTogIiArIGNoYW5nZS5nZXRJZCgpCkBAIC0yNzcsMTEgKzI3MSw1NCBAQAogICAgIHRyeSB7CiAgICAgICBvcGVuU2NoZW1hKCk7CiAgICAgICBvcGVuUmVwb3NpdG9yeSgpOwotICAgICAgc3VibWl0dGVkID0gZGIuY2hhbmdlcygpLnN1Ym1pdHRlZChkZXN0QnJhbmNoKS50b0xpc3QoKTsKLSAgICAgIHByZU1lcmdlKCk7Ci0gICAgICB1cGRhdGVCcmFuY2goKTsKLSAgICAgIHVwZGF0ZUNoYW5nZVN0YXR1cygpOwotICAgICAgdXBkYXRlU3Vic2NyaXB0aW9ucygpOworICAgICAgb3BlbkJyYW5jaCgpOworICAgICAgZmluYWwgTGlzdE11bHRpbWFwPFN1Ym1pdFR5cGUsIENoYW5nZT4gdG9TdWJtaXQgPQorICAgICAgICAgIHZhbGlkYXRlQ2hhbmdlTGlzdChkYi5jaGFuZ2VzKCkuc3VibWl0dGVkKGRlc3RCcmFuY2gpLnRvTGlzdCgpKTsKKworICAgICAgZmluYWwgTGlzdE11bHRpbWFwPFN1Ym1pdFR5cGUsIENvZGVSZXZpZXdDb21taXQ+IHRvTWVyZ2VOZXh0VHVybiA9CisgICAgICAgICAgQXJyYXlMaXN0TXVsdGltYXAuY3JlYXRlKCk7CisgICAgICBmaW5hbCBMaXN0PENvZGVSZXZpZXdDb21taXQ+IHBvdGVudGlhbGx5U3RpbGxTdWJtaXR0YWJsZU9uTmV4dFJ1biA9CisgICAgICAgICAgbmV3IEFycmF5TGlzdDxDb2RlUmV2aWV3Q29tbWl0PigpOworICAgICAgd2hpbGUgKCF0b01lcmdlLmlzRW1wdHkoKSkgeworICAgICAgICB0b01lcmdlTmV4dFR1cm4uY2xlYXIoKTsKKyAgICAgICAgZmluYWwgU2V0PFN1Ym1pdFR5cGU+IHN1Ym1pdFR5cGVzID0KKyAgICAgICAgICAgIG5ldyBIYXNoU2V0PFByb2plY3QuU3VibWl0VHlwZT4odG9NZXJnZS5rZXlTZXQoKSk7CisgICAgICAgIGZvciAoZmluYWwgU3VibWl0VHlwZSBzdWJtaXRUeXBlIDogc3VibWl0VHlwZXMpIHsKKyAgICAgICAgICBmaW5hbCBSZWZVcGRhdGUgYnJhbmNoVXBkYXRlID0gb3BlbkJyYW5jaCgpOworICAgICAgICAgIGZpbmFsIFN1Ym1pdFN0cmF0ZWd5IHN0cmF0ZWd5ID0gY3JlYXRlU3RyYXRlZ3koc3VibWl0VHlwZSk7CisgICAgICAgICAgcHJlTWVyZ2Uoc3RyYXRlZ3ksIHRvTWVyZ2UuZ2V0KHN1Ym1pdFR5cGUpKTsKKyAgICAgICAgICB1cGRhdGVCcmFuY2goc3RyYXRlZ3ksIGJyYW5jaFVwZGF0ZSk7CisgICAgICAgICAgdXBkYXRlQ2hhbmdlU3RhdHVzKHRvU3VibWl0LmdldChzdWJtaXRUeXBlKSk7CisgICAgICAgICAgdXBkYXRlU3Vic2NyaXB0aW9ucyh0b1N1Ym1pdC5nZXQoc3VibWl0VHlwZSkpOworCisgICAgICAgICAgZm9yIChmaW5hbCBJdGVyYXRvcjxDb2RlUmV2aWV3Q29tbWl0PiBpdCA9CisgICAgICAgICAgICAgIHBvdGVudGlhbGx5U3RpbGxTdWJtaXR0YWJsZS5pdGVyYXRvcigpOyBpdC5oYXNOZXh0KCk7KSB7CisgICAgICAgICAgICBmaW5hbCBDb2RlUmV2aWV3Q29tbWl0IGNvbW1pdCA9IGl0Lm5leHQoKTsKKyAgICAgICAgICAgIGlmIChjb250YWluc01pc3NpbmdDb21taXRzKHRvTWVyZ2UsIGNvbW1pdCkKKyAgICAgICAgICAgICAgICB8fCBjb250YWluc01pc3NpbmdDb21taXRzKHRvTWVyZ2VOZXh0VHVybiwgY29tbWl0KSkgeworICAgICAgICAgICAgICAvLyBjaGFuZ2UgaGFzIG1pc3NpbmcgZGVwZW5kZW5jaWVzLCBidXQgYWxsIGNvbW1pdHMgd2hpY2ggYXJlCisgICAgICAgICAgICAgIC8vIG1pc3NpbmcgYXJlIHN0aWxsIGF0dGVtcHRlZCB0byBiZSBtZXJnZWQgd2l0aCBhbm90aGVyIHN1Ym1pdAorICAgICAgICAgICAgICAvLyBzdHJhdGVneSwgcmV0cnkgdG8gbWVyZ2UgdGhpcyBjb21taXQgaW4gdGhlIG5leHQgdHVybgorICAgICAgICAgICAgICBpdC5yZW1vdmUoKTsKKyAgICAgICAgICAgICAgY29tbWl0LnN0YXR1c0NvZGUgPSBudWxsOworICAgICAgICAgICAgICBjb21taXQubWlzc2luZyA9IG51bGw7CisgICAgICAgICAgICAgIHRvTWVyZ2VOZXh0VHVybi5wdXQoc3VibWl0VHlwZSwgY29tbWl0KTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICB9CisgICAgICAgICAgcG90ZW50aWFsbHlTdGlsbFN1Ym1pdHRhYmxlT25OZXh0UnVuLmFkZEFsbChwb3RlbnRpYWxseVN0aWxsU3VibWl0dGFibGUpOworICAgICAgICAgIHBvdGVudGlhbGx5U3RpbGxTdWJtaXR0YWJsZS5jbGVhcigpOworICAgICAgICB9CisgICAgICAgIHRvTWVyZ2UuY2xlYXIoKTsKKyAgICAgICAgdG9NZXJnZS5wdXRBbGwodG9NZXJnZU5leHRUdXJuKTsKKyAgICAgIH0KKworICAgICAgZm9yIChmaW5hbCBDb2RlUmV2aWV3Q29tbWl0IGNvbW1pdCA6IHBvdGVudGlhbGx5U3RpbGxTdWJtaXR0YWJsZU9uTmV4dFJ1bikgeworICAgICAgICBmaW5hbCBDYXBhYmxlIGNhcGFibGUgPSBpc1N1Ym1pdFN0aWxsUG9zc2libGUoY29tbWl0KTsKKyAgICAgICAgaWYgKGNhcGFibGUgIT0gQ2FwYWJsZS5PSykgeworICAgICAgICAgIHNlbmRNZXJnZUZhaWwoY29tbWl0LmNoYW5nZSwKKyAgICAgICAgICAgICAgbWVzc2FnZShjb21taXQuY2hhbmdlLCBjYXBhYmxlLmdldE1lc3NhZ2UoKSksIGZhbHNlKTsKKyAgICAgICAgfQorICAgICAgfQogICAgIH0gY2F0Y2ggKE9ybUV4Y2VwdGlvbiBlKSB7CiAgICAgICB0aHJvdyBuZXcgTWVyZ2VFeGNlcHRpb24oIkNhbm5vdCBxdWVyeSB0aGUgZGF0YWJhc2UiLCBlKTsKICAgICB9IGZpbmFsbHkgewpAQCAtMzAwLDI0ICszMzcsNTkgQEAKICAgICB9CiAgIH0KIAotICBwcml2YXRlIHZvaWQgcHJlTWVyZ2UoKSB0aHJvd3MgTWVyZ2VFeGNlcHRpb24sIE9ybUV4Y2VwdGlvbiB7Ci0gICAgb3BlbkJyYW5jaCgpOwotICAgIHZhbGlkYXRlQ2hhbmdlTGlzdCgpOwotICAgIG1lcmdlVGlwID0gYnJhbmNoVGlwOwotICAgIHN3aXRjaCAoZGVzdFByb2plY3QuZ2V0U3VibWl0VHlwZSgpKSB7Ci0gICAgICBjYXNlIENIRVJSWV9QSUNLOgotICAgICAgICBjaGVycnlQaWNrQ2hhbmdlcygpOwotICAgICAgICBicmVhazsKLQotICAgICAgY2FzZSBGQVNUX0ZPUldBUkRfT05MWToKLSAgICAgIGNhc2UgTUVSR0VfQUxXQVlTOgotICAgICAgY2FzZSBNRVJHRV9JRl9ORUNFU1NBUlk6Ci0gICAgICBkZWZhdWx0OgotICAgICAgICByZWR1Y2VUb01pbmltYWxNZXJnZSgpOwotICAgICAgICBtZXJnZVRvcGljcygpOwotICAgICAgICBtYXJrQ2xlYW5NZXJnZXMoKTsKLSAgICAgICAgYnJlYWs7CisgIHByaXZhdGUgYm9vbGVhbiBjb250YWluc01pc3NpbmdDb21taXRzKAorICAgICAgZmluYWwgTGlzdE11bHRpbWFwPFN1Ym1pdFR5cGUsIENvZGVSZXZpZXdDb21taXQ+IG1hcCwKKyAgICAgIGZpbmFsIENvZGVSZXZpZXdDb21taXQgY29tbWl0KSB7CisgICAgaWYgKCFpc1N1Ym1pdEZvck1pc3NpbmdDb21taXRzU3RpbGxQb3NzaWJsZShjb21taXQpKSB7CisgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQorCisgICAgZm9yIChmaW5hbCBDb2RlUmV2aWV3Q29tbWl0IG1pc3NpbmdDb21taXQgOiBjb21taXQubWlzc2luZykgeworICAgICAgaWYgKCFtYXAuY29udGFpbnNWYWx1ZShtaXNzaW5nQ29tbWl0KSkgeworICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICB9CisgICAgfQorICAgIHJldHVybiB0cnVlOworICB9CisKKyAgcHJpdmF0ZSBib29sZWFuIGlzU3VibWl0Rm9yTWlzc2luZ0NvbW1pdHNTdGlsbFBvc3NpYmxlKGZpbmFsIENvZGVSZXZpZXdDb21taXQgY29tbWl0KSB7CisgICAgaWYgKGNvbW1pdC5taXNzaW5nID09IG51bGwgfHwgY29tbWl0Lm1pc3NpbmcuaXNFbXB0eSgpKSB7CisgICAgICByZXR1cm4gZmFsc2U7CisgICAgfQorCisgICAgZm9yIChDb2RlUmV2aWV3Q29tbWl0IG1pc3NpbmdDb21taXQgOiBjb21taXQubWlzc2luZykgeworICAgICAgbG9hZENoYW5nZUluZm8obWlzc2luZ0NvbW1pdCk7CisKKyAgICAgIGlmIChtaXNzaW5nQ29tbWl0LnBhdGNoc2V0SWQgPT0gbnVsbCkgeworICAgICAgICAvLyBUaGUgY29tbWl0IGRvZXNuJ3QgaGF2ZSBhIHBhdGNoIHNldCwgc28gaXQgY2Fubm90IGJlCisgICAgICAgIC8vIHN1Ym1pdHRlZCB0byB0aGUgYnJhbmNoLgorICAgICAgICAvLworICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICB9CisKKyAgICAgIGlmICghbWlzc2luZ0NvbW1pdC5jaGFuZ2UuY3VycmVudFBhdGNoU2V0SWQoKS5lcXVhbHMoCisgICAgICAgICAgbWlzc2luZ0NvbW1pdC5wYXRjaHNldElkKSkgeworICAgICAgICAvLyBJZiB0aGUgbWlzc2luZyBjb21taXQgaXMgbm90IHRoZSBjdXJyZW50IHBhdGNoIHNldCwKKyAgICAgICAgLy8gdGhlIGNoYW5nZSBtdXN0IGJlIHJlYmFzZWQgdG8gdXNlIHRoZSBwcm9wZXIgcGFyZW50LgorICAgICAgICAvLworICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICB9CisgICAgfQorCisgICAgcmV0dXJuIHRydWU7CisgIH0KKworICBwcml2YXRlIHZvaWQgcHJlTWVyZ2UoZmluYWwgU3VibWl0U3RyYXRlZ3kgc3RyYXRlZ3ksCisgICAgICBmaW5hbCBMaXN0PENvZGVSZXZpZXdDb21taXQ+IHRvTWVyZ2UpIHRocm93cyBNZXJnZUV4Y2VwdGlvbiB7CisgICAgbWVyZ2VUaXAgPSBzdHJhdGVneS5ydW4oYnJhbmNoVGlwLCB0b01lcmdlKTsKKyAgICByZWZMb2dJZGVudCA9IHN0cmF0ZWd5LmdldFJlZkxvZ0lkZW50KCk7CisgICAgY29tbWl0cy5wdXRBbGwoc3RyYXRlZ3kuZ2V0TmV3Q29tbWl0cygpKTsKKyAgfQorCisgIHByaXZhdGUgU3VibWl0U3RyYXRlZ3kgY3JlYXRlU3RyYXRlZ3koZmluYWwgU3VibWl0VHlwZSBzdWJtaXRUeXBlKSB0aHJvd3MgTWVyZ2VFeGNlcHRpb24geworICAgIHJldHVybiBzdWJtaXRTdHJhdGVneUZhY3RvcnkuY3JlYXRlKHN1Ym1pdFR5cGUsIGRiLCByZXBvLCBydywgaW5zZXJ0ZXIsCisgICAgICAgIGNhbk1lcmdlRmxhZywgZ2V0QWxyZWFkeUFjY2VwdGVkKGJyYW5jaFRpcCksIGRlc3RCcmFuY2gsCisgICAgICAgIGRlc3RQcm9qZWN0LmlzVXNlQ29udGVudE1lcmdlKCkpOwogICB9CiAKICAgcHJpdmF0ZSB2b2lkIG9wZW5SZXBvc2l0b3J5KCkgdGhyb3dzIE1lcmdlRXhjZXB0aW9uIHsKQEAgLTM0MCwyMCArNDEyLDE3IEBACiAgICAgfTsKICAgICBydy5zb3J0KFJldlNvcnQuVE9QTyk7CiAgICAgcncuc29ydChSZXZTb3J0LkNPTU1JVF9USU1FX0RFU0MsIHRydWUpOwotICAgIENBTl9NRVJHRSA9IHJ3Lm5ld0ZsYWcoIkNBTl9NRVJHRSIpOworICAgIGNhbk1lcmdlRmxhZyA9IHJ3Lm5ld0ZsYWcoIkNBTl9NRVJHRSIpOwogCiAgICAgaW5zZXJ0ZXIgPSByZXBvLm5ld09iamVjdEluc2VydGVyKCk7CiAgIH0KIAotICBwcml2YXRlIHZvaWQgb3BlbkJyYW5jaCgpIHRocm93cyBNZXJnZUV4Y2VwdGlvbiB7Ci0gICAgYWxyZWFkeUFjY2VwdGVkID0gbmV3IEhhc2hTZXQ8UmV2Q29tbWl0PigpOwotCisgIHByaXZhdGUgUmVmVXBkYXRlIG9wZW5CcmFuY2goKSB0aHJvd3MgTWVyZ2VFeGNlcHRpb24gewogICAgIHRyeSB7Ci0gICAgICBicmFuY2hVcGRhdGUgPSByZXBvLnVwZGF0ZVJlZihkZXN0QnJhbmNoLmdldCgpKTsKKyAgICAgIGZpbmFsIFJlZlVwZGF0ZSBicmFuY2hVcGRhdGUgPSByZXBvLnVwZGF0ZVJlZihkZXN0QnJhbmNoLmdldCgpKTsKICAgICAgIGlmIChicmFuY2hVcGRhdGUuZ2V0T2xkT2JqZWN0SWQoKSAhPSBudWxsKSB7CiAgICAgICAgIGJyYW5jaFRpcCA9CiAgICAgICAgICAgICAoQ29kZVJldmlld0NvbW1pdCkgcncucGFyc2VDb21taXQoYnJhbmNoVXBkYXRlLmdldE9sZE9iamVjdElkKCkpOwotICAgICAgICBhbHJlYWR5QWNjZXB0ZWQuYWRkKGJyYW5jaFRpcCk7CiAgICAgICB9IGVsc2UgewogICAgICAgICBicmFuY2hUaXAgPSBudWxsOwogICAgICAgfQpAQCAtMzczLDYgKzQ0MiwyMSBAQAogICAgICAgICAgICAgIkZhaWxlZCB0byBjaGVjayBleGlzdGVuY2Ugb2YgZGVzdGluYXRpb24gYnJhbmNoIiwgZSk7CiAgICAgICB9CiAKKyAgICAgIHJldHVybiBicmFuY2hVcGRhdGU7CisgICAgfSBjYXRjaCAoSU9FeGNlcHRpb24gZSkgeworICAgICAgdGhyb3cgbmV3IE1lcmdlRXhjZXB0aW9uKCJDYW5ub3Qgb3BlbiBicmFuY2giLCBlKTsKKyAgICB9CisgIH0KKworICBwcml2YXRlIFNldDxSZXZDb21taXQ+IGdldEFscmVhZHlBY2NlcHRlZChmaW5hbCBDb2RlUmV2aWV3Q29tbWl0IGJyYW5jaFRpcCkKKyAgICAgIHRocm93cyBNZXJnZUV4Y2VwdGlvbiB7CisgICAgZmluYWwgU2V0PFJldkNvbW1pdD4gYWxyZWFkeUFjY2VwdGVkID0gbmV3IEhhc2hTZXQ8UmV2Q29tbWl0PigpOworCisgICAgaWYgKGJyYW5jaFRpcCAhPSBudWxsKSB7CisgICAgICBhbHJlYWR5QWNjZXB0ZWQuYWRkKGJyYW5jaFRpcCk7CisgICAgfQorCisgICAgdHJ5IHsKICAgICAgIGZvciAoZmluYWwgUmVmIHIgOiByZXBvLmdldEFsbFJlZnMoKS52YWx1ZXMoKSkgewogICAgICAgICBpZiAoci5nZXROYW1lKCkuc3RhcnRzV2l0aChDb25zdGFudHMuUl9IRUFEUykKICAgICAgICAgICAgIHx8IHIuZ2V0TmFtZSgpLnN0YXJ0c1dpdGgoQ29uc3RhbnRzLlJfVEFHUykpIHsKQEAgLTM4NCwxMSArNDY4LDE3IEBACiAgICAgICAgIH0KICAgICAgIH0KICAgICB9IGNhdGNoIChJT0V4Y2VwdGlvbiBlKSB7Ci0gICAgICB0aHJvdyBuZXcgTWVyZ2VFeGNlcHRpb24oIkNhbm5vdCBvcGVuIGJyYW5jaCIsIGUpOworICAgICAgdGhyb3cgbmV3IE1lcmdlRXhjZXB0aW9uKCJGYWlsZWQgdG8gZGV0ZXJtaW5lIGFscmVhZHkgYWNjZXB0ZWQgY29tbWl0cy4iLCBlKTsKICAgICB9CisKKyAgICByZXR1cm4gYWxyZWFkeUFjY2VwdGVkOwogICB9CiAKLSAgcHJpdmF0ZSB2b2lkIHZhbGlkYXRlQ2hhbmdlTGlzdCgpIHRocm93cyBNZXJnZUV4Y2VwdGlvbiB7CisgIHByaXZhdGUgTGlzdE11bHRpbWFwPFN1Ym1pdFR5cGUsIENoYW5nZT4gdmFsaWRhdGVDaGFuZ2VMaXN0KAorICAgICAgZmluYWwgTGlzdDxDaGFuZ2U+IHN1Ym1pdHRlZCkgdGhyb3dzIE1lcmdlRXhjZXB0aW9uIHsKKyAgICBmaW5hbCBMaXN0TXVsdGltYXA8U3VibWl0VHlwZSwgQ2hhbmdlPiB0b1N1Ym1pdCA9CisgICAgICAgIEFycmF5TGlzdE11bHRpbWFwLmNyZWF0ZSgpOworCiAgICAgZmluYWwgU2V0PE9iamVjdElkPiB0aXBzID0gbmV3IEhhc2hTZXQ8T2JqZWN0SWQ+KCk7CiAgICAgZm9yIChmaW5hbCBSZWYgciA6IHJlcG8uZ2V0QWxsUmVmcygpLnZhbHVlcygpKSB7CiAgICAgICB0aXBzLmFkZChyLmdldE9iamVjdElkKCkpOwpAQCAtNDU4LDcgKzU0OCw3IEBACiAKICAgICAgIGlmIChicmFuY2hUaXAgIT0gbnVsbCkgewogICAgICAgICAvLyBJZiB0aGlzIGNvbW1pdCBpcyBhbHJlYWR5IG1lcmdlZCBpdHMgYSBidWcgaW4gdGhlIHF1ZXVpbmcgY29kZQotICAgICAgICAvLyB0aGF0IHdlIGdvdCBiYWNrIGhlcmUuIEp1c3QgbWFyayBpdCBjb21wbGV0ZSBhbmQgbW92ZSBvbi4gSXRzCisgICAgICAgIC8vIHRoYXQgd2UgZ290IGJhY2sgaGVyZS4gSnVzdCBtYXJrIGl0IGNvbXBsZXRlIGFuZCBtb3ZlIG9uLiBJdCdzCiAgICAgICAgIC8vIG1lcmdlZCBhbmQgdGhhdCBpcyBhbGwgdGhhdCBtYXR0ZXJlZCB0byB0aGUgcmVxdWVzdG9yLgogICAgICAgICAvLwogICAgICAgICB0cnkgewpAQCAtNDcxLDU3OCArNTYxLDQ0IEBACiAgICAgICAgIH0KICAgICAgIH0KIAotICAgICAgY29tbWl0LmFkZChDQU5fTUVSR0UpOwotICAgICAgdG9NZXJnZS5hZGQoY29tbWl0KTsKKyAgICAgIGZpbmFsIFN1Ym1pdFR5cGUgc3VibWl0VHlwZSA9IGdldFN1Ym1pdFR5cGUoY2hnLCBwcyk7CisgICAgICBpZiAoc3VibWl0VHlwZSA9PSBudWxsKSB7CisgICAgICAgIGNvbW1pdHMucHV0KGNoYW5nZUlkLAorICAgICAgICAgICAgQ29kZVJldmlld0NvbW1pdC5lcnJvcihDb21taXRNZXJnZVN0YXR1cy5OT19TVUJNSVRfVFlQRSkpOworICAgICAgICBjb250aW51ZTsKKyAgICAgIH0KKworICAgICAgY29tbWl0LmFkZChjYW5NZXJnZUZsYWcpOworICAgICAgdG9NZXJnZS5wdXQoc3VibWl0VHlwZSwgY29tbWl0KTsKKyAgICAgIHRvU3VibWl0LnB1dChzdWJtaXRUeXBlLCBjaGcpOwogICAgIH0KKyAgICByZXR1cm4gdG9TdWJtaXQ7CiAgIH0KIAotICBwcml2YXRlIHZvaWQgcmVkdWNlVG9NaW5pbWFsTWVyZ2UoKSB0aHJvd3MgTWVyZ2VFeGNlcHRpb24gewotICAgIGZpbmFsIENvbGxlY3Rpb248Q29kZVJldmlld0NvbW1pdD4gaGVhZHM7CisgIHByaXZhdGUgU3VibWl0VHlwZSBnZXRTdWJtaXRUeXBlKGZpbmFsIENoYW5nZSBjaGFuZ2UsIGZpbmFsIFBhdGNoU2V0IHBzKSB7CiAgICAgdHJ5IHsKLSAgICAgIGhlYWRzID0gbmV3IE1lcmdlU29ydGVyKHJ3LCBhbHJlYWR5QWNjZXB0ZWQsIENBTl9NRVJHRSkuc29ydCh0b01lcmdlKTsKLSAgICB9IGNhdGNoIChJT0V4Y2VwdGlvbiBlKSB7Ci0gICAgICB0aHJvdyBuZXcgTWVyZ2VFeGNlcHRpb24oIkJyYW5jaCBoZWFkIHNvcnRpbmcgZmFpbGVkIiwgZSk7Ci0gICAgfQotCi0gICAgdG9NZXJnZS5jbGVhcigpOwotICAgIHRvTWVyZ2UuYWRkQWxsKGhlYWRzKTsKLSAgICBDb2xsZWN0aW9ucy5zb3J0KHRvTWVyZ2UsIG5ldyBDb21wYXJhdG9yPENvZGVSZXZpZXdDb21taXQ+KCkgewotICAgICAgcHVibGljIGludCBjb21wYXJlKGZpbmFsIENvZGVSZXZpZXdDb21taXQgYSwgZmluYWwgQ29kZVJldmlld0NvbW1pdCBiKSB7Ci0gICAgICAgIHJldHVybiBhLm9yaWdpbmFsT3JkZXIgLSBiLm9yaWdpbmFsT3JkZXI7CisgICAgICBmaW5hbCBTdWJtaXRUeXBlUmVjb3JkIHIgPQorICAgICAgICAgIGNoYW5nZUNvbnRyb2xGYWN0b3J5LmNvbnRyb2xGb3IoY2hhbmdlLAorICAgICAgICAgICAgICBpZGVudGlmaWVkVXNlckZhY3RvcnkuY3JlYXRlKGNoYW5nZS5nZXRPd25lcigpKSkKKyAgICAgICAgICAgICAgLmdldFN1Ym1pdFR5cGVSZWNvcmQoZGIsIHBzKTsKKyAgICAgIGlmIChyLnN0YXR1cyAhPSBTdWJtaXRUeXBlUmVjb3JkLlN0YXR1cy5PSykgeworICAgICAgICBsb2cuZXJyb3IoIkZhaWxlZCB0byBnZXQgc3VibWl0IHR5cGUgZm9yICIgKyBjaGFuZ2UuZ2V0S2V5KCkpOworICAgICAgICByZXR1cm4gbnVsbDsKICAgICAgIH0KLSAgICB9KTsKLSAgfQotCi0gIHByaXZhdGUgdm9pZCBtZXJnZVRvcGljcygpIHRocm93cyBNZXJnZUV4Y2VwdGlvbiB7Ci0gICAgLy8gVGFrZSB0aGUgZmlyc3QgZmFzdC1mb3J3YXJkIGF2YWlsYWJsZSwgaWYgYW55IGlzIGF2YWlsYWJsZSBpbiB0aGUgc2V0LgotICAgIC8vCi0gICAgaWYgKGRlc3RQcm9qZWN0LmdldFN1Ym1pdFR5cGUoKSAhPSBQcm9qZWN0LlN1Ym1pdFR5cGUuTUVSR0VfQUxXQVlTKSB7Ci0gICAgICBmb3IgKGZpbmFsIEl0ZXJhdG9yPENvZGVSZXZpZXdDb21taXQ+IGkgPSB0b01lcmdlLml0ZXJhdG9yKCk7IGkuaGFzTmV4dCgpOykgewotICAgICAgICB0cnkgewotICAgICAgICAgIGZpbmFsIENvZGVSZXZpZXdDb21taXQgbiA9IGkubmV4dCgpOwotICAgICAgICAgIGlmIChtZXJnZVRpcCA9PSBudWxsIHx8IHJ3LmlzTWVyZ2VkSW50byhtZXJnZVRpcCwgbikpIHsKLSAgICAgICAgICAgIG1lcmdlVGlwID0gbjsKLSAgICAgICAgICAgIGkucmVtb3ZlKCk7Ci0gICAgICAgICAgICBicmVhazsKLSAgICAgICAgICB9Ci0gICAgICAgIH0gY2F0Y2ggKElPRXhjZXB0aW9uIGUpIHsKLSAgICAgICAgICB0aHJvdyBuZXcgTWVyZ2VFeGNlcHRpb24oIkNhbm5vdCBmYXN0LWZvcndhcmQgdGVzdCBkdXJpbmcgbWVyZ2UiLCBlKTsKLSAgICAgICAgfQotICAgICAgfQotICAgIH0KLQotICAgIGlmIChkZXN0UHJvamVjdC5nZXRTdWJtaXRUeXBlKCkgPT0gUHJvamVjdC5TdWJtaXRUeXBlLkZBU1RfRk9SV0FSRF9PTkxZKSB7Ci0gICAgICAvLyBJZiB0aGlzIHByb2plY3Qgb25seSBwZXJtaXRzIGZhc3QtZm9yd2FyZHMsIGFib3J0IGV2ZXJ5dGhpbmcgZWxzZS4KLSAgICAgIC8vCi0gICAgICB3aGlsZSAoIXRvTWVyZ2UuaXNFbXB0eSgpKSB7Ci0gICAgICAgIGZpbmFsIENvZGVSZXZpZXdDb21taXQgbiA9IHRvTWVyZ2UucmVtb3ZlKDApOwotICAgICAgICBuLnN0YXR1c0NvZGUgPSBDb21taXRNZXJnZVN0YXR1cy5OT1RfRkFTVF9GT1JXQVJEOwotICAgICAgfQotCi0gICAgfSBlbHNlIHsKLSAgICAgIC8vIEZvciBldmVyeSBvdGhlciBjb21taXQgZG8gYSBwYWlyLXdpc2UgbWVyZ2UuCi0gICAgICAvLwotICAgICAgd2hpbGUgKCF0b01lcmdlLmlzRW1wdHkoKSkgewotICAgICAgICBtZXJnZU9uZUNvbW1pdCh0b01lcmdlLnJlbW92ZSgwKSk7Ci0gICAgICB9CisgICAgICByZXR1cm4gci50eXBlOworICAgIH0gY2F0Y2ggKE5vU3VjaENoYW5nZUV4Y2VwdGlvbiBlKSB7CisgICAgICBsb2cuZXJyb3IoIkZhaWxlZCB0byBnZXQgc3VibWl0IHR5cGUgZm9yICIgKyBjaGFuZ2UuZ2V0S2V5KCksIGUpOworICAgICAgcmV0dXJuIG51bGw7CiAgICAgfQogICB9CiAKLSAgcHJpdmF0ZSB2b2lkIG1lcmdlT25lQ29tbWl0KGZpbmFsIENvZGVSZXZpZXdDb21taXQgbikgdGhyb3dzIE1lcmdlRXhjZXB0aW9uIHsKLSAgICBmaW5hbCBUaHJlZVdheU1lcmdlciBtID0gbmV3VGhyZWVXYXlNZXJnZXIoKTsKLSAgICB0cnkgewotICAgICAgaWYgKG0ubWVyZ2UobmV3IEFueU9iamVjdElkW10ge21lcmdlVGlwLCBufSkpIHsKLSAgICAgICAgd3JpdGVNZXJnZUNvbW1pdChtLmdldFJlc3VsdFRyZWVJZCgpLCBuKTsKLQotICAgICAgfSBlbHNlIHsKLSAgICAgICAgZmFpbGVkKG4sIENvbW1pdE1lcmdlU3RhdHVzLlBBVEhfQ09ORkxJQ1QpOwotICAgICAgfQotICAgIH0gY2F0Y2ggKElPRXhjZXB0aW9uIGUpIHsKLSAgICAgIGlmIChlLmdldE1lc3NhZ2UoKS5zdGFydHNXaXRoKCJNdWx0aXBsZSBtZXJnZSBiYXNlcyBmb3IiKSkgewotICAgICAgICB0cnkgewotICAgICAgICAgIGZhaWxlZChuLCBDb21taXRNZXJnZVN0YXR1cy5DUklTU19DUk9TU19NRVJHRSk7Ci0gICAgICAgIH0gY2F0Y2ggKElPRXhjZXB0aW9uIGUyKSB7Ci0gICAgICAgICAgdGhyb3cgbmV3IE1lcmdlRXhjZXB0aW9uKCJDYW5ub3QgbWVyZ2UgIiArIG4ubmFtZSgpLCBlKTsKLSAgICAgICAgfQotICAgICAgfSBlbHNlIHsKLSAgICAgICAgdGhyb3cgbmV3IE1lcmdlRXhjZXB0aW9uKCJDYW5ub3QgbWVyZ2UgIiArIG4ubmFtZSgpLCBlKTsKLSAgICAgIH0KLSAgICB9Ci0gIH0KLQotICBwcml2YXRlIFRocmVlV2F5TWVyZ2VyIG5ld1RocmVlV2F5TWVyZ2VyKCkgewotICAgIFRocmVlV2F5TWVyZ2VyIG07Ci0gICAgaWYgKGRlc3RQcm9qZWN0LmlzVXNlQ29udGVudE1lcmdlKCkpIHsKLSAgICAgIC8vIFNldHRpbmdzIGZvciB0aGlzIHByb2plY3QgYWxsb3cgdXMgdG8gdHJ5IGFuZAotICAgICAgLy8gYXV0b21hdGljYWxseSByZXNvbHZlIGNvbmZsaWN0cyB3aXRoaW4gZmlsZXMgaWYgbmVlZGVkLgotICAgICAgLy8gVXNlIFJlc29sdmVNZXJnZSBhbmQgaW5zdHJ1Y3QgdG8gb3BlcmF0ZSBpbiBjb3JlLgotICAgICAgbSA9IE1lcmdlU3RyYXRlZ3kuUkVTT0xWRS5uZXdNZXJnZXIocmVwbywgdHJ1ZSk7Ci0gICAgfSBlbHNlIHsKLSAgICAgIC8vIE5vIGF1dG8gY29uZmxpY3QgcmVzb2x2aW5nIGFsbG93ZWQuIElmIGFueSBvZiB0aGUKLSAgICAgIC8vIGFmZmVjdGVkIGZpbGVzIHdhcyBtb2RpZmllZCwgbWVyZ2Ugd2lsbCBmYWlsLgotICAgICAgbSA9IE1lcmdlU3RyYXRlZ3kuU0lNUExFX1RXT19XQVlfSU5fQ09SRS5uZXdNZXJnZXIocmVwbyk7Ci0gICAgfQotICAgIG0uc2V0T2JqZWN0SW5zZXJ0ZXIobmV3IE9iamVjdEluc2VydGVyLkZpbHRlcigpIHsKLSAgICAgIEBPdmVycmlkZQotICAgICAgcHJvdGVjdGVkIE9iamVjdEluc2VydGVyIGRlbGVnYXRlKCkgewotICAgICAgICByZXR1cm4gaW5zZXJ0ZXI7Ci0gICAgICB9Ci0KLSAgICAgIEBPdmVycmlkZQotICAgICAgcHVibGljIHZvaWQgZmx1c2goKSB7Ci0gICAgICB9Ci0KLSAgICAgIEBPdmVycmlkZQotICAgICAgcHVibGljIHZvaWQgcmVsZWFzZSgpIHsKLSAgICAgIH0KLSAgICB9KTsKLSAgICByZXR1cm4gbTsKLSAgfQotCi0gIHByaXZhdGUgQ29kZVJldmlld0NvbW1pdCBmYWlsZWQoZmluYWwgQ29kZVJldmlld0NvbW1pdCBuLAotICAgICAgZmluYWwgQ29tbWl0TWVyZ2VTdGF0dXMgZmFpbHVyZSkgdGhyb3dzIE1pc3NpbmdPYmplY3RFeGNlcHRpb24sCi0gICAgICBJbmNvcnJlY3RPYmplY3RUeXBlRXhjZXB0aW9uLCBJT0V4Y2VwdGlvbiB7Ci0gICAgcncucmVzZXQoKTsKLSAgICBydy5tYXJrU3RhcnQobik7Ci0gICAgcncubWFya1VuaW50ZXJlc3RpbmcobWVyZ2VUaXApOwotICAgIENvZGVSZXZpZXdDb21taXQgZmFpbGVkOwotICAgIHdoaWxlICgoZmFpbGVkID0gKENvZGVSZXZpZXdDb21taXQpIHJ3Lm5leHQoKSkgIT0gbnVsbCkgewotICAgICAgZmFpbGVkLnN0YXR1c0NvZGUgPSBmYWlsdXJlOwotICAgIH0KLSAgICByZXR1cm4gZmFpbGVkOwotICB9Ci0KLSAgcHJpdmF0ZSB2b2lkIHdyaXRlTWVyZ2VDb21taXQoT2JqZWN0SWQgdHJlZUlkLCBDb2RlUmV2aWV3Q29tbWl0IG4pCi0gICAgICB0aHJvd3MgSU9FeGNlcHRpb24sIE1pc3NpbmdPYmplY3RFeGNlcHRpb24sIEluY29ycmVjdE9iamVjdFR5cGVFeGNlcHRpb24gewotICAgIGZpbmFsIExpc3Q8Q29kZVJldmlld0NvbW1pdD4gbWVyZ2VkID0gbmV3IEFycmF5TGlzdDxDb2RlUmV2aWV3Q29tbWl0PigpOwotICAgIHJ3LnJlc2V0KCk7Ci0gICAgcncubWFya1N0YXJ0KG4pOwotICAgIHJ3Lm1hcmtVbmludGVyZXN0aW5nKG1lcmdlVGlwKTsKLSAgICBmb3IgKGZpbmFsIFJldkNvbW1pdCBjIDogcncpIHsKLSAgICAgIGZpbmFsIENvZGVSZXZpZXdDb21taXQgY3JjID0gKENvZGVSZXZpZXdDb21taXQpIGM7Ci0gICAgICBpZiAoY3JjLnBhdGNoc2V0SWQgIT0gbnVsbCkgewotICAgICAgICBtZXJnZWQuYWRkKGNyYyk7Ci0gICAgICB9Ci0gICAgfQotCi0gICAgZmluYWwgU3RyaW5nQnVpbGRlciBtc2didWYgPSBuZXcgU3RyaW5nQnVpbGRlcigpOwotICAgIGlmIChtZXJnZWQuc2l6ZSgpID09IDEpIHsKLSAgICAgIGZpbmFsIENvZGVSZXZpZXdDb21taXQgYyA9IG1lcmdlZC5nZXQoMCk7Ci0gICAgICBydy5wYXJzZUJvZHkoYyk7Ci0gICAgICBtc2didWYuYXBwZW5kKCJNZXJnZSBcIiIpOwotICAgICAgbXNnYnVmLmFwcGVuZChjLmdldFNob3J0TWVzc2FnZSgpKTsKLSAgICAgIG1zZ2J1Zi5hcHBlbmQoIlwiIik7Ci0KLSAgICB9IGVsc2UgewotICAgICAgbXNnYnVmLmFwcGVuZCgiTWVyZ2UgY2hhbmdlcyAiKTsKLSAgICAgIGZvciAoZmluYWwgSXRlcmF0b3I8Q29kZVJldmlld0NvbW1pdD4gaSA9IG1lcmdlZC5pdGVyYXRvcigpOyBpLmhhc05leHQoKTspIHsKLSAgICAgICAgbXNnYnVmLmFwcGVuZChpLm5leHQoKS5jaGFuZ2UuZ2V0S2V5KCkuYWJicmV2aWF0ZSgpKTsKLSAgICAgICAgaWYgKGkuaGFzTmV4dCgpKSB7Ci0gICAgICAgICAgbXNnYnVmLmFwcGVuZCgnLCcpOwotICAgICAgICB9Ci0gICAgICB9Ci0gICAgfQotCi0gICAgaWYgKCFSX0hFQURTX01BU1RFUi5lcXVhbHMoZGVzdEJyYW5jaC5nZXQoKSkpIHsKLSAgICAgIG1zZ2J1Zi5hcHBlbmQoIiBpbnRvICIpOwotICAgICAgbXNnYnVmLmFwcGVuZChkZXN0QnJhbmNoLmdldFNob3J0TmFtZSgpKTsKLSAgICB9Ci0KLSAgICBpZiAobWVyZ2VkLnNpemUoKSA+IDEpIHsKLSAgICAgIG1zZ2J1Zi5hcHBlbmQoIlxuXG4qIGNoYW5nZXM6XG4iKTsKLSAgICAgIGZvciAoZmluYWwgQ29kZVJldmlld0NvbW1pdCBjIDogbWVyZ2VkKSB7Ci0gICAgICAgIHJ3LnBhcnNlQm9keShjKTsKLSAgICAgICAgbXNnYnVmLmFwcGVuZCgiICAiKTsKLSAgICAgICAgbXNnYnVmLmFwcGVuZChjLmdldFNob3J0TWVzc2FnZSgpKTsKLSAgICAgICAgbXNnYnVmLmFwcGVuZCgiXG4iKTsKLSAgICAgIH0KLSAgICB9Ci0KLSAgICBQZXJzb25JZGVudCBhdXRob3JJZGVudCA9IGNvbXB1dGVBdXRob3IobWVyZ2VkKTsKLQotICAgIGZpbmFsIENvbW1pdEJ1aWxkZXIgbWVyZ2VDb21taXQgPSBuZXcgQ29tbWl0QnVpbGRlcigpOwotICAgIG1lcmdlQ29tbWl0LnNldFRyZWVJZCh0cmVlSWQpOwotICAgIG1lcmdlQ29tbWl0LnNldFBhcmVudElkcyhtZXJnZVRpcCwgbik7Ci0gICAgbWVyZ2VDb21taXQuc2V0QXV0aG9yKGF1dGhvcklkZW50KTsKLSAgICBtZXJnZUNvbW1pdC5zZXRDb21taXR0ZXIobXlJZGVudCk7Ci0gICAgbWVyZ2VDb21taXQuc2V0TWVzc2FnZShtc2didWYudG9TdHJpbmcoKSk7Ci0KLSAgICBtZXJnZVRpcCA9IChDb2RlUmV2aWV3Q29tbWl0KSBydy5wYXJzZUNvbW1pdChjb21taXQobWVyZ2VDb21taXQpKTsKLSAgfQotCi0gIHByaXZhdGUgUGVyc29uSWRlbnQgY29tcHV0ZUF1dGhvcigKLSAgICAgIGZpbmFsIExpc3Q8Q29kZVJldmlld0NvbW1pdD4gY29kZVJldmlld0NvbW1pdHMpIHsKLSAgICBQYXRjaFNldEFwcHJvdmFsIHN1Ym1pdHRlciA9IG51bGw7Ci0gICAgZm9yIChmaW5hbCBDb2RlUmV2aWV3Q29tbWl0IGMgOiBjb2RlUmV2aWV3Q29tbWl0cykgewotICAgICAgUGF0Y2hTZXRBcHByb3ZhbCBzID0gZ2V0U3VibWl0dGVyKGRiLCBjLnBhdGNoc2V0SWQpOwotICAgICAgaWYgKHN1Ym1pdHRlciA9PSBudWxsCi0gICAgICAgICAgfHwgKHMgIT0gbnVsbCAmJiBzLmdldEdyYW50ZWQoKS5jb21wYXJlVG8oc3VibWl0dGVyLmdldEdyYW50ZWQoKSkgPiAwKSkgewotICAgICAgICBzdWJtaXR0ZXIgPSBzOwotICAgICAgfQotICAgIH0KLQotICAgIC8vIFRyeSB0byB1c2UgdGhlIHN1Ym1pdHRlcidzIGlkZW50aXR5IGZvciB0aGUgbWVyZ2UgY29tbWl0IGF1dGhvci4KLSAgICAvLyBJZiBhbGwgb2YgdGhlIGNvbW1pdHMgYmVpbmcgbWVyZ2VkIGFyZSBjcmVhdGVkIGJ5IHRoZSBzdWJtaXR0ZXIsCi0gICAgLy8gcHJlZmVyIHRoZSBpZGVudGl0eSBsaW5lIHRoZXkgdXNlZCBpbiB0aGUgY29tbWl0cyByYXRoZXIgdGhhbiB0aGUKLSAgICAvLyBwcmVmZXJyZWQgaWRlbnRpdHkgc3RvcmVkIGluIHRoZSB1c2VyIGFjY291bnQuIFRoaXMgd2F5IHRoZSBHaXQKLSAgICAvLyBjb21taXQgcmVjb3JkcyBhcmUgbW9yZSBjb25zaXN0ZW50IGludGVybmFsbHkuCi0gICAgLy8KLSAgICBQZXJzb25JZGVudCBhdXRob3JJZGVudDsKLSAgICBpZiAoc3VibWl0dGVyICE9IG51bGwpIHsKLSAgICAgIElkZW50aWZpZWRVc2VyIHdobyA9Ci0gICAgICAgICAgaWRlbnRpZmllZFVzZXJGYWN0b3J5LmNyZWF0ZShzdWJtaXR0ZXIuZ2V0QWNjb3VudElkKCkpOwotICAgICAgU2V0PFN0cmluZz4gZW1haWxzID0gbmV3IEhhc2hTZXQ8U3RyaW5nPigpOwotICAgICAgZm9yIChSZXZDb21taXQgYyA6IGNvZGVSZXZpZXdDb21taXRzKSB7Ci0gICAgICAgIHRyeSB7Ci0gICAgICAgICAgcncucGFyc2VCb2R5KGMpOwotICAgICAgICB9IGNhdGNoIChJT0V4Y2VwdGlvbiBlKSB7Ci0gICAgICAgICAgbG9nLndhcm4oIkNhbm5vdCBwYXJzZSBjb21taXQgIiArIGMubmFtZSgpICsgIiBpbiAiICsgZGVzdEJyYW5jaCwgZSk7Ci0gICAgICAgICAgY29udGludWU7Ci0gICAgICAgIH0KLSAgICAgICAgZW1haWxzLmFkZChjLmdldEF1dGhvcklkZW50KCkuZ2V0RW1haWxBZGRyZXNzKCkpOwotICAgICAgfQotCi0gICAgICBmaW5hbCBUaW1lc3RhbXAgZHQgPSBzdWJtaXR0ZXIuZ2V0R3JhbnRlZCgpOwotICAgICAgZmluYWwgVGltZVpvbmUgdHogPSBteUlkZW50LmdldFRpbWVab25lKCk7Ci0gICAgICBpZiAoZW1haWxzLnNpemUoKSA9PSAxCi0gICAgICAgICAgJiYgd2hvLmdldEVtYWlsQWRkcmVzc2VzKCkuY29udGFpbnMoZW1haWxzLml0ZXJhdG9yKCkubmV4dCgpKSkgewotICAgICAgICBhdXRob3JJZGVudCA9Ci0gICAgICAgICAgICBuZXcgUGVyc29uSWRlbnQoY29kZVJldmlld0NvbW1pdHMuZ2V0KDApLmdldEF1dGhvcklkZW50KCksIGR0LCB0eik7Ci0gICAgICB9IGVsc2UgewotICAgICAgICBhdXRob3JJZGVudCA9IHdoby5uZXdDb21taXR0ZXJJZGVudChkdCwgdHopOwotICAgICAgfQotICAgIH0gZWxzZSB7Ci0gICAgICBhdXRob3JJZGVudCA9IG15SWRlbnQ7Ci0gICAgfQotICAgIHJldHVybiBhdXRob3JJZGVudDsKLSAgfQotCi0gIHByaXZhdGUgdm9pZCBtYXJrQ2xlYW5NZXJnZXMoKSB0aHJvd3MgTWVyZ2VFeGNlcHRpb24gewotICAgIGlmIChtZXJnZVRpcCA9PSBudWxsKSB7Ci0gICAgICAvLyBJZiBtZXJnZVRpcCBpcyBudWxsIGhlcmUsIGJyYW5jaFRpcCB3YXMgbnVsbCwgaW5kaWNhdGluZyBhIG5ldyBicmFuY2gKLSAgICAgIC8vIGF0IHRoZSBzdGFydCBvZiB0aGUgbWVyZ2UgcHJvY2Vzcy4gV2UgYWxzbyBlbGVjdGVkIHRvIG1lcmdlIG5vdGhpbmcsCi0gICAgICAvLyBwcm9iYWJseSBkdWUgdG8gbWlzc2luZyBkZXBlbmRlbmNpZXMuIE5vdGhpbmcgd2FzIGNsZWFubHkgbWVyZ2VkLgotICAgICAgLy8KKyAgcHJpdmF0ZSB2b2lkIHVwZGF0ZUJyYW5jaChmaW5hbCBTdWJtaXRTdHJhdGVneSBzdHJhdGVneSwKKyAgICAgIGZpbmFsIFJlZlVwZGF0ZSBicmFuY2hVcGRhdGUpIHRocm93cyBNZXJnZUV4Y2VwdGlvbiB7CisgICAgaWYgKChicmFuY2hUaXAgPT0gbnVsbCAmJiBtZXJnZVRpcCA9PSBudWxsKSB8fCBicmFuY2hUaXAgPT0gbWVyZ2VUaXApIHsKKyAgICAgIC8vIG5vdGhpbmcgdG8gZG8KICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICB0cnkgewotICAgICAgcncucmVzZXQoKTsKLSAgICAgIHJ3LnNvcnQoUmV2U29ydC5UT1BPKTsKLSAgICAgIHJ3LnNvcnQoUmV2U29ydC5SRVZFUlNFLCB0cnVlKTsKLSAgICAgIHJ3Lm1hcmtTdGFydChtZXJnZVRpcCk7Ci0gICAgICBmb3IgKFJldkNvbW1pdCBjIDogYWxyZWFkeUFjY2VwdGVkKSB7Ci0gICAgICAgIHJ3Lm1hcmtVbmludGVyZXN0aW5nKGMpOwotICAgICAgfQotCi0gICAgICBDb2RlUmV2aWV3Q29tbWl0IGM7Ci0gICAgICB3aGlsZSAoKGMgPSAoQ29kZVJldmlld0NvbW1pdCkgcncubmV4dCgpKSAhPSBudWxsKSB7Ci0gICAgICAgIGlmIChjLnBhdGNoc2V0SWQgIT0gbnVsbCkgewotICAgICAgICAgIGMuc3RhdHVzQ29kZSA9IENvbW1pdE1lcmdlU3RhdHVzLkNMRUFOX01FUkdFOwotICAgICAgICAgIGlmIChicmFuY2hVcGRhdGUuZ2V0UmVmTG9nSWRlbnQoKSA9PSBudWxsKSB7Ci0gICAgICAgICAgICBzZXRSZWZMb2dJZGVudChnZXRTdWJtaXR0ZXIoZGIsIGMucGF0Y2hzZXRJZCkpOwotICAgICAgICAgIH0KLSAgICAgICAgfQotICAgICAgfQotICAgIH0gY2F0Y2ggKElPRXhjZXB0aW9uIGUpIHsKLSAgICAgIHRocm93IG5ldyBNZXJnZUV4Y2VwdGlvbigiQ2Fubm90IG1hcmsgY2xlYW4gbWVyZ2VzIiwgZSk7Ci0gICAgfQotICB9Ci0KLSAgcHJpdmF0ZSB2b2lkIHNldFJlZkxvZ0lkZW50KGZpbmFsIFBhdGNoU2V0QXBwcm92YWwgc3VibWl0QXVkaXQpIHsKLSAgICBpZiAoc3VibWl0QXVkaXQgIT0gbnVsbCkgewotICAgICAgYnJhbmNoVXBkYXRlLnNldFJlZkxvZ0lkZW50KGlkZW50aWZpZWRVc2VyRmFjdG9yeS5jcmVhdGUoCi0gICAgICAgICAgc3VibWl0QXVkaXQuZ2V0QWNjb3VudElkKCkpLm5ld1JlZkxvZ0lkZW50KCkpOwotICAgIH0KLSAgfQotCi0gIHByaXZhdGUgdm9pZCBjaGVycnlQaWNrQ2hhbmdlcygpIHRocm93cyBNZXJnZUV4Y2VwdGlvbiwgT3JtRXhjZXB0aW9uIHsKLSAgICB3aGlsZSAoIXRvTWVyZ2UuaXNFbXB0eSgpKSB7Ci0gICAgICBmaW5hbCBDb2RlUmV2aWV3Q29tbWl0IG4gPSB0b01lcmdlLnJlbW92ZSgwKTsKLSAgICAgIGZpbmFsIFRocmVlV2F5TWVyZ2VyIG0gPSBuZXdUaHJlZVdheU1lcmdlcigpOwotICAgICAgdHJ5IHsKLSAgICAgICAgaWYgKG1lcmdlVGlwID09IG51bGwpIHsKLSAgICAgICAgICAvLyBUaGUgYnJhbmNoIGlzIHVuYm9ybi4gVGFrZSBhIGZhc3QtZm9yd2FyZCByZXNvbHV0aW9uIHRvCi0gICAgICAgICAgLy8gY3JlYXRlIHRoZSBicmFuY2guCi0gICAgICAgICAgLy8KLSAgICAgICAgICBtZXJnZVRpcCA9IG47Ci0gICAgICAgICAgbi5zdGF0dXNDb2RlID0gQ29tbWl0TWVyZ2VTdGF0dXMuQ0xFQU5fTUVSR0U7Ci0KLSAgICAgICAgfSBlbHNlIGlmIChuLmdldFBhcmVudENvdW50KCkgPT0gMCkgewotICAgICAgICAgIC8vIFJlZnVzZSB0byBtZXJnZSBhIHJvb3QgY29tbWl0IGludG8gYW4gZXhpc3RpbmcgYnJhbmNoLAotICAgICAgICAgIC8vIHdlIGNhbm5vdCBvYnRhaW4gYSBkZWx0YSBmb3IgdGhlIGNoZXJyeS1waWNrIHRvIGFwcGx5LgotICAgICAgICAgIC8vCi0gICAgICAgICAgbi5zdGF0dXNDb2RlID0gQ29tbWl0TWVyZ2VTdGF0dXMuQ0FOTk9UX0NIRVJSWV9QSUNLX1JPT1Q7Ci0KLSAgICAgICAgfSBlbHNlIGlmIChuLmdldFBhcmVudENvdW50KCkgPT0gMSkgewotICAgICAgICAgIC8vIElmIHRoZXJlIGlzIG9ubHkgb25lIHBhcmVudCwgYSBjaGVycnktcGljayBjYW4gYmUgZG9uZSBieQotICAgICAgICAgIC8vIHRha2luZyB0aGUgZGVsdGEgcmVsYXRpdmUgdG8gdGhhdCBvbmUgcGFyZW50IGFuZCByZWRvaW5nCi0gICAgICAgICAgLy8gdGhhdCBvbiB0aGUgY3VycmVudCBtZXJnZSB0aXAuCi0gICAgICAgICAgLy8KLSAgICAgICAgICBtLnNldEJhc2Uobi5nZXRQYXJlbnQoMCkpOwotICAgICAgICAgIGlmIChtLm1lcmdlKG1lcmdlVGlwLCBuKSkgewotICAgICAgICAgICAgd3JpdGVDaGVycnlQaWNrQ29tbWl0KG0sIG4pOwotCi0gICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIG4uc3RhdHVzQ29kZSA9IENvbW1pdE1lcmdlU3RhdHVzLlBBVEhfQ09ORkxJQ1Q7Ci0gICAgICAgICAgfQotCi0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgLy8gVGhlcmUgYXJlIG11bHRpcGxlIHBhcmVudHMsIHNvIHRoaXMgaXMgYSBtZXJnZSBjb21taXQuIFdlCi0gICAgICAgICAgLy8gZG9uJ3Qgd2FudCB0byBjaGVycnktcGljayB0aGUgbWVyZ2UgYXMgY2xpZW50cyBjYW4ndCBlYXNpbHkKLSAgICAgICAgICAvLyByZWJhc2UgdGhlaXIgaGlzdG9yeSB3aXRoIHRoYXQgbWVyZ2UgcHJlc2VudCBhbmQgcmVwbGFjZWQKLSAgICAgICAgICAvLyBieSBhbiBlcXVpdmFsZW50IG1lcmdlIHdpdGggYSBkaWZmZXJlbnQgZmlyc3QgcGFyZW50LiBTbwotICAgICAgICAgIC8vIGluc3RlYWQgYmVoYXZlIGFzIHRob3VnaCBNRVJHRV9JRl9ORUNFU1NBUlkgd2FzIGNvbmZpZ3VyZWQuCi0gICAgICAgICAgLy8KLSAgICAgICAgICBpZiAoaGFzRGVwZW5kZW5jaWVzTWV0KG4pKSB7Ci0gICAgICAgICAgICBpZiAocncuaXNNZXJnZWRJbnRvKG1lcmdlVGlwLCBuKSkgewotICAgICAgICAgICAgICBtZXJnZVRpcCA9IG47Ci0gICAgICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgICBtZXJnZU9uZUNvbW1pdChuKTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIG1hcmtDbGVhbk1lcmdlcygpOwotCi0gICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIC8vIE9uZSBvciBtb3JlIGRlcGVuZGVuY2llcyB3ZXJlIG5vdCBtZXQuIFRoZSBzdGF0dXMgd2FzCi0gICAgICAgICAgICAvLyBhbHJlYWR5IG1hcmtlZCBvbiB0aGUgY29tbWl0IHNvIHdlIGhhdmUgbm90aGluZyBmdXJ0aGVyCi0gICAgICAgICAgICAvLyB0byBwZXJmb3JtIGF0IHRoaXMgdGltZS4KLSAgICAgICAgICAgIC8vCi0gICAgICAgICAgfQotICAgICAgICB9Ci0KLSAgICAgIH0gY2F0Y2ggKElPRXhjZXB0aW9uIGUpIHsKLSAgICAgICAgdGhyb3cgbmV3IE1lcmdlRXhjZXB0aW9uKCJDYW5ub3QgbWVyZ2UgIiArIG4ubmFtZSgpLCBlKTsKLSAgICAgIH0KLSAgICB9Ci0gIH0KLQotICBwcml2YXRlIGJvb2xlYW4gaGFzRGVwZW5kZW5jaWVzTWV0KGZpbmFsIENvZGVSZXZpZXdDb21taXQgbikKLSAgICAgIHRocm93cyBJT0V4Y2VwdGlvbiB7Ci0gICAgLy8gT2RkbHkgd2UgY2FuIGRldGVybWluZSB0aGlzIGJ5IHJ1bm5pbmcgdGhlIG1lcmdlIHNvcnRlciBhbmQKLSAgICAvLyBsb29rIGZvciB0aGUgb25lIGNvbW1pdCB0byBjb21lIG91dCBhcyBhIHJlc3VsdC4gVGhpcyB3b3JrcwotICAgIC8vIGFzIHRoZSBtZXJnZSBzb3J0ZXIgY2hlY2tzIHRoZSBkZXBlbmRlbmN5IGNoYWluIGFzIHBhcnQgb2YKLSAgICAvLyBpdHMgbG9naWMgdHJ5aW5nIHRvIGZpbmQgYSBtaW5pbWFsIG1lcmdlIHBhdGguCi0gICAgLy8KLSAgICByZXR1cm4gbmV3IE1lcmdlU29ydGVyKHJ3LCBhbHJlYWR5QWNjZXB0ZWQsIENBTl9NRVJHRSkuc29ydCgKLSAgICAgICAgQ29sbGVjdGlvbnMuc2luZ2xldG9uKG4pKS5jb250YWlucyhuKTsKLSAgfQotCi0gIHByaXZhdGUgdm9pZCB3cml0ZUNoZXJyeVBpY2tDb21taXQoZmluYWwgTWVyZ2VyIG0sIGZpbmFsIENvZGVSZXZpZXdDb21taXQgbikKLSAgICAgIHRocm93cyBJT0V4Y2VwdGlvbiwgT3JtRXhjZXB0aW9uIHsKLSAgICBydy5wYXJzZUJvZHkobik7Ci0KLSAgICBmaW5hbCBMaXN0PEZvb3RlckxpbmU+IGZvb3RlcnMgPSBuLmdldEZvb3RlckxpbmVzKCk7Ci0gICAgZmluYWwgU3RyaW5nQnVpbGRlciBtc2didWYgPSBuZXcgU3RyaW5nQnVpbGRlcigpOwotICAgIG1zZ2J1Zi5hcHBlbmQobi5nZXRGdWxsTWVzc2FnZSgpKTsKLQotICAgIGlmIChtc2didWYubGVuZ3RoKCkgPT0gMCkgewotICAgICAgLy8gV1RGLCBhbiBlbXB0eSBjb21taXQgbWVzc2FnZT8KLSAgICAgIG1zZ2J1Zi5hcHBlbmQoIjxubyBjb21taXQgbWVzc2FnZSBwcm92aWRlZD4iKTsKLSAgICB9Ci0gICAgaWYgKG1zZ2J1Zi5jaGFyQXQobXNnYnVmLmxlbmd0aCgpIC0gMSkgIT0gJ1xuJykgewotICAgICAgLy8gTWlzc2luZyBhIHRyYWlsaW5nIExGPyBDb3JyZWN0IGl0IChwZXJoYXBzIHRoZSBlZGl0b3Igd2FzIGJyb2tlbikuCi0gICAgICBtc2didWYuYXBwZW5kKCdcbicpOwotICAgIH0KLSAgICBpZiAoZm9vdGVycy5pc0VtcHR5KCkpIHsKLSAgICAgIC8vIERvZXNuJ3QgZW5kIGluIGEgIlNpZ25lZC1vZmYtYnk6IC4uLiIgc3R5bGUgbGluZT8gQWRkIGFub3RoZXIgbGluZQotICAgICAgLy8gYnJlYWsgdG8gc3RhcnQgYSBuZXcgcGFyYWdyYXBoIGZvciB0aGUgcmV2aWV3ZWQtYnkgdGFnIGxpbmVzLgotICAgICAgLy8KLSAgICAgIG1zZ2J1Zi5hcHBlbmQoJ1xuJyk7Ci0gICAgfQotCi0gICAgaWYgKCFjb250YWlucyhmb290ZXJzLCBDSEFOR0VfSUQsIG4uY2hhbmdlLmdldEtleSgpLmdldCgpKSkgewotICAgICAgbXNnYnVmLmFwcGVuZChDSEFOR0VfSUQuZ2V0TmFtZSgpKTsKLSAgICAgIG1zZ2J1Zi5hcHBlbmQoIjogIik7Ci0gICAgICBtc2didWYuYXBwZW5kKG4uY2hhbmdlLmdldEtleSgpLmdldCgpKTsKLSAgICAgIG1zZ2J1Zi5hcHBlbmQoJ1xuJyk7Ci0gICAgfQotCi0gICAgZmluYWwgU3RyaW5nIHNpdGVVcmwgPSB1cmxQcm92aWRlci5nZXQoKTsKLSAgICBpZiAoc2l0ZVVybCAhPSBudWxsKSB7Ci0gICAgICBmaW5hbCBTdHJpbmcgdXJsID0gc2l0ZVVybCArIG4ucGF0Y2hzZXRJZC5nZXRQYXJlbnRLZXkoKS5nZXQoKTsKLSAgICAgIGlmICghY29udGFpbnMoZm9vdGVycywgUkVWSUVXRURfT04sIHVybCkpIHsKLSAgICAgICAgbXNnYnVmLmFwcGVuZChSRVZJRVdFRF9PTi5nZXROYW1lKCkpOwotICAgICAgICBtc2didWYuYXBwZW5kKCI6ICIpOwotICAgICAgICBtc2didWYuYXBwZW5kKHVybCk7Ci0gICAgICAgIG1zZ2J1Zi5hcHBlbmQoJ1xuJyk7Ci0gICAgICB9Ci0gICAgfQotCi0gICAgUGF0Y2hTZXRBcHByb3ZhbCBzdWJtaXRBdWRpdCA9IG51bGw7Ci0gICAgTGlzdDxQYXRjaFNldEFwcHJvdmFsPiBhcHByb3ZhbExpc3QgPSBudWxsOwotICAgIHRyeSB7Ci0gICAgICBhcHByb3ZhbExpc3QgPQotICAgICAgICAgIGRiLnBhdGNoU2V0QXBwcm92YWxzKCkuYnlQYXRjaFNldChuLnBhdGNoc2V0SWQpLnRvTGlzdCgpOwotICAgICAgQ29sbGVjdGlvbnMuc29ydChhcHByb3ZhbExpc3QsIG5ldyBDb21wYXJhdG9yPFBhdGNoU2V0QXBwcm92YWw+KCkgewotICAgICAgICBwdWJsaWMgaW50IGNvbXBhcmUoZmluYWwgUGF0Y2hTZXRBcHByb3ZhbCBhLCBmaW5hbCBQYXRjaFNldEFwcHJvdmFsIGIpIHsKLSAgICAgICAgICByZXR1cm4gYS5nZXRHcmFudGVkKCkuY29tcGFyZVRvKGIuZ2V0R3JhbnRlZCgpKTsKLSAgICAgICAgfQotICAgICAgfSk7Ci0KLSAgICAgIGZvciAoZmluYWwgUGF0Y2hTZXRBcHByb3ZhbCBhIDogYXBwcm92YWxMaXN0KSB7Ci0gICAgICAgIGlmIChhLmdldFZhbHVlKCkgPD0gMCkgewotICAgICAgICAgIC8vIE5lZ2F0aXZlIHZvdGVzIGFyZW4ndCBjb3VudGVkLgotICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICB9Ci0KLSAgICAgICAgaWYgKEFwcHJvdmFsQ2F0ZWdvcnkuU1VCTUlULmVxdWFscyhhLmdldENhdGVnb3J5SWQoKSkpIHsKLSAgICAgICAgICAvLyBTdWJtaXQgaXMgdHJlYXRlZCBzcGVjaWFsbHksIGJlbG93IChiZWNvbWVzIGNvbW1pdHRlcikKLSAgICAgICAgICAvLwotICAgICAgICAgIGlmIChzdWJtaXRBdWRpdCA9PSBudWxsCi0gICAgICAgICAgICAgIHx8IGEuZ2V0R3JhbnRlZCgpLmNvbXBhcmVUbyhzdWJtaXRBdWRpdC5nZXRHcmFudGVkKCkpID4gMCkgewotICAgICAgICAgICAgc3VibWl0QXVkaXQgPSBhOwotICAgICAgICAgIH0KLSAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgfQotCi0gICAgICAgIGZpbmFsIEFjY291bnQgYWNjID0KLSAgICAgICAgICAgIGlkZW50aWZpZWRVc2VyRmFjdG9yeS5jcmVhdGUoYS5nZXRBY2NvdW50SWQoKSkuZ2V0QWNjb3VudCgpOwotICAgICAgICBmaW5hbCBTdHJpbmdCdWlsZGVyIGlkZW50YnVmID0gbmV3IFN0cmluZ0J1aWxkZXIoKTsKLSAgICAgICAgaWYgKGFjYy5nZXRGdWxsTmFtZSgpICE9IG51bGwgJiYgYWNjLmdldEZ1bGxOYW1lKCkubGVuZ3RoKCkgPiAwKSB7Ci0gICAgICAgICAgaWYgKGlkZW50YnVmLmxlbmd0aCgpID4gMCkgewotICAgICAgICAgICAgaWRlbnRidWYuYXBwZW5kKCcgJyk7Ci0gICAgICAgICAgfQotICAgICAgICAgIGlkZW50YnVmLmFwcGVuZChhY2MuZ2V0RnVsbE5hbWUoKSk7Ci0gICAgICAgIH0KLSAgICAgICAgaWYgKGFjYy5nZXRQcmVmZXJyZWRFbWFpbCgpICE9IG51bGwKLSAgICAgICAgICAgICYmIGFjYy5nZXRQcmVmZXJyZWRFbWFpbCgpLmxlbmd0aCgpID4gMCkgewotICAgICAgICAgIGlmIChpc1NpZ25lZE9mZkJ5KGZvb3RlcnMsIGFjYy5nZXRQcmVmZXJyZWRFbWFpbCgpKSkgewotICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgICAgfQotICAgICAgICAgIGlmIChpZGVudGJ1Zi5sZW5ndGgoKSA+IDApIHsKLSAgICAgICAgICAgIGlkZW50YnVmLmFwcGVuZCgnICcpOwotICAgICAgICAgIH0KLSAgICAgICAgICBpZGVudGJ1Zi5hcHBlbmQoJzwnKTsKLSAgICAgICAgICBpZGVudGJ1Zi5hcHBlbmQoYWNjLmdldFByZWZlcnJlZEVtYWlsKCkpOwotICAgICAgICAgIGlkZW50YnVmLmFwcGVuZCgnPicpOwotICAgICAgICB9Ci0gICAgICAgIGlmIChpZGVudGJ1Zi5sZW5ndGgoKSA9PSAwKSB7Ci0gICAgICAgICAgLy8gTm90aGluZyByZWFzb25hYmxlIHRvIGRlc2NyaWJlIHRoZW0gYnk/IElnbm9yZSB0aGVtLgotICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICB9Ci0KLSAgICAgICAgZmluYWwgU3RyaW5nIHRhZzsKLSAgICAgICAgaWYgKENSVlcuZXF1YWxzKGEuZ2V0Q2F0ZWdvcnlJZCgpKSkgewotICAgICAgICAgIHRhZyA9ICJSZXZpZXdlZC1ieSI7Ci0gICAgICAgIH0gZWxzZSBpZiAoVlJJRi5lcXVhbHMoYS5nZXRDYXRlZ29yeUlkKCkpKSB7Ci0gICAgICAgICAgdGFnID0gIlRlc3RlZC1ieSI7Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgZmluYWwgQXBwcm92YWxUeXBlIGF0ID0KLSAgICAgICAgICAgICAgYXBwcm92YWxUeXBlcy5ieUlkKGEuZ2V0Q2F0ZWdvcnlJZCgpKTsKLSAgICAgICAgICBpZiAoYXQgPT0gbnVsbCkgewotICAgICAgICAgICAgLy8gQSBkZXByZWNhdGVkL2RlbGV0ZWQgYXBwcm92YWwgdHlwZSwgaWdub3JlIGl0LgotICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgICAgfQotICAgICAgICAgIHRhZyA9IGF0LmdldENhdGVnb3J5KCkuZ2V0TmFtZSgpLnJlcGxhY2UoJyAnLCAnLScpOwotICAgICAgICB9Ci0KLSAgICAgICAgaWYgKCFjb250YWlucyhmb290ZXJzLCBuZXcgRm9vdGVyS2V5KHRhZyksIGlkZW50YnVmLnRvU3RyaW5nKCkpKSB7Ci0gICAgICAgICAgbXNnYnVmLmFwcGVuZCh0YWcpOwotICAgICAgICAgIG1zZ2J1Zi5hcHBlbmQoIjogIik7Ci0gICAgICAgICAgbXNnYnVmLmFwcGVuZChpZGVudGJ1Zik7Ci0gICAgICAgICAgbXNnYnVmLmFwcGVuZCgnXG4nKTsKLSAgICAgICAgfQotICAgICAgfQotICAgIH0gY2F0Y2ggKE9ybUV4Y2VwdGlvbiBlKSB7Ci0gICAgICBsb2cuZXJyb3IoIkNhbid0IHJlYWQgYXBwcm92YWwgcmVjb3JkcyBmb3IgIiArIG4ucGF0Y2hzZXRJZCwgZSk7Ci0gICAgfQotCi0gICAgZmluYWwgQ29tbWl0QnVpbGRlciBtZXJnZUNvbW1pdCA9IG5ldyBDb21taXRCdWlsZGVyKCk7Ci0gICAgbWVyZ2VDb21taXQuc2V0VHJlZUlkKG0uZ2V0UmVzdWx0VHJlZUlkKCkpOwotICAgIG1lcmdlQ29tbWl0LnNldFBhcmVudElkKG1lcmdlVGlwKTsKLSAgICBtZXJnZUNvbW1pdC5zZXRBdXRob3Iobi5nZXRBdXRob3JJZGVudCgpKTsKLSAgICBtZXJnZUNvbW1pdC5zZXRDb21taXR0ZXIodG9Db21taXR0ZXJJZGVudChzdWJtaXRBdWRpdCkpOwotICAgIG1lcmdlQ29tbWl0LnNldE1lc3NhZ2UobXNnYnVmLnRvU3RyaW5nKCkpOwotCi0gICAgZmluYWwgT2JqZWN0SWQgaWQgPSBjb21taXQobWVyZ2VDb21taXQpOwotICAgIGZpbmFsIENvZGVSZXZpZXdDb21taXQgbmV3Q29tbWl0ID0gKENvZGVSZXZpZXdDb21taXQpIHJ3LnBhcnNlQ29tbWl0KGlkKTsKLSAgICBmaW5hbCBDaGFuZ2Ugb2xkQ2hhbmdlID0gbi5jaGFuZ2U7Ci0KLSAgICBuLmNoYW5nZSA9Ci0gICAgICAgIGRiLmNoYW5nZXMoKS5hdG9taWNVcGRhdGUobi5jaGFuZ2UuZ2V0SWQoKSwKLSAgICAgICAgICAgIG5ldyBBdG9taWNVcGRhdGU8Q2hhbmdlPigpIHsKLSAgICAgICAgICAgICAgQE92ZXJyaWRlCi0gICAgICAgICAgICAgIHB1YmxpYyBDaGFuZ2UgdXBkYXRlKENoYW5nZSBjaGFuZ2UpIHsKLSAgICAgICAgICAgICAgICBjaGFuZ2UubmV4dFBhdGNoU2V0SWQoKTsKLSAgICAgICAgICAgICAgICByZXR1cm4gY2hhbmdlOwotICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICB9KTsKLQotICAgIGZpbmFsIFBhdGNoU2V0IHBzID0gbmV3IFBhdGNoU2V0KG4uY2hhbmdlLmN1cnJQYXRjaFNldElkKCkpOwotICAgIHBzLnNldENyZWF0ZWRPbihuZXcgVGltZXN0YW1wKFN5c3RlbS5jdXJyZW50VGltZU1pbGxpcygpKSk7Ci0gICAgcHMuc2V0VXBsb2FkZXIoc3VibWl0QXVkaXQuZ2V0QWNjb3VudElkKCkpOwotICAgIHBzLnNldFJldmlzaW9uKG5ldyBSZXZJZChpZC5nZXROYW1lKCkpKTsKLSAgICBpbnNlcnRBbmNlc3RvcnMocHMuZ2V0SWQoKSwgbmV3Q29tbWl0KTsKLSAgICBkYi5wYXRjaFNldHMoKS5pbnNlcnQoQ29sbGVjdGlvbnMuc2luZ2xldG9uKHBzKSk7Ci0KLSAgICBuLmNoYW5nZSA9Ci0gICAgICAgIGRiLmNoYW5nZXMoKS5hdG9taWNVcGRhdGUobi5jaGFuZ2UuZ2V0SWQoKSwKLSAgICAgICAgICAgIG5ldyBBdG9taWNVcGRhdGU8Q2hhbmdlPigpIHsKLSAgICAgICAgICAgICAgQE92ZXJyaWRlCi0gICAgICAgICAgICAgIHB1YmxpYyBDaGFuZ2UgdXBkYXRlKENoYW5nZSBjaGFuZ2UpIHsKLSAgICAgICAgICAgICAgICBjaGFuZ2Uuc2V0Q3VycmVudFBhdGNoU2V0KHBhdGNoU2V0SW5mb0ZhY3RvcnkuZ2V0KG5ld0NvbW1pdCwKLSAgICAgICAgICAgICAgICAgICAgcHMuZ2V0SWQoKSkpOwotICAgICAgICAgICAgICAgIHJldHVybiBjaGFuZ2U7Ci0gICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIH0pOwotCi0gICAgdGhpcy5zdWJtaXR0ZWQucmVtb3ZlKG9sZENoYW5nZSk7Ci0gICAgdGhpcy5zdWJtaXR0ZWQuYWRkKG4uY2hhbmdlKTsKLQotICAgIGlmIChhcHByb3ZhbExpc3QgIT0gbnVsbCkgewotICAgICAgZm9yIChQYXRjaFNldEFwcHJvdmFsIGEgOiBhcHByb3ZhbExpc3QpIHsKLSAgICAgICAgZGIucGF0Y2hTZXRBcHByb3ZhbHMoKS5pbnNlcnQoCi0gICAgICAgICAgICBDb2xsZWN0aW9ucy5zaW5nbGV0b24obmV3IFBhdGNoU2V0QXBwcm92YWwocHMuZ2V0SWQoKSwgYSkpKTsKLSAgICAgIH0KLSAgICB9Ci0KLSAgICBmaW5hbCBSZWZVcGRhdGUgcnUgPSByZXBvLnVwZGF0ZVJlZihwcy5nZXRSZWZOYW1lKCkpOwotICAgIHJ1LnNldEV4cGVjdGVkT2xkT2JqZWN0SWQoT2JqZWN0SWQuemVyb0lkKCkpOwotICAgIHJ1LnNldE5ld09iamVjdElkKG5ld0NvbW1pdCk7Ci0gICAgcnUuZGlzYWJsZVJlZkxvZygpOwotICAgIGlmIChydS51cGRhdGUocncpICE9IFJlZlVwZGF0ZS5SZXN1bHQuTkVXKSB7Ci0gICAgICB0aHJvdyBuZXcgSU9FeGNlcHRpb24oU3RyaW5nLmZvcm1hdCgKLSAgICAgICAgICAiRmFpbGVkIHRvIGNyZWF0ZSByZWYgJXMgaW4gJXM6ICVzIiwgcHMuZ2V0UmVmTmFtZSgpLAotICAgICAgICAgIG4uY2hhbmdlLmdldERlc3QoKS5nZXRQYXJlbnRLZXkoKS5nZXQoKSwgcnUuZ2V0UmVzdWx0KCkpKTsKLSAgICB9Ci0gICAgcmVwbGljYXRpb24uZmlyZShuLmNoYW5nZS5nZXRQcm9qZWN0KCksIHJ1LmdldE5hbWUoKSk7Ci0KLSAgICBuZXdDb21taXQuY29weUZyb20obik7Ci0gICAgbmV3Q29tbWl0LnN0YXR1c0NvZGUgPSBDb21taXRNZXJnZVN0YXR1cy5DTEVBTl9QSUNLOwotICAgIGNvbW1pdHMucHV0KG5ld0NvbW1pdC5wYXRjaHNldElkLmdldFBhcmVudEtleSgpLCBuZXdDb21taXQpOwotICAgIG1lcmdlVGlwID0gbmV3Q29tbWl0OwotICAgIHNldFJlZkxvZ0lkZW50KHN1Ym1pdEF1ZGl0KTsKLSAgfQotCi0gIHByaXZhdGUgdm9pZCBpbnNlcnRBbmNlc3RvcnMoUGF0Y2hTZXQuSWQgaWQsIFJldkNvbW1pdCBzcmMpCi0gICAgICB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKLSAgICBmaW5hbCBpbnQgY250ID0gc3JjLmdldFBhcmVudENvdW50KCk7Ci0gICAgTGlzdDxQYXRjaFNldEFuY2VzdG9yPiB0b0luc2VydCA9IG5ldyBBcnJheUxpc3Q8UGF0Y2hTZXRBbmNlc3Rvcj4oY250KTsKLSAgICBmb3IgKGludCBwID0gMDsgcCA8IGNudDsgcCsrKSB7Ci0gICAgICBQYXRjaFNldEFuY2VzdG9yIGE7Ci0KLSAgICAgIGEgPSBuZXcgUGF0Y2hTZXRBbmNlc3RvcihuZXcgUGF0Y2hTZXRBbmNlc3Rvci5JZChpZCwgcCArIDEpKTsKLSAgICAgIGEuc2V0QW5jZXN0b3JSZXZpc2lvbihuZXcgUmV2SWQoc3JjLmdldFBhcmVudChwKS5nZXRJZCgpLm5hbWUoKSkpOwotICAgICAgdG9JbnNlcnQuYWRkKGEpOwotICAgIH0KLSAgICBkYi5wYXRjaFNldEFuY2VzdG9ycygpLmluc2VydCh0b0luc2VydCk7Ci0gIH0KLQotICBwcml2YXRlIE9iamVjdElkIGNvbW1pdChDb21taXRCdWlsZGVyIG1lcmdlQ29tbWl0KQotICAgICAgdGhyb3dzIElPRXhjZXB0aW9uLCBVbnN1cHBvcnRlZEVuY29kaW5nRXhjZXB0aW9uIHsKLSAgICBPYmplY3RJZCBpZCA9IGluc2VydGVyLmluc2VydChtZXJnZUNvbW1pdCk7Ci0gICAgaW5zZXJ0ZXIuZmx1c2goKTsKLSAgICByZXR1cm4gaWQ7Ci0gIH0KLQotICBwcml2YXRlIGJvb2xlYW4gY29udGFpbnMoTGlzdDxGb290ZXJMaW5lPiBmb290ZXJzLCBGb290ZXJLZXkga2V5LCBTdHJpbmcgdmFsKSB7Ci0gICAgZm9yIChmaW5hbCBGb290ZXJMaW5lIGxpbmUgOiBmb290ZXJzKSB7Ci0gICAgICBpZiAobGluZS5tYXRjaGVzKGtleSkgJiYgdmFsLmVxdWFscyhsaW5lLmdldFZhbHVlKCkpKSB7Ci0gICAgICAgIHJldHVybiB0cnVlOwotICAgICAgfQotICAgIH0KLSAgICByZXR1cm4gZmFsc2U7Ci0gIH0KLQotICBwcml2YXRlIGJvb2xlYW4gaXNTaWduZWRPZmZCeShMaXN0PEZvb3RlckxpbmU+IGZvb3RlcnMsIFN0cmluZyBlbWFpbCkgewotICAgIGZvciAoZmluYWwgRm9vdGVyTGluZSBsaW5lIDogZm9vdGVycykgewotICAgICAgaWYgKGxpbmUubWF0Y2hlcyhGb290ZXJLZXkuU0lHTkVEX09GRl9CWSkKLSAgICAgICAgICAmJiBlbWFpbC5lcXVhbHMobGluZS5nZXRFbWFpbEFkZHJlc3MoKSkpIHsKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgICB9Ci0gICAgfQotICAgIHJldHVybiBmYWxzZTsKLSAgfQotCi0gIHByaXZhdGUgUGVyc29uSWRlbnQgdG9Db21taXR0ZXJJZGVudChmaW5hbCBQYXRjaFNldEFwcHJvdmFsIGF1ZGl0KSB7Ci0gICAgaWYgKGF1ZGl0ICE9IG51bGwpIHsKLSAgICAgIHJldHVybiBpZGVudGlmaWVkVXNlckZhY3RvcnkuY3JlYXRlKGF1ZGl0LmdldEFjY291bnRJZCgpKQotICAgICAgICAgIC5uZXdDb21taXR0ZXJJZGVudChhdWRpdC5nZXRHcmFudGVkKCksIG15SWRlbnQuZ2V0VGltZVpvbmUoKSk7Ci0gICAgfQotICAgIHJldHVybiBteUlkZW50OwotICB9Ci0KLSAgcHJpdmF0ZSB2b2lkIHVwZGF0ZUJyYW5jaCgpIHRocm93cyBNZXJnZUV4Y2VwdGlvbiB7CiAgICAgaWYgKG1lcmdlVGlwICE9IG51bGwgJiYgKGJyYW5jaFRpcCA9PSBudWxsIHx8IGJyYW5jaFRpcCAhPSBtZXJnZVRpcCkpIHsKICAgICAgIGlmIChHaXRSZXBvc2l0b3J5TWFuYWdlci5SRUZfQ09ORklHLmVxdWFscyhicmFuY2hVcGRhdGUuZ2V0TmFtZSgpKSkgewogICAgICAgICB0cnkgewpAQCAtMTA1NSw2ICs2MTEsNyBAQAogICAgICAgICB9CiAgICAgICB9CiAKKyAgICAgIGJyYW5jaFVwZGF0ZS5zZXRSZWZMb2dJZGVudChyZWZMb2dJZGVudCk7CiAgICAgICBicmFuY2hVcGRhdGUuc2V0Rm9yY2VVcGRhdGUoZmFsc2UpOwogICAgICAgYnJhbmNoVXBkYXRlLnNldE5ld09iamVjdElkKG1lcmdlVGlwKTsKICAgICAgIGJyYW5jaFVwZGF0ZS5zZXRSZWZMb2dNZXNzYWdlKCJtZXJnZWQiLCB0cnVlKTsKQEAgLTEwODYsNiArNjQzLDE2IEBACiAgICAgICAgICAgICBob29rcy5kb1JlZlVwZGF0ZWRIb29rKGRlc3RCcmFuY2gsIGJyYW5jaFVwZGF0ZSwgYWNjb3VudCk7CiAgICAgICAgICAgICBicmVhazsKIAorICAgICAgICAgIGNhc2UgTE9DS19GQUlMVVJFOgorICAgICAgICAgICAgU3RyaW5nIG1zZzsKKyAgICAgICAgICAgIGlmIChzdHJhdGVneS5yZXRyeU9uTG9ja0ZhaWx1cmUoKSkgeworICAgICAgICAgICAgICBtZXJnZVF1ZXVlLnJlY2hlY2tBZnRlcihkZXN0QnJhbmNoLCBMT0NLX0ZBSUxVUkVfUkVUUllfREVMQVksCisgICAgICAgICAgICAgICAgICBNSUxMSVNFQ09ORFMpOworICAgICAgICAgICAgICBtc2cgPSAid2lsbCByZXRyeSI7CisgICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgICBtc2cgPSAid2lsbCBub3QgcmV0cnkiOworICAgICAgICAgICAgfQorICAgICAgICAgICAgdGhyb3cgbmV3IElPRXhjZXB0aW9uKGJyYW5jaFVwZGF0ZS5nZXRSZXN1bHQoKS5uYW1lKCkgKyAiLCAiICsgbXNnKTsKICAgICAgICAgICBkZWZhdWx0OgogICAgICAgICAgICAgdGhyb3cgbmV3IElPRXhjZXB0aW9uKGJyYW5jaFVwZGF0ZS5nZXRSZXN1bHQoKS5uYW1lKCkpOwogICAgICAgICB9CkBAIC0xMDk1LDIxICs2NjIsNyBAQAogICAgIH0KICAgfQogCi0gIHByaXZhdGUgYm9vbGVhbiBpc01lcmdlYWJsZShDaGFuZ2UgYykgewotICAgIGZpbmFsIENvZGVSZXZpZXdDb21taXQgY29tbWl0ID0gY29tbWl0cy5nZXQoYy5nZXRJZCgpKTsKLSAgICBmaW5hbCBDb21taXRNZXJnZVN0YXR1cyBzID0gY29tbWl0ICE9IG51bGwgPyBjb21taXQuc3RhdHVzQ29kZSA6IG51bGw7Ci0gICAgYm9vbGVhbiBpc01lcmdlYWJsZSA9IGZhbHNlOwotICAgIGlmIChzICE9IG51bGwKLSAgICAgICAgJiYgKHMuZXF1YWxzKENvbW1pdE1lcmdlU3RhdHVzLkNMRUFOX01FUkdFKQotICAgICAgICAgICAgfHwgcy5lcXVhbHMoQ29tbWl0TWVyZ2VTdGF0dXMuQ0xFQU5fUElDSykgfHwgcwotICAgICAgICAgICAgLmVxdWFscyhDb21taXRNZXJnZVN0YXR1cy5BTFJFQURZX01FUkdFRCkpKSB7Ci0gICAgICBpc01lcmdlYWJsZSA9IHRydWU7Ci0gICAgfQotCi0gICAgcmV0dXJuIGlzTWVyZ2VhYmxlOwotICB9Ci0KLSAgcHJpdmF0ZSB2b2lkIHVwZGF0ZUNoYW5nZVN0YXR1cygpIHsKKyAgcHJpdmF0ZSB2b2lkIHVwZGF0ZUNoYW5nZVN0YXR1cyhmaW5hbCBMaXN0PENoYW5nZT4gc3VibWl0dGVkKSB7CiAgICAgTGlzdDxDb2RlUmV2aWV3Q29tbWl0PiBtZXJnZWQgPSBuZXcgQXJyYXlMaXN0PENvZGVSZXZpZXdDb21taXQ+KCk7CiAKICAgICBmb3IgKGZpbmFsIENoYW5nZSBjIDogc3VibWl0dGVkKSB7CkBAIC0xMTMxLDYgKzY4NCw3IEBACiAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KIAorICAgICAgICBjYXNlIENMRUFOX1JFQkFTRToKICAgICAgICAgY2FzZSBDTEVBTl9QSUNLOiB7CiAgICAgICAgICAgc2V0TWVyZ2VkKGMsIG1lc3NhZ2UoYywgdHh0ICsgIiBhcyAiICsgY29tbWl0Lm5hbWUoKSkpOwogICAgICAgICAgIG1lcmdlZC5hZGQoY29tbWl0KTsKQEAgLTExNTEsMTAgKzcwNSw3IEBACiAgICAgICAgIH0KIAogICAgICAgICBjYXNlIE1JU1NJTkdfREVQRU5ERU5DWTogewotICAgICAgICAgIGZpbmFsIENhcGFibGUgY2FwYWJsZSA9IGlzU3VibWl0U3RpbGxQb3NzaWJsZShjb21taXQpOwotICAgICAgICAgIGlmIChjYXBhYmxlICE9IENhcGFibGUuT0spIHsKLSAgICAgICAgICAgIHNlbmRNZXJnZUZhaWwoYywgbWVzc2FnZShjLCBjYXBhYmxlLmdldE1lc3NhZ2UoKSksIGZhbHNlKTsKLSAgICAgICAgICB9CisgICAgICAgICAgcG90ZW50aWFsbHlTdGlsbFN1Ym1pdHRhYmxlLmFkZChjb21taXQpOwogICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAKQEAgLTExNjcsNyArNzE4LDEwIEBACiAgICAgQ3JlYXRlQ29kZVJldmlld05vdGVzIGNvZGVSZXZpZXdOb3RlcyA9CiAgICAgICAgIGNvZGVSZXZpZXdOb3Rlc0ZhY3RvcnkuY3JlYXRlKGRiLCByZXBvKTsKICAgICB0cnkgewotICAgICAgY29kZVJldmlld05vdGVzLmNyZWF0ZShtZXJnZWQsIGNvbXB1dGVBdXRob3IobWVyZ2VkKSk7CisgICAgICBjb2RlUmV2aWV3Tm90ZXMuY3JlYXRlKAorICAgICAgICAgIG1lcmdlZCwKKyAgICAgICAgICBjb21wdXRlTWVyZ2VDb21taXRBdXRob3IoZGIsIGlkZW50aWZpZWRVc2VyRmFjdG9yeSwgbXlJZGVudCwgcncsCisgICAgICAgICAgICAgIG1lcmdlZCkpOwogICAgIH0gY2F0Y2ggKENvZGVSZXZpZXdOb3RlQ3JlYXRpb25FeGNlcHRpb24gZSkgewogICAgICAgbG9nLmVycm9yKGUuZ2V0TWVzc2FnZSgpKTsKICAgICB9CkBAIC0xMTc1LDcgKzcyOSw3IEBACiAgICAgICAgIEdpdFJlcG9zaXRvcnlNYW5hZ2VyLlJFRlNfTk9URVNfUkVWSUVXKTsKICAgfQogCi0gIHByaXZhdGUgdm9pZCB1cGRhdGVTdWJzY3JpcHRpb25zKCkgeworICBwcml2YXRlIHZvaWQgdXBkYXRlU3Vic2NyaXB0aW9ucyhmaW5hbCBMaXN0PENoYW5nZT4gc3VibWl0dGVkKSB7CiAgICAgaWYgKG1lcmdlVGlwICE9IG51bGwgJiYgKGJyYW5jaFRpcCA9PSBudWxsIHx8IGJyYW5jaFRpcCAhPSBtZXJnZVRpcCkpIHsKICAgICAgIFN1Ym1vZHVsZU9wIHN1Yk9wID0KICAgICAgICAgICBzdWJPcEZhY3RvcnkuY3JlYXRlKGRlc3RCcmFuY2gsIG1lcmdlVGlwLCBydywgcmVwbywgZGVzdFByb2plY3QsCkBAIC0xMTkzLDMyICs3NDcsNyBAQAogICBwcml2YXRlIENhcGFibGUgaXNTdWJtaXRTdGlsbFBvc3NpYmxlKGZpbmFsIENvZGVSZXZpZXdDb21taXQgY29tbWl0KSB7CiAgICAgZmluYWwgQ2FwYWJsZSBjYXBhYmxlOwogICAgIGZpbmFsIENoYW5nZSBjID0gY29tbWl0LmNoYW5nZTsKLSAgICBpZiAoY29tbWl0Lm1pc3NpbmcgPT0gbnVsbCkgewotICAgICAgY29tbWl0Lm1pc3NpbmcgPSBuZXcgQXJyYXlMaXN0PENvZGVSZXZpZXdDb21taXQ+KCk7Ci0gICAgfQotCi0gICAgYm9vbGVhbiBzdWJtaXRTdGlsbFBvc3NpYmxlID0gY29tbWl0Lm1pc3Npbmcuc2l6ZSgpID4gMDsKLSAgICBmb3IgKENvZGVSZXZpZXdDb21taXQgbWlzc2luZ0NvbW1pdCA6IGNvbW1pdC5taXNzaW5nKSB7Ci0gICAgICBsb2FkQ2hhbmdlSW5mbyhtaXNzaW5nQ29tbWl0KTsKLQotICAgICAgaWYgKG1pc3NpbmdDb21taXQucGF0Y2hzZXRJZCA9PSBudWxsKSB7Ci0gICAgICAgIC8vIFRoZSBjb21taXQgZG9lc24ndCBoYXZlIGEgcGF0Y2ggc2V0LCBzbyBpdCBjYW5ub3QgYmUKLSAgICAgICAgLy8gc3VibWl0dGVkIHRvIHRoZSBicmFuY2guCi0gICAgICAgIC8vCi0gICAgICAgIHN1Ym1pdFN0aWxsUG9zc2libGUgPSBmYWxzZTsKLSAgICAgICAgYnJlYWs7Ci0gICAgICB9Ci0KLSAgICAgIGlmICghbWlzc2luZ0NvbW1pdC5jaGFuZ2UuY3VycmVudFBhdGNoU2V0SWQoKS5lcXVhbHMoCi0gICAgICAgICAgbWlzc2luZ0NvbW1pdC5wYXRjaHNldElkKSkgewotICAgICAgICAvLyBJZiB0aGUgbWlzc2luZyBjb21taXQgaXMgbm90IHRoZSBjdXJyZW50IHBhdGNoIHNldCwKLSAgICAgICAgLy8gdGhlIGNoYW5nZSBtdXN0IGJlIHJlYmFzZWQgdG8gdXNlIHRoZSBwcm9wZXIgcGFyZW50LgotICAgICAgICAvLwotICAgICAgICBzdWJtaXRTdGlsbFBvc3NpYmxlID0gZmFsc2U7Ci0gICAgICAgIGJyZWFrOwotICAgICAgfQotICAgIH0KLQorICAgIGZpbmFsIGJvb2xlYW4gc3VibWl0U3RpbGxQb3NzaWJsZSA9IGlzU3VibWl0Rm9yTWlzc2luZ0NvbW1pdHNTdGlsbFBvc3NpYmxlKGNvbW1pdCk7CiAgICAgZmluYWwgbG9uZyBub3cgPSBTeXN0ZW0uY3VycmVudFRpbWVNaWxsaXMoKTsKICAgICBmaW5hbCBsb25nIHdhaXRVbnRpbCA9IGMuZ2V0TGFzdFVwZGF0ZWRPbigpLmdldFRpbWUoKSArIERFUEVOREVOQ1lfREVMQVk7CiAgICAgaWYgKHN1Ym1pdFN0aWxsUG9zc2libGUgJiYgbm93IDwgd2FpdFVudGlsKSB7CkBAIC0xMzM5LDI5ICs4NjgsNiBAQAogICAgIHJldHVybiBtOwogICB9CiAKLSAgcHJpdmF0ZSBzdGF0aWMgUGF0Y2hTZXRBcHByb3ZhbCBnZXRTdWJtaXR0ZXIoUmV2aWV3RGIgcmV2aWV3RGIsCi0gICAgICBQYXRjaFNldC5JZCBjKSB7Ci0gICAgaWYgKGMgPT0gbnVsbCkgewotICAgICAgcmV0dXJuIG51bGw7Ci0gICAgfQotICAgIFBhdGNoU2V0QXBwcm92YWwgc3VibWl0dGVyID0gbnVsbDsKLSAgICB0cnkgewotICAgICAgZmluYWwgTGlzdDxQYXRjaFNldEFwcHJvdmFsPiBhcHByb3ZhbHMgPQotICAgICAgICAgIHJldmlld0RiLnBhdGNoU2V0QXBwcm92YWxzKCkuYnlQYXRjaFNldChjKS50b0xpc3QoKTsKLSAgICAgIGZvciAoUGF0Y2hTZXRBcHByb3ZhbCBhIDogYXBwcm92YWxzKSB7Ci0gICAgICAgIGlmIChhLmdldFZhbHVlKCkgPiAwCi0gICAgICAgICAgICAmJiBBcHByb3ZhbENhdGVnb3J5LlNVQk1JVC5lcXVhbHMoYS5nZXRDYXRlZ29yeUlkKCkpKSB7Ci0gICAgICAgICAgaWYgKHN1Ym1pdHRlciA9PSBudWxsCi0gICAgICAgICAgICAgIHx8IGEuZ2V0R3JhbnRlZCgpLmNvbXBhcmVUbyhzdWJtaXR0ZXIuZ2V0R3JhbnRlZCgpKSA+IDApIHsKLSAgICAgICAgICAgIHN1Ym1pdHRlciA9IGE7Ci0gICAgICAgICAgfQotICAgICAgICB9Ci0gICAgICB9Ci0gICAgfSBjYXRjaCAoT3JtRXhjZXB0aW9uIGUpIHsKLSAgICB9Ci0gICAgcmV0dXJuIHN1Ym1pdHRlcjsKLSAgfQotCiAgIHByaXZhdGUgdm9pZCBzZXRNZXJnZWQoZmluYWwgQ2hhbmdlIGMsIGZpbmFsIENoYW5nZU1lc3NhZ2UgbXNnKSB7CiAgICAgZmluYWwgQ2hhbmdlLklkIGNoYW5nZUlkID0gYy5nZXRJZCgpOwogICAgIC8vIFdlIG11c3QgcHVsbCB0aGUgcGF0Y2hzZXQgb3V0IG9mIGNvbW1pdHMsIGJlY2F1c2UgdGhlIHBhdGNoc2V0IElEIGlzCkBAIC0xNDgxLDEzICs5ODcsMTQgQEAKICAgICAgIH0KICAgICB9KSk7CiAKLQotICAgIHRyeSB7Ci0gICAgICBob29rcy5kb0NoYW5nZU1lcmdlZEhvb2soYywgLy8KLSAgICAgICAgICBhY2NvdW50Q2FjaGUuZ2V0KHN1Ym1pdHRlci5nZXRBY2NvdW50SWQoKSkuZ2V0QWNjb3VudCgpLCAvLwotICAgICAgICAgIGRiLnBhdGNoU2V0cygpLmdldChjLmN1cnJlbnRQYXRjaFNldElkKCkpLCBkYik7Ci0gICAgfSBjYXRjaCAoT3JtRXhjZXB0aW9uIGV4KSB7Ci0gICAgICBsb2cuZXJyb3IoIkNhbm5vdCBydW4gaG9vayBmb3Igc3VibWl0dGVkIHBhdGNoIHNldCAiICsgYy5nZXRJZCgpLCBleCk7CisgICAgaWYgKHN1Ym1pdHRlciAhPSBudWxsKSB7CisgICAgICB0cnkgeworICAgICAgICBob29rcy5kb0NoYW5nZU1lcmdlZEhvb2soYywKKyAgICAgICAgICAgIGFjY291bnRDYWNoZS5nZXQoc3VibWl0dGVyLmdldEFjY291bnRJZCgpKS5nZXRBY2NvdW50KCksCisgICAgICAgICAgICBkYi5wYXRjaFNldHMoKS5nZXQoYy5jdXJyZW50UGF0Y2hTZXRJZCgpKSwgZGIpOworICAgICAgfSBjYXRjaCAoT3JtRXhjZXB0aW9uIGV4KSB7CisgICAgICAgIGxvZy5lcnJvcigiQ2Fubm90IHJ1biBob29rIGZvciBzdWJtaXR0ZWQgcGF0Y2ggc2V0ICIgKyBjLmdldElkKCksIGV4KTsKKyAgICAgIH0KICAgICB9CiAgIH0KIApAQCAtMTUyNywxNyArMTAzNCwyMyBAQAogICAgICAgfQogICAgIH0KIAorICAgIFBhdGNoU2V0QXBwcm92YWwgc3VibWl0dGVyID0gbnVsbDsKKyAgICB0cnkgeworICAgICAgc3VibWl0dGVyID0gZ2V0U3VibWl0dGVyKGRiLCBjLmN1cnJlbnRQYXRjaFNldElkKCkpOworICAgIH0gY2F0Y2ggKEV4Y2VwdGlvbiBlKSB7CisgICAgICBsb2cuZXJyb3IoIkNhbm5vdCBnZXQgc3VibWl0dGVyIiwgZSk7CisgICAgfQorCisgICAgZmluYWwgUGF0Y2hTZXRBcHByb3ZhbCBmcm9tID0gc3VibWl0dGVyOwogICAgIHdvcmtRdWV1ZS5nZXREZWZhdWx0UXVldWUoKQogICAgICAgICAuc3VibWl0KHJlcXVlc3RTY29wZVByb3BhZ2F0b3Iud3JhcChuZXcgUnVubmFibGUoKSB7CiAgICAgICBAT3ZlcnJpZGUKICAgICAgIHB1YmxpYyB2b2lkIHJ1bigpIHsKICAgICAgICAgUGF0Y2hTZXQgcGF0Y2hTZXQ7Ci0gICAgICAgIFBhdGNoU2V0QXBwcm92YWwgc3VibWl0dGVyOwogICAgICAgICB0cnkgewogICAgICAgICAgIFJldmlld0RiIHJldmlld0RiID0gc2NoZW1hRmFjdG9yeS5vcGVuKCk7CiAgICAgICAgICAgdHJ5IHsKICAgICAgICAgICAgIHBhdGNoU2V0ID0gcmV2aWV3RGIucGF0Y2hTZXRzKCkuZ2V0KGMuY3VycmVudFBhdGNoU2V0SWQoKSk7Ci0gICAgICAgICAgICBzdWJtaXR0ZXIgPSBnZXRTdWJtaXR0ZXIocmV2aWV3RGIsIGMuY3VycmVudFBhdGNoU2V0SWQoKSk7CiAgICAgICAgICAgfSBmaW5hbGx5IHsKICAgICAgICAgICAgIHJldmlld0RiLmNsb3NlKCk7CiAgICAgICAgICAgfQpAQCAtMTU0OCw4ICsxMDYxLDggQEAKIAogICAgICAgICB0cnkgewogICAgICAgICAgIGZpbmFsIE1lcmdlRmFpbFNlbmRlciBjbSA9IG1lcmdlRmFpbFNlbmRlckZhY3RvcnkuY3JlYXRlKGMpOwotICAgICAgICAgIGlmIChzdWJtaXR0ZXIgIT0gbnVsbCkgewotICAgICAgICAgICAgY20uc2V0RnJvbShzdWJtaXR0ZXIuZ2V0QWNjb3VudElkKCkpOworICAgICAgICAgIGlmIChmcm9tICE9IG51bGwpIHsKKyAgICAgICAgICAgIGNtLnNldEZyb20oZnJvbS5nZXRBY2NvdW50SWQoKSk7CiAgICAgICAgICAgfQogICAgICAgICAgIGNtLnNldFBhdGNoU2V0KHBhdGNoU2V0KTsKICAgICAgICAgICBjbS5zZXRDaGFuZ2VNZXNzYWdlKG1zZyk7CkBAIC0xNTY0LDUgKzEwNzcsMTUgQEAKICAgICAgICAgcmV0dXJuICJzZW5kLWVtYWlsIG1lcmdlLWZhaWxlZCI7CiAgICAgICB9CiAgICAgfSkpOworCisgICAgaWYgKHN1Ym1pdHRlciAhPSBudWxsKSB7CisgICAgICB0cnkgeworICAgICAgICBob29rcy5kb01lcmdlRmFpbGVkSG9vayhjLAorICAgICAgICAgICAgYWNjb3VudENhY2hlLmdldChzdWJtaXR0ZXIuZ2V0QWNjb3VudElkKCkpLmdldEFjY291bnQoKSwKKyAgICAgICAgICAgIGRiLnBhdGNoU2V0cygpLmdldChjLmN1cnJlbnRQYXRjaFNldElkKCkpLCBtc2cuZ2V0TWVzc2FnZSgpLCBkYik7CisgICAgICB9IGNhdGNoIChPcm1FeGNlcHRpb24gZXgpIHsKKyAgICAgICAgbG9nLmVycm9yKCJDYW5ub3QgcnVuIGhvb2sgZm9yIG1lcmdlIGZhaWxlZCAiICsgYy5nZXRJZCgpLCBleCk7CisgICAgICB9CisgICAgfQogICB9CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9NZXJnZVNvcnRlci5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvTWVyZ2VTb3J0ZXIuamF2YQppbmRleCBmZTg3NDgwLi4zOTExZDk2IDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9NZXJnZVNvcnRlci5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L01lcmdlU29ydGVyLmphdmEKQEAgLTI4LDE0ICsyOCwxNCBAQAogCiBjbGFzcyBNZXJnZVNvcnRlciB7CiAgIHByaXZhdGUgZmluYWwgUmV2V2FsayBydzsKLSAgcHJpdmF0ZSBmaW5hbCBSZXZGbGFnIENBTl9NRVJHRTsKKyAgcHJpdmF0ZSBmaW5hbCBSZXZGbGFnIGNhbk1lcmdlRmxhZzsKICAgcHJpdmF0ZSBmaW5hbCBTZXQ8UmV2Q29tbWl0PiBhY2NlcHRlZDsKIAotICBNZXJnZVNvcnRlcihmaW5hbCBSZXZXYWxrIHdhbGssIGZpbmFsIFNldDxSZXZDb21taXQ+IGFscmVhZHlBY2NlcHRlZCwKLSAgICAgIGZpbmFsIFJldkZsYWcgZmxhZ0NBTl9NRVJHRSkgewotICAgIHJ3ID0gd2FsazsKLSAgICBDQU5fTUVSR0UgPSBmbGFnQ0FOX01FUkdFOwotICAgIGFjY2VwdGVkID0gYWxyZWFkeUFjY2VwdGVkOworICBNZXJnZVNvcnRlcihmaW5hbCBSZXZXYWxrIHJ3LCBmaW5hbCBTZXQ8UmV2Q29tbWl0PiBhbHJlYWR5QWNjZXB0ZWQsCisgICAgICBmaW5hbCBSZXZGbGFnIGNhbk1lcmdlRmxhZykgeworICAgIHRoaXMucncgPSBydzsKKyAgICB0aGlzLmNhbk1lcmdlRmxhZyA9IGNhbk1lcmdlRmxhZzsKKyAgICB0aGlzLmFjY2VwdGVkID0gYWxyZWFkeUFjY2VwdGVkOwogICB9CiAKICAgQ29sbGVjdGlvbjxDb2RlUmV2aWV3Q29tbWl0PiBzb3J0KGZpbmFsIENvbGxlY3Rpb248Q29kZVJldmlld0NvbW1pdD4gaW5jb21pbmcpCkBAIC00NSw3ICs0NSw3IEBACiAgICAgd2hpbGUgKCFzb3J0LmlzRW1wdHkoKSkgewogICAgICAgZmluYWwgQ29kZVJldmlld0NvbW1pdCBuID0gcmVtb3ZlT25lKHNvcnQpOwogCi0gICAgICBydy5yZXNldFJldGFpbihDQU5fTUVSR0UpOworICAgICAgcncucmVzZXRSZXRhaW4oY2FuTWVyZ2VGbGFnKTsKICAgICAgIHJ3Lm1hcmtTdGFydChuKTsKICAgICAgIGZvciAoUmV2Q29tbWl0IGMgOiBhY2NlcHRlZCkgewogICAgICAgICBydy5tYXJrVW5pbnRlcmVzdGluZyhjKTsKQEAgLTU0LDcgKzU0LDcgQEAKICAgICAgIFJldkNvbW1pdCBjOwogICAgICAgZmluYWwgUmV2Q29tbWl0TGlzdDxSZXZDb21taXQ+IGNvbnRlbnRzID0gbmV3IFJldkNvbW1pdExpc3Q8UmV2Q29tbWl0PigpOwogICAgICAgd2hpbGUgKChjID0gcncubmV4dCgpKSAhPSBudWxsKSB7Ci0gICAgICAgIGlmICghYy5oYXMoQ0FOX01FUkdFKSkgeworICAgICAgICBpZiAoIWMuaGFzKGNhbk1lcmdlRmxhZykgfHwgIWluY29taW5nLmNvbnRhaW5zKGMpKSB7CiAgICAgICAgICAgLy8gV2UgY2Fubm90IG1lcmdlIG4gYXMgaXQgd291bGQgYnJpbmcgc29tZXRoaW5nIHdlCiAgICAgICAgICAgLy8gYXJlbid0IHBlcm1pdHRlZCB0byBtZXJnZSBhdCB0aGlzIHRpbWUuIERyb3Agbi4KICAgICAgICAgICAvLwpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvTWVyZ2VVdGlsLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9NZXJnZVV0aWwuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4yMjdkYmVlCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvTWVyZ2VVdGlsLmphdmEKQEAgLTAsMCArMSw0NzMgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0OworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFwcHJvdmFsQ2F0ZWdvcnk7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkJyYW5jaDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0QXBwcm92YWw7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuc2VydmVyLlJldmlld0RiOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5JZGVudGlmaWVkVXNlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOworCitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5lcnJvcnMuSW5jb3JyZWN0T2JqZWN0VHlwZUV4Y2VwdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmVycm9ycy5NaXNzaW5nT2JqZWN0RXhjZXB0aW9uOworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLkFueU9iamVjdElkOworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLkNvbW1pdEJ1aWxkZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuQ29uc3RhbnRzOworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLk11dGFibGVPYmplY3RJZDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5PYmplY3RJZDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5PYmplY3RJbnNlcnRlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5QZXJzb25JZGVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5SZXBvc2l0b3J5OworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubWVyZ2UuTWVyZ2VTdHJhdGVneTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0Lm1lcmdlLlRocmVlV2F5TWVyZ2VyOworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQucmV2d2Fsay5SZXZDb21taXQ7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5yZXZ3YWxrLlJldkZsYWc7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5yZXZ3YWxrLlJldlNvcnQ7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5yZXZ3YWxrLlJldldhbGs7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC50cmFuc3BvcnQuUGFja1BhcnNlcjsKK2ltcG9ydCBvcmcuc2xmNGouTG9nZ2VyOworaW1wb3J0IG9yZy5zbGY0ai5Mb2dnZXJGYWN0b3J5OworCitpbXBvcnQgamF2YS5pby5JT0V4Y2VwdGlvbjsKK2ltcG9ydCBqYXZhLmlvLklucHV0U3RyZWFtOworaW1wb3J0IGphdmEuaW8uVW5zdXBwb3J0ZWRFbmNvZGluZ0V4Y2VwdGlvbjsKK2ltcG9ydCBqYXZhLnNxbC5UaW1lc3RhbXA7CitpbXBvcnQgamF2YS51dGlsLkFycmF5TGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbjsKK2ltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbnM7CitpbXBvcnQgamF2YS51dGlsLkNvbXBhcmF0b3I7CitpbXBvcnQgamF2YS51dGlsLkhhc2hTZXQ7CitpbXBvcnQgamF2YS51dGlsLkl0ZXJhdG9yOworaW1wb3J0IGphdmEudXRpbC5MaXN0OworaW1wb3J0IGphdmEudXRpbC5TZXQ7CitpbXBvcnQgamF2YS51dGlsLlRpbWVab25lOworCitwdWJsaWMgY2xhc3MgTWVyZ2VVdGlsIHsKKyAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgTG9nZ2VyIGxvZyA9IExvZ2dlckZhY3RvcnkuZ2V0TG9nZ2VyKE1lcmdlVXRpbC5jbGFzcyk7CisKKyAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgU3RyaW5nIFJfSEVBRFNfTUFTVEVSID0KKyAgICAgIENvbnN0YW50cy5SX0hFQURTICsgQ29uc3RhbnRzLk1BU1RFUjsKKworICBwdWJsaWMgc3RhdGljIENvZGVSZXZpZXdDb21taXQgZ2V0Rmlyc3RGYXN0Rm9yd2FyZCgKKyAgICAgIGZpbmFsIENvZGVSZXZpZXdDb21taXQgbWVyZ2VUaXAsIGZpbmFsIFJldldhbGsgcncsCisgICAgICBmaW5hbCBMaXN0PENvZGVSZXZpZXdDb21taXQ+IHRvTWVyZ2UpIHRocm93cyBNZXJnZUV4Y2VwdGlvbiB7CisgICAgZm9yIChmaW5hbCBJdGVyYXRvcjxDb2RlUmV2aWV3Q29tbWl0PiBpID0gdG9NZXJnZS5pdGVyYXRvcigpOyBpLmhhc05leHQoKTspIHsKKyAgICAgIHRyeSB7CisgICAgICAgIGZpbmFsIENvZGVSZXZpZXdDb21taXQgbiA9IGkubmV4dCgpOworICAgICAgICBpZiAobWVyZ2VUaXAgPT0gbnVsbCB8fCBydy5pc01lcmdlZEludG8obWVyZ2VUaXAsIG4pKSB7CisgICAgICAgICAgaS5yZW1vdmUoKTsKKyAgICAgICAgICByZXR1cm4gbjsKKyAgICAgICAgfQorICAgICAgfSBjYXRjaCAoSU9FeGNlcHRpb24gZSkgeworICAgICAgICB0aHJvdyBuZXcgTWVyZ2VFeGNlcHRpb24oIkNhbm5vdCBmYXN0LWZvcndhcmQgdGVzdCBkdXJpbmcgbWVyZ2UiLCBlKTsKKyAgICAgIH0KKyAgICB9CisgICAgcmV0dXJuIG1lcmdlVGlwOworICB9CisKKyAgcHVibGljIHN0YXRpYyB2b2lkIHJlZHVjZVRvTWluaW1hbE1lcmdlKGZpbmFsIE1lcmdlU29ydGVyIG1lcmdlU29ydGVyLAorICAgICAgZmluYWwgTGlzdDxDb2RlUmV2aWV3Q29tbWl0PiB0b1NvcnQpIHRocm93cyBNZXJnZUV4Y2VwdGlvbiB7CisgICAgZmluYWwgQ29sbGVjdGlvbjxDb2RlUmV2aWV3Q29tbWl0PiBoZWFkczsKKyAgICB0cnkgeworICAgICAgaGVhZHMgPSBtZXJnZVNvcnRlci5zb3J0KHRvU29ydCk7CisgICAgfSBjYXRjaCAoSU9FeGNlcHRpb24gZSkgeworICAgICAgdGhyb3cgbmV3IE1lcmdlRXhjZXB0aW9uKCJCcmFuY2ggaGVhZCBzb3J0aW5nIGZhaWxlZCIsIGUpOworICAgIH0KKworICAgIHRvU29ydC5jbGVhcigpOworICAgIHRvU29ydC5hZGRBbGwoaGVhZHMpOworICAgIENvbGxlY3Rpb25zLnNvcnQodG9Tb3J0LCBuZXcgQ29tcGFyYXRvcjxDb2RlUmV2aWV3Q29tbWl0PigpIHsKKyAgICAgIEBPdmVycmlkZQorICAgICAgcHVibGljIGludCBjb21wYXJlKGZpbmFsIENvZGVSZXZpZXdDb21taXQgYSwgZmluYWwgQ29kZVJldmlld0NvbW1pdCBiKSB7CisgICAgICAgIHJldHVybiBhLm9yaWdpbmFsT3JkZXIgLSBiLm9yaWdpbmFsT3JkZXI7CisgICAgICB9CisgICAgfSk7CisgIH0KKworICBwdWJsaWMgc3RhdGljIFBhdGNoU2V0QXBwcm92YWwgZ2V0U3VibWl0dGVyKGZpbmFsIFJldmlld0RiIHJldmlld0RiLAorICAgICAgZmluYWwgUGF0Y2hTZXQuSWQgYykgeworICAgIGlmIChjID09IG51bGwpIHsKKyAgICAgIHJldHVybiBudWxsOworICAgIH0KKyAgICBQYXRjaFNldEFwcHJvdmFsIHN1Ym1pdHRlciA9IG51bGw7CisgICAgdHJ5IHsKKyAgICAgIGZpbmFsIExpc3Q8UGF0Y2hTZXRBcHByb3ZhbD4gYXBwcm92YWxzID0KKyAgICAgICAgICByZXZpZXdEYi5wYXRjaFNldEFwcHJvdmFscygpLmJ5UGF0Y2hTZXQoYykudG9MaXN0KCk7CisgICAgICBmb3IgKFBhdGNoU2V0QXBwcm92YWwgYSA6IGFwcHJvdmFscykgeworICAgICAgICBpZiAoYS5nZXRWYWx1ZSgpID4gMAorICAgICAgICAgICAgJiYgQXBwcm92YWxDYXRlZ29yeS5TVUJNSVQuZXF1YWxzKGEuZ2V0Q2F0ZWdvcnlJZCgpKSkgeworICAgICAgICAgIGlmIChzdWJtaXR0ZXIgPT0gbnVsbAorICAgICAgICAgICAgICB8fCBhLmdldEdyYW50ZWQoKS5jb21wYXJlVG8oc3VibWl0dGVyLmdldEdyYW50ZWQoKSkgPiAwKSB7CisgICAgICAgICAgICBzdWJtaXR0ZXIgPSBhOworICAgICAgICAgIH0KKyAgICAgICAgfQorICAgICAgfQorICAgIH0gY2F0Y2ggKE9ybUV4Y2VwdGlvbiBlKSB7CisgICAgfQorICAgIHJldHVybiBzdWJtaXR0ZXI7CisgIH0KKworICBwdWJsaWMgc3RhdGljIFBlcnNvbklkZW50IGNvbXB1dGVNZXJnZUNvbW1pdEF1dGhvcihmaW5hbCBSZXZpZXdEYiByZXZpZXdEYiwKKyAgICAgIGZpbmFsIElkZW50aWZpZWRVc2VyLkdlbmVyaWNGYWN0b3J5IGlkZW50aWZpZWRVc2VyRmFjdG9yeSwKKyAgICAgIGZpbmFsIFBlcnNvbklkZW50IG15SWRlbnQsIGZpbmFsIFJldldhbGsgcncsCisgICAgICBmaW5hbCBMaXN0PENvZGVSZXZpZXdDb21taXQ+IGNvZGVSZXZpZXdDb21taXRzKSB7CisgICAgUGF0Y2hTZXRBcHByb3ZhbCBzdWJtaXR0ZXIgPSBudWxsOworICAgIGZvciAoZmluYWwgQ29kZVJldmlld0NvbW1pdCBjIDogY29kZVJldmlld0NvbW1pdHMpIHsKKyAgICAgIFBhdGNoU2V0QXBwcm92YWwgcyA9IGdldFN1Ym1pdHRlcihyZXZpZXdEYiwgYy5wYXRjaHNldElkKTsKKyAgICAgIGlmIChzdWJtaXR0ZXIgPT0gbnVsbAorICAgICAgICAgIHx8IChzICE9IG51bGwgJiYgcy5nZXRHcmFudGVkKCkuY29tcGFyZVRvKHN1Ym1pdHRlci5nZXRHcmFudGVkKCkpID4gMCkpIHsKKyAgICAgICAgc3VibWl0dGVyID0gczsKKyAgICAgIH0KKyAgICB9CisKKyAgICAvLyBUcnkgdG8gdXNlIHRoZSBzdWJtaXR0ZXIncyBpZGVudGl0eSBmb3IgdGhlIG1lcmdlIGNvbW1pdCBhdXRob3IuCisgICAgLy8gSWYgYWxsIG9mIHRoZSBjb21taXRzIGJlaW5nIG1lcmdlZCBhcmUgY3JlYXRlZCBieSB0aGUgc3VibWl0dGVyLAorICAgIC8vIHByZWZlciB0aGUgaWRlbnRpdHkgbGluZSB0aGV5IHVzZWQgaW4gdGhlIGNvbW1pdHMgcmF0aGVyIHRoYW4gdGhlCisgICAgLy8gcHJlZmVycmVkIGlkZW50aXR5IHN0b3JlZCBpbiB0aGUgdXNlciBhY2NvdW50LiBUaGlzIHdheSB0aGUgR2l0CisgICAgLy8gY29tbWl0IHJlY29yZHMgYXJlIG1vcmUgY29uc2lzdGVudCBpbnRlcm5hbGx5LgorICAgIC8vCisgICAgUGVyc29uSWRlbnQgYXV0aG9ySWRlbnQ7CisgICAgaWYgKHN1Ym1pdHRlciAhPSBudWxsKSB7CisgICAgICBJZGVudGlmaWVkVXNlciB3aG8gPQorICAgICAgICAgIGlkZW50aWZpZWRVc2VyRmFjdG9yeS5jcmVhdGUoc3VibWl0dGVyLmdldEFjY291bnRJZCgpKTsKKyAgICAgIFNldDxTdHJpbmc+IGVtYWlscyA9IG5ldyBIYXNoU2V0PFN0cmluZz4oKTsKKyAgICAgIGZvciAoUmV2Q29tbWl0IGMgOiBjb2RlUmV2aWV3Q29tbWl0cykgeworICAgICAgICB0cnkgeworICAgICAgICAgIHJ3LnBhcnNlQm9keShjKTsKKyAgICAgICAgfSBjYXRjaCAoSU9FeGNlcHRpb24gZSkgeworICAgICAgICAgIGxvZy53YXJuKCJDYW5ub3QgcGFyc2UgY29tbWl0ICIgKyBjLm5hbWUoKSwgZSk7CisgICAgICAgICAgY29udGludWU7CisgICAgICAgIH0KKyAgICAgICAgZW1haWxzLmFkZChjLmdldEF1dGhvcklkZW50KCkuZ2V0RW1haWxBZGRyZXNzKCkpOworICAgICAgfQorCisgICAgICBmaW5hbCBUaW1lc3RhbXAgZHQgPSBzdWJtaXR0ZXIuZ2V0R3JhbnRlZCgpOworICAgICAgZmluYWwgVGltZVpvbmUgdHogPSBteUlkZW50LmdldFRpbWVab25lKCk7CisgICAgICBpZiAoZW1haWxzLnNpemUoKSA9PSAxCisgICAgICAgICAgJiYgd2hvLmdldEVtYWlsQWRkcmVzc2VzKCkuY29udGFpbnMoZW1haWxzLml0ZXJhdG9yKCkubmV4dCgpKSkgeworICAgICAgICBhdXRob3JJZGVudCA9CisgICAgICAgICAgICBuZXcgUGVyc29uSWRlbnQoY29kZVJldmlld0NvbW1pdHMuZ2V0KDApLmdldEF1dGhvcklkZW50KCksIGR0LCB0eik7CisgICAgICB9IGVsc2UgeworICAgICAgICBhdXRob3JJZGVudCA9IHdoby5uZXdDb21taXR0ZXJJZGVudChkdCwgdHopOworICAgICAgfQorICAgIH0gZWxzZSB7CisgICAgICBhdXRob3JJZGVudCA9IG15SWRlbnQ7CisgICAgfQorICAgIHJldHVybiBhdXRob3JJZGVudDsKKyAgfQorCisgIHB1YmxpYyBzdGF0aWMgYm9vbGVhbiBjYW5NZXJnZShmaW5hbCBNZXJnZVNvcnRlciBtZXJnZVNvcnRlciwKKyAgICAgIGZpbmFsIFJlcG9zaXRvcnkgcmVwbywgZmluYWwgYm9vbGVhbiB1c2VDb250ZW50TWVyZ2UsCisgICAgICBmaW5hbCBDb2RlUmV2aWV3Q29tbWl0IG1lcmdlVGlwLCBmaW5hbCBDb2RlUmV2aWV3Q29tbWl0IHRvTWVyZ2UpCisgICAgICB0aHJvd3MgTWVyZ2VFeGNlcHRpb24geworICAgIGlmIChoYXNNaXNzaW5nRGVwZW5kZW5jaWVzKG1lcmdlU29ydGVyLCB0b01lcmdlKSkgeworICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KKworICAgIGZpbmFsIFRocmVlV2F5TWVyZ2VyIG0gPQorICAgICAgICBuZXdUaHJlZVdheU1lcmdlcihyZXBvLCBjcmVhdGVEcnlSdW5JbnNlcnRlcigpLCB1c2VDb250ZW50TWVyZ2UpOworICAgIHRyeSB7CisgICAgICByZXR1cm4gbS5tZXJnZShuZXcgQW55T2JqZWN0SWRbXSB7bWVyZ2VUaXAsIHRvTWVyZ2V9KTsKKyAgICB9IGNhdGNoIChJT0V4Y2VwdGlvbiBlKSB7CisgICAgICBpZiAoZS5nZXRNZXNzYWdlKCkuc3RhcnRzV2l0aCgiTXVsdGlwbGUgbWVyZ2UgYmFzZXMgZm9yIikpIHsKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgfQorICAgICAgdGhyb3cgbmV3IE1lcmdlRXhjZXB0aW9uKCJDYW5ub3QgbWVyZ2UgIiArIHRvTWVyZ2UubmFtZSgpLCBlKTsKKyAgICB9CisgIH0KKworICBwdWJsaWMgc3RhdGljIGJvb2xlYW4gY2FuRmFzdEZvcndhcmQoZmluYWwgTWVyZ2VTb3J0ZXIgbWVyZ2VTb3J0ZXIsCisgICAgICBmaW5hbCBDb2RlUmV2aWV3Q29tbWl0IG1lcmdlVGlwLCBmaW5hbCBSZXZXYWxrIHJ3LAorICAgICAgZmluYWwgQ29kZVJldmlld0NvbW1pdCB0b01lcmdlKSB0aHJvd3MgTWVyZ2VFeGNlcHRpb24geworICAgIGlmIChoYXNNaXNzaW5nRGVwZW5kZW5jaWVzKG1lcmdlU29ydGVyLCB0b01lcmdlKSkgeworICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KKworICAgIHRyeSB7CisgICAgICByZXR1cm4gbWVyZ2VUaXAgPT0gbnVsbCB8fCBydy5pc01lcmdlZEludG8obWVyZ2VUaXAsIHRvTWVyZ2UpOworICAgIH0gY2F0Y2ggKElPRXhjZXB0aW9uIGUpIHsKKyAgICAgIHRocm93IG5ldyBNZXJnZUV4Y2VwdGlvbigiQ2Fubm90IGZhc3QtZm9yd2FyZCB0ZXN0IGR1cmluZyBtZXJnZSIsIGUpOworICAgIH0KKyAgfQorCisgIHB1YmxpYyBzdGF0aWMgYm9vbGVhbiBjYW5DaGVycnlQaWNrKGZpbmFsIE1lcmdlU29ydGVyIG1lcmdlU29ydGVyLAorICAgICAgZmluYWwgUmVwb3NpdG9yeSByZXBvLCBmaW5hbCBib29sZWFuIHVzZUNvbnRlbnRNZXJnZSwKKyAgICAgIGZpbmFsIENvZGVSZXZpZXdDb21taXQgbWVyZ2VUaXAsIGZpbmFsIFJldldhbGsgcncsCisgICAgICBmaW5hbCBDb2RlUmV2aWV3Q29tbWl0IHRvTWVyZ2UpIHRocm93cyBNZXJnZUV4Y2VwdGlvbiB7CisgICAgaWYgKG1lcmdlVGlwID09IG51bGwpIHsKKyAgICAgIC8vIFRoZSBicmFuY2ggaXMgdW5ib3JuLiBGYXN0LWZvcndhcmQgaXMgcG9zc2libGUuCisgICAgICAvLworICAgICAgcmV0dXJuIHRydWU7CisgICAgfQorCisgICAgaWYgKHRvTWVyZ2UuZ2V0UGFyZW50Q291bnQoKSA9PSAwKSB7CisgICAgICAvLyBSZWZ1c2UgdG8gbWVyZ2UgYSByb290IGNvbW1pdCBpbnRvIGFuIGV4aXN0aW5nIGJyYW5jaCwKKyAgICAgIC8vIHdlIGNhbm5vdCBvYnRhaW4gYSBkZWx0YSBmb3IgdGhlIGNoZXJyeS1waWNrIHRvIGFwcGx5LgorICAgICAgLy8KKyAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisKKyAgICBpZiAodG9NZXJnZS5nZXRQYXJlbnRDb3VudCgpID09IDEpIHsKKyAgICAgIC8vIElmIHRoZXJlIGlzIG9ubHkgb25lIHBhcmVudCwgYSBjaGVycnktcGljayBjYW4gYmUgZG9uZSBieQorICAgICAgLy8gdGFraW5nIHRoZSBkZWx0YSByZWxhdGl2ZSB0byB0aGF0IG9uZSBwYXJlbnQgYW5kIHJlZG9pbmcKKyAgICAgIC8vIHRoYXQgb24gdGhlIGN1cnJlbnQgbWVyZ2UgdGlwLgorICAgICAgLy8KKyAgICAgIHRyeSB7CisgICAgICAgIGZpbmFsIFRocmVlV2F5TWVyZ2VyIG0gPQorICAgICAgICAgICAgbmV3VGhyZWVXYXlNZXJnZXIocmVwbywgY3JlYXRlRHJ5UnVuSW5zZXJ0ZXIoKSwgdXNlQ29udGVudE1lcmdlKTsKKyAgICAgICAgbS5zZXRCYXNlKHRvTWVyZ2UuZ2V0UGFyZW50KDApKTsKKyAgICAgICAgcmV0dXJuIG0ubWVyZ2UobWVyZ2VUaXAsIHRvTWVyZ2UpOworICAgICAgfSBjYXRjaCAoSU9FeGNlcHRpb24gZSkgeworICAgICAgICB0aHJvdyBuZXcgTWVyZ2VFeGNlcHRpb24oIkNhbm5vdCBtZXJnZSAiICsgdG9NZXJnZS5uYW1lKCksIGUpOworICAgICAgfQorICAgIH0KKworICAgIC8vIFRoZXJlIGFyZSBtdWx0aXBsZSBwYXJlbnRzLCBzbyB0aGlzIGlzIGEgbWVyZ2UgY29tbWl0LiBXZQorICAgIC8vIGRvbid0IHdhbnQgdG8gY2hlcnJ5LXBpY2sgdGhlIG1lcmdlIGFzIGNsaWVudHMgY2FuJ3QgZWFzaWx5CisgICAgLy8gcmViYXNlIHRoZWlyIGhpc3Rvcnkgd2l0aCB0aGF0IG1lcmdlIHByZXNlbnQgYW5kIHJlcGxhY2VkCisgICAgLy8gYnkgYW4gZXF1aXZhbGVudCBtZXJnZSB3aXRoIGEgZGlmZmVyZW50IGZpcnN0IHBhcmVudC4gU28KKyAgICAvLyBpbnN0ZWFkIGJlaGF2ZSBhcyB0aG91Z2ggTUVSR0VfSUZfTkVDRVNTQVJZIHdhcyBjb25maWd1cmVkLgorICAgIC8vCisgICAgcmV0dXJuIGNhbkZhc3RGb3J3YXJkKG1lcmdlU29ydGVyLCBtZXJnZVRpcCwgcncsIHRvTWVyZ2UpCisgICAgICAgIHx8IGNhbk1lcmdlKG1lcmdlU29ydGVyLCByZXBvLCB1c2VDb250ZW50TWVyZ2UsIG1lcmdlVGlwLCB0b01lcmdlKTsKKyAgfQorCisgIHB1YmxpYyBzdGF0aWMgYm9vbGVhbiBoYXNNaXNzaW5nRGVwZW5kZW5jaWVzKGZpbmFsIE1lcmdlU29ydGVyIG1lcmdlU29ydGVyLAorICAgICAgZmluYWwgQ29kZVJldmlld0NvbW1pdCB0b01lcmdlKSB0aHJvd3MgTWVyZ2VFeGNlcHRpb24geworICAgIHRyeSB7CisgICAgICByZXR1cm4gIW1lcmdlU29ydGVyLnNvcnQoQ29sbGVjdGlvbnMuc2luZ2xldG9uKHRvTWVyZ2UpKS5jb250YWlucyh0b01lcmdlKTsKKyAgICB9IGNhdGNoIChJT0V4Y2VwdGlvbiBlKSB7CisgICAgICB0aHJvdyBuZXcgTWVyZ2VFeGNlcHRpb24oIkJyYW5jaCBoZWFkIHNvcnRpbmcgZmFpbGVkIiwgZSk7CisgICAgfQorICB9CisKKyAgcHVibGljIHN0YXRpYyBPYmplY3RJbnNlcnRlciBjcmVhdGVEcnlSdW5JbnNlcnRlcigpIHsKKyAgICByZXR1cm4gbmV3IE9iamVjdEluc2VydGVyKCkgeworICAgICAgcHJpdmF0ZSBmaW5hbCBNdXRhYmxlT2JqZWN0SWQgYnVmID0gbmV3IE11dGFibGVPYmplY3RJZCgpOworICAgICAgcHJpdmF0ZSBmaW5hbCBzdGF0aWMgaW50IExBU1RfQllURSA9IENvbnN0YW50cy5PQkpFQ1RfSURfTEVOR1RIIC0gMTsKKworICAgICAgQE92ZXJyaWRlCisgICAgICBwdWJsaWMgT2JqZWN0SWQgaW5zZXJ0KGludCBvYmplY3RUeXBlLCBsb25nIGxlbmd0aCwgSW5wdXRTdHJlYW0gaW4pCisgICAgICAgICAgdGhyb3dzIElPRXhjZXB0aW9uIHsKKyAgICAgICAgLy8gY3JlYXRlIG5vbi1leGlzdGluZyBkdW1teSBJRAorICAgICAgICBidWYuc2V0Qnl0ZShMQVNUX0JZVEUsIGJ1Zi5nZXRCeXRlKExBU1RfQllURSkgKyAxKTsKKyAgICAgICAgcmV0dXJuIGJ1Zi5jb3B5KCk7CisgICAgICB9CisKKyAgICAgIEBPdmVycmlkZQorICAgICAgcHVibGljIFBhY2tQYXJzZXIgbmV3UGFja1BhcnNlcihJbnB1dFN0cmVhbSBpbikgdGhyb3dzIElPRXhjZXB0aW9uIHsKKyAgICAgICAgdGhyb3cgbmV3IFVuc3VwcG9ydGVkT3BlcmF0aW9uRXhjZXB0aW9uKCk7CisgICAgICB9CisKKyAgICAgIEBPdmVycmlkZQorICAgICAgcHVibGljIHZvaWQgZmx1c2goKSB0aHJvd3MgSU9FeGNlcHRpb24geworICAgICAgICAvLyBEbyBub3RoaW5nLgorICAgICAgfQorCisgICAgICBAT3ZlcnJpZGUKKyAgICAgIHB1YmxpYyB2b2lkIHJlbGVhc2UoKSB7CisgICAgICAgIC8vIERvIG5vdGhpbmcuCisgICAgICB9CisgICAgfTsKKyAgfQorCisgIHB1YmxpYyBzdGF0aWMgQ29kZVJldmlld0NvbW1pdCBtZXJnZU9uZUNvbW1pdChmaW5hbCBSZXZpZXdEYiByZXZpZXdEYiwKKyAgICAgIGZpbmFsIElkZW50aWZpZWRVc2VyLkdlbmVyaWNGYWN0b3J5IGlkZW50aWZpZWRVc2VyRmFjdG9yeSwKKyAgICAgIGZpbmFsIFBlcnNvbklkZW50IG15SWRlbnQsIGZpbmFsIFJlcG9zaXRvcnkgcmVwbywgZmluYWwgUmV2V2FsayBydywKKyAgICAgIGZpbmFsIE9iamVjdEluc2VydGVyIGluc2VydGVyLCBmaW5hbCBSZXZGbGFnIGNhbk1lcmdlRmxhZywKKyAgICAgIGZpbmFsIGJvb2xlYW4gdXNlQ29udGVudE1lcmdlLCBmaW5hbCBCcmFuY2guTmFtZUtleSBkZXN0QnJhbmNoLAorICAgICAgZmluYWwgQ29kZVJldmlld0NvbW1pdCBtZXJnZVRpcCwgZmluYWwgQ29kZVJldmlld0NvbW1pdCBuKQorICAgICAgdGhyb3dzIE1lcmdlRXhjZXB0aW9uIHsKKyAgICBmaW5hbCBUaHJlZVdheU1lcmdlciBtID0gbmV3VGhyZWVXYXlNZXJnZXIocmVwbywgaW5zZXJ0ZXIsIHVzZUNvbnRlbnRNZXJnZSk7CisgICAgdHJ5IHsKKyAgICAgIGlmIChtLm1lcmdlKG5ldyBBbnlPYmplY3RJZFtdIHttZXJnZVRpcCwgbn0pKSB7CisgICAgICAgIHJldHVybiB3cml0ZU1lcmdlQ29tbWl0KHJldmlld0RiLCBpZGVudGlmaWVkVXNlckZhY3RvcnksIG15SWRlbnQsIHJ3LAorICAgICAgICAgICAgaW5zZXJ0ZXIsIGNhbk1lcmdlRmxhZywgZGVzdEJyYW5jaCwgbWVyZ2VUaXAsIG0uZ2V0UmVzdWx0VHJlZUlkKCksIG4pOworICAgICAgfSBlbHNlIHsKKyAgICAgICAgZmFpbGVkKHJ3LCBjYW5NZXJnZUZsYWcsIG1lcmdlVGlwLCBuLCBDb21taXRNZXJnZVN0YXR1cy5QQVRIX0NPTkZMSUNUKTsKKyAgICAgIH0KKyAgICB9IGNhdGNoIChJT0V4Y2VwdGlvbiBlKSB7CisgICAgICBpZiAoZS5nZXRNZXNzYWdlKCkuc3RhcnRzV2l0aCgiTXVsdGlwbGUgbWVyZ2UgYmFzZXMgZm9yIikpIHsKKyAgICAgICAgdHJ5IHsKKyAgICAgICAgICBmYWlsZWQocncsIGNhbk1lcmdlRmxhZywgbWVyZ2VUaXAsIG4sCisgICAgICAgICAgICAgIENvbW1pdE1lcmdlU3RhdHVzLkNSSVNTX0NST1NTX01FUkdFKTsKKyAgICAgICAgfSBjYXRjaCAoSU9FeGNlcHRpb24gZTIpIHsKKyAgICAgICAgICB0aHJvdyBuZXcgTWVyZ2VFeGNlcHRpb24oIkNhbm5vdCBtZXJnZSAiICsgbi5uYW1lKCksIGUpOworICAgICAgICB9CisgICAgICB9IGVsc2UgeworICAgICAgICB0aHJvdyBuZXcgTWVyZ2VFeGNlcHRpb24oIkNhbm5vdCBtZXJnZSAiICsgbi5uYW1lKCksIGUpOworICAgICAgfQorICAgIH0KKyAgICByZXR1cm4gbWVyZ2VUaXA7CisgIH0KKworICBwcml2YXRlIHN0YXRpYyBDb2RlUmV2aWV3Q29tbWl0IGZhaWxlZChmaW5hbCBSZXZXYWxrIHJ3LAorICAgICAgZmluYWwgUmV2RmxhZyBjYW5NZXJnZUZsYWcsIGZpbmFsIENvZGVSZXZpZXdDb21taXQgbWVyZ2VUaXAsCisgICAgICBmaW5hbCBDb2RlUmV2aWV3Q29tbWl0IG4sIGZpbmFsIENvbW1pdE1lcmdlU3RhdHVzIGZhaWx1cmUpCisgICAgICB0aHJvd3MgTWlzc2luZ09iamVjdEV4Y2VwdGlvbiwgSW5jb3JyZWN0T2JqZWN0VHlwZUV4Y2VwdGlvbiwgSU9FeGNlcHRpb24geworICAgIHJ3LnJlc2V0UmV0YWluKGNhbk1lcmdlRmxhZyk7CisgICAgcncubWFya1N0YXJ0KG4pOworICAgIHJ3Lm1hcmtVbmludGVyZXN0aW5nKG1lcmdlVGlwKTsKKyAgICBDb2RlUmV2aWV3Q29tbWl0IGZhaWxlZDsKKyAgICB3aGlsZSAoKGZhaWxlZCA9IChDb2RlUmV2aWV3Q29tbWl0KSBydy5uZXh0KCkpICE9IG51bGwpIHsKKyAgICAgIGZhaWxlZC5zdGF0dXNDb2RlID0gZmFpbHVyZTsKKyAgICB9CisgICAgcmV0dXJuIGZhaWxlZDsKKyAgfQorCisgIHB1YmxpYyBzdGF0aWMgQ29kZVJldmlld0NvbW1pdCB3cml0ZU1lcmdlQ29tbWl0KGZpbmFsIFJldmlld0RiIHJldmlld0RiLAorICAgICAgZmluYWwgSWRlbnRpZmllZFVzZXIuR2VuZXJpY0ZhY3RvcnkgaWRlbnRpZmllZFVzZXJGYWN0b3J5LAorICAgICAgZmluYWwgUGVyc29uSWRlbnQgbXlJZGVudCwgZmluYWwgUmV2V2FsayBydywKKyAgICAgIGZpbmFsIE9iamVjdEluc2VydGVyIGluc2VydGVyLCBmaW5hbCBSZXZGbGFnIGNhbk1lcmdlRmxhZywKKyAgICAgIGZpbmFsIEJyYW5jaC5OYW1lS2V5IGRlc3RCcmFuY2gsIGZpbmFsIENvZGVSZXZpZXdDb21taXQgbWVyZ2VUaXAsCisgICAgICBmaW5hbCBPYmplY3RJZCB0cmVlSWQsIGZpbmFsIENvZGVSZXZpZXdDb21taXQgbikgdGhyb3dzIElPRXhjZXB0aW9uLAorICAgICAgTWlzc2luZ09iamVjdEV4Y2VwdGlvbiwgSW5jb3JyZWN0T2JqZWN0VHlwZUV4Y2VwdGlvbiB7CisgICAgZmluYWwgTGlzdDxDb2RlUmV2aWV3Q29tbWl0PiBtZXJnZWQgPSBuZXcgQXJyYXlMaXN0PENvZGVSZXZpZXdDb21taXQ+KCk7CisgICAgcncucmVzZXRSZXRhaW4oY2FuTWVyZ2VGbGFnKTsKKyAgICBydy5tYXJrU3RhcnQobik7CisgICAgcncubWFya1VuaW50ZXJlc3RpbmcobWVyZ2VUaXApOworICAgIGZvciAoZmluYWwgUmV2Q29tbWl0IGMgOiBydykgeworICAgICAgZmluYWwgQ29kZVJldmlld0NvbW1pdCBjcmMgPSAoQ29kZVJldmlld0NvbW1pdCkgYzsKKyAgICAgIGlmIChjcmMucGF0Y2hzZXRJZCAhPSBudWxsKSB7CisgICAgICAgIG1lcmdlZC5hZGQoY3JjKTsKKyAgICAgIH0KKyAgICB9CisKKyAgICBmaW5hbCBTdHJpbmdCdWlsZGVyIG1zZ2J1ZiA9IG5ldyBTdHJpbmdCdWlsZGVyKCk7CisgICAgaWYgKG1lcmdlZC5zaXplKCkgPT0gMSkgeworICAgICAgZmluYWwgQ29kZVJldmlld0NvbW1pdCBjID0gbWVyZ2VkLmdldCgwKTsKKyAgICAgIHJ3LnBhcnNlQm9keShjKTsKKyAgICAgIG1zZ2J1Zi5hcHBlbmQoIk1lcmdlIFwiIik7CisgICAgICBtc2didWYuYXBwZW5kKGMuZ2V0U2hvcnRNZXNzYWdlKCkpOworICAgICAgbXNnYnVmLmFwcGVuZCgiXCIiKTsKKworICAgIH0gZWxzZSB7CisgICAgICBtc2didWYuYXBwZW5kKCJNZXJnZSBjaGFuZ2VzICIpOworICAgICAgZm9yIChmaW5hbCBJdGVyYXRvcjxDb2RlUmV2aWV3Q29tbWl0PiBpID0gbWVyZ2VkLml0ZXJhdG9yKCk7IGkuaGFzTmV4dCgpOykgeworICAgICAgICBtc2didWYuYXBwZW5kKGkubmV4dCgpLmNoYW5nZS5nZXRLZXkoKS5hYmJyZXZpYXRlKCkpOworICAgICAgICBpZiAoaS5oYXNOZXh0KCkpIHsKKyAgICAgICAgICBtc2didWYuYXBwZW5kKCcsJyk7CisgICAgICAgIH0KKyAgICAgIH0KKyAgICB9CisKKyAgICBpZiAoIVJfSEVBRFNfTUFTVEVSLmVxdWFscyhkZXN0QnJhbmNoLmdldCgpKSkgeworICAgICAgbXNnYnVmLmFwcGVuZCgiIGludG8gIik7CisgICAgICBtc2didWYuYXBwZW5kKGRlc3RCcmFuY2guZ2V0U2hvcnROYW1lKCkpOworICAgIH0KKworICAgIGlmIChtZXJnZWQuc2l6ZSgpID4gMSkgeworICAgICAgbXNnYnVmLmFwcGVuZCgiXG5cbiogY2hhbmdlczpcbiIpOworICAgICAgZm9yIChmaW5hbCBDb2RlUmV2aWV3Q29tbWl0IGMgOiBtZXJnZWQpIHsKKyAgICAgICAgcncucGFyc2VCb2R5KGMpOworICAgICAgICBtc2didWYuYXBwZW5kKCIgICIpOworICAgICAgICBtc2didWYuYXBwZW5kKGMuZ2V0U2hvcnRNZXNzYWdlKCkpOworICAgICAgICBtc2didWYuYXBwZW5kKCJcbiIpOworICAgICAgfQorICAgIH0KKworICAgIFBlcnNvbklkZW50IGF1dGhvcklkZW50ID0KKyAgICAgICAgY29tcHV0ZU1lcmdlQ29tbWl0QXV0aG9yKHJldmlld0RiLCBpZGVudGlmaWVkVXNlckZhY3RvcnksIG15SWRlbnQsIHJ3LAorICAgICAgICAgICAgbWVyZ2VkKTsKKworICAgIGZpbmFsIENvbW1pdEJ1aWxkZXIgbWVyZ2VDb21taXQgPSBuZXcgQ29tbWl0QnVpbGRlcigpOworICAgIG1lcmdlQ29tbWl0LnNldFRyZWVJZCh0cmVlSWQpOworICAgIG1lcmdlQ29tbWl0LnNldFBhcmVudElkcyhtZXJnZVRpcCwgbik7CisgICAgbWVyZ2VDb21taXQuc2V0QXV0aG9yKGF1dGhvcklkZW50KTsKKyAgICBtZXJnZUNvbW1pdC5zZXRDb21taXR0ZXIobXlJZGVudCk7CisgICAgbWVyZ2VDb21taXQuc2V0TWVzc2FnZShtc2didWYudG9TdHJpbmcoKSk7CisKKyAgICByZXR1cm4gKENvZGVSZXZpZXdDb21taXQpIHJ3LnBhcnNlQ29tbWl0KGNvbW1pdChpbnNlcnRlciwgbWVyZ2VDb21taXQpKTsKKyAgfQorCisgIHB1YmxpYyBzdGF0aWMgVGhyZWVXYXlNZXJnZXIgbmV3VGhyZWVXYXlNZXJnZXIoZmluYWwgUmVwb3NpdG9yeSByZXBvLAorICAgICAgZmluYWwgT2JqZWN0SW5zZXJ0ZXIgaW5zZXJ0ZXIsIGZpbmFsIGJvb2xlYW4gdXNlQ29udGVudE1lcmdlKSB7CisgICAgVGhyZWVXYXlNZXJnZXIgbTsKKyAgICBpZiAodXNlQ29udGVudE1lcmdlKSB7CisgICAgICAvLyBTZXR0aW5ncyBmb3IgdGhpcyBwcm9qZWN0IGFsbG93IHVzIHRvIHRyeSBhbmQKKyAgICAgIC8vIGF1dG9tYXRpY2FsbHkgcmVzb2x2ZSBjb25mbGljdHMgd2l0aGluIGZpbGVzIGlmIG5lZWRlZC4KKyAgICAgIC8vIFVzZSBSZXNvbHZlTWVyZ2UgYW5kIGluc3RydWN0IHRvIG9wZXJhdGUgaW4gY29yZS4KKyAgICAgIG0gPSBNZXJnZVN0cmF0ZWd5LlJFU09MVkUubmV3TWVyZ2VyKHJlcG8sIHRydWUpOworICAgIH0gZWxzZSB7CisgICAgICAvLyBObyBhdXRvIGNvbmZsaWN0IHJlc29sdmluZyBhbGxvd2VkLiBJZiBhbnkgb2YgdGhlCisgICAgICAvLyBhZmZlY3RlZCBmaWxlcyB3YXMgbW9kaWZpZWQsIG1lcmdlIHdpbGwgZmFpbC4KKyAgICAgIG0gPSBNZXJnZVN0cmF0ZWd5LlNJTVBMRV9UV09fV0FZX0lOX0NPUkUubmV3TWVyZ2VyKHJlcG8pOworICAgIH0KKyAgICBtLnNldE9iamVjdEluc2VydGVyKG5ldyBPYmplY3RJbnNlcnRlci5GaWx0ZXIoKSB7CisgICAgICBAT3ZlcnJpZGUKKyAgICAgIHByb3RlY3RlZCBPYmplY3RJbnNlcnRlciBkZWxlZ2F0ZSgpIHsKKyAgICAgICAgcmV0dXJuIGluc2VydGVyOworICAgICAgfQorCisgICAgICBAT3ZlcnJpZGUKKyAgICAgIHB1YmxpYyB2b2lkIGZsdXNoKCkgeworICAgICAgfQorCisgICAgICBAT3ZlcnJpZGUKKyAgICAgIHB1YmxpYyB2b2lkIHJlbGVhc2UoKSB7CisgICAgICB9CisgICAgfSk7CisgICAgcmV0dXJuIG07CisgIH0KKworICBwdWJsaWMgc3RhdGljIE9iamVjdElkIGNvbW1pdChmaW5hbCBPYmplY3RJbnNlcnRlciBpbnNlcnRlciwKKyAgICAgIGZpbmFsIENvbW1pdEJ1aWxkZXIgbWVyZ2VDb21taXQpIHRocm93cyBJT0V4Y2VwdGlvbiwKKyAgICAgIFVuc3VwcG9ydGVkRW5jb2RpbmdFeGNlcHRpb24geworICAgIE9iamVjdElkIGlkID0gaW5zZXJ0ZXIuaW5zZXJ0KG1lcmdlQ29tbWl0KTsKKyAgICBpbnNlcnRlci5mbHVzaCgpOworICAgIHJldHVybiBpZDsKKyAgfQorCisgIHB1YmxpYyBzdGF0aWMgUGF0Y2hTZXRBcHByb3ZhbCBtYXJrQ2xlYW5NZXJnZXMoZmluYWwgUmV2aWV3RGIgcmV2aWV3RGIsCisgICAgICBmaW5hbCBSZXZXYWxrIHJ3LCBmaW5hbCBSZXZGbGFnIGNhbk1lcmdlRmxhZywKKyAgICAgIGZpbmFsIENvZGVSZXZpZXdDb21taXQgbWVyZ2VUaXAsIGZpbmFsIFNldDxSZXZDb21taXQ+IGFscmVhZHlBY2NlcHRlZCkKKyAgICAgIHRocm93cyBNZXJnZUV4Y2VwdGlvbiB7CisgICAgaWYgKG1lcmdlVGlwID09IG51bGwpIHsKKyAgICAgIC8vIElmIG1lcmdlVGlwIGlzIG51bGwgaGVyZSwgYnJhbmNoVGlwIHdhcyBudWxsLCBpbmRpY2F0aW5nIGEgbmV3IGJyYW5jaAorICAgICAgLy8gYXQgdGhlIHN0YXJ0IG9mIHRoZSBtZXJnZSBwcm9jZXNzLiBXZSBhbHNvIGVsZWN0ZWQgdG8gbWVyZ2Ugbm90aGluZywKKyAgICAgIC8vIHByb2JhYmx5IGR1ZSB0byBtaXNzaW5nIGRlcGVuZGVuY2llcy4gTm90aGluZyB3YXMgY2xlYW5seSBtZXJnZWQuCisgICAgICAvLworICAgICAgcmV0dXJuIG51bGw7CisgICAgfQorCisgICAgdHJ5IHsKKyAgICAgIFBhdGNoU2V0QXBwcm92YWwgc3VibWl0QXBwcm92YWwgPSBudWxsOworCisgICAgICBydy5yZXNldFJldGFpbihjYW5NZXJnZUZsYWcpOworICAgICAgcncuc29ydChSZXZTb3J0LlRPUE8pOworICAgICAgcncuc29ydChSZXZTb3J0LlJFVkVSU0UsIHRydWUpOworICAgICAgcncubWFya1N0YXJ0KG1lcmdlVGlwKTsKKyAgICAgIGZvciAoUmV2Q29tbWl0IGMgOiBhbHJlYWR5QWNjZXB0ZWQpIHsKKyAgICAgICAgcncubWFya1VuaW50ZXJlc3RpbmcoYyk7CisgICAgICB9CisKKyAgICAgIENvZGVSZXZpZXdDb21taXQgYzsKKyAgICAgIHdoaWxlICgoYyA9IChDb2RlUmV2aWV3Q29tbWl0KSBydy5uZXh0KCkpICE9IG51bGwpIHsKKyAgICAgICAgaWYgKGMucGF0Y2hzZXRJZCAhPSBudWxsKSB7CisgICAgICAgICAgYy5zdGF0dXNDb2RlID0gQ29tbWl0TWVyZ2VTdGF0dXMuQ0xFQU5fTUVSR0U7CisgICAgICAgICAgaWYgKHN1Ym1pdEFwcHJvdmFsID09IG51bGwpIHsKKyAgICAgICAgICAgIHN1Ym1pdEFwcHJvdmFsID0gZ2V0U3VibWl0dGVyKHJldmlld0RiLCBjLnBhdGNoc2V0SWQpOworICAgICAgICAgIH0KKyAgICAgICAgfQorICAgICAgfQorCisgICAgICByZXR1cm4gc3VibWl0QXBwcm92YWw7CisgICAgfSBjYXRjaCAoSU9FeGNlcHRpb24gZSkgeworICAgICAgdGhyb3cgbmV3IE1lcmdlRXhjZXB0aW9uKCJDYW5ub3QgbWFyayBjbGVhbiBtZXJnZXMiLCBlKTsKKyAgICB9CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L05vdGVzQnJhbmNoVXRpbC5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvTm90ZXNCcmFuY2hVdGlsLmphdmEKaW5kZXggMTdjZmVhOC4uNzg4N2VkZCAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvTm90ZXNCcmFuY2hVdGlsLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvTm90ZXNCcmFuY2hVdGlsLmphdmEKQEAgLTQ3LDcgKzQ3LDcgQEAKICAqLwogcHVibGljIGNsYXNzIE5vdGVzQnJhbmNoVXRpbCB7CiAgIHB1YmxpYyBpbnRlcmZhY2UgRmFjdG9yeSB7Ci0gICAgTm90ZXNCcmFuY2hVdGlsIGNyZWF0ZShSZXBvc2l0b3J5IGRiKTsKKyAgICBOb3Rlc0JyYW5jaFV0aWwgY3JlYXRlKFJlcG9zaXRvcnkgZGIsIE9iamVjdEluc2VydGVyIGluc2VydGVyKTsKICAgfQogCiAgIHByaXZhdGUgc3RhdGljIGZpbmFsIGludCBNQVhfTE9DS19GQUlMVVJFX0NBTExTID0gMTA7CkBAIC01NSw2ICs1NSw3IEBACiAKICAgcHJpdmF0ZSBQZXJzb25JZGVudCBnZXJyaXRJZGVudDsKICAgcHJpdmF0ZSBmaW5hbCBSZXBvc2l0b3J5IGRiOworICBwcml2YXRlIGZpbmFsIE9iamVjdEluc2VydGVyIGluc2VydGVyOwogCiAgIHByaXZhdGUgUmV2Q29tbWl0IGJhc2VDb21taXQ7CiAgIHByaXZhdGUgTm90ZU1hcCBiYXNlOwpAQCAtNjMsNyArNjQsNiBAQAogICBwcml2YXRlIE5vdGVNYXAgb3VyczsKIAogICBwcml2YXRlIFJldldhbGsgcmV2V2FsazsKLSAgcHJpdmF0ZSBPYmplY3RJbnNlcnRlciBpbnNlcnRlcjsKICAgcHJpdmF0ZSBPYmplY3RSZWFkZXIgcmVhZGVyOwogICBwcml2YXRlIGJvb2xlYW4gb3ZlcndyaXRlOwogCkBAIC03MSw5ICs3MSwxMSBAQAogCiAgIEBJbmplY3QKICAgcHVibGljIE5vdGVzQnJhbmNoVXRpbChAR2Vycml0UGVyc29uSWRlbnQgZmluYWwgUGVyc29uSWRlbnQgZ2Vycml0SWRlbnQsCi0gICAgICBAQXNzaXN0ZWQgUmVwb3NpdG9yeSBkYikgeworICAgICAgQEFzc2lzdGVkIFJlcG9zaXRvcnkgZGIsCisgICAgICBAQXNzaXN0ZWQgT2JqZWN0SW5zZXJ0ZXIgaW5zZXJ0ZXIpIHsKICAgICB0aGlzLmdlcnJpdElkZW50ID0gZ2Vycml0SWRlbnQ7CiAgICAgdGhpcy5kYiA9IGRiOworICAgIHRoaXMuaW5zZXJ0ZXIgPSBpbnNlcnRlcjsKICAgfQogCiAgIC8qKgpAQCAtMTI4LDcgKzEzMCw2IEBACiAgICAgICBDb25jdXJyZW50UmVmVXBkYXRlRXhjZXB0aW9uIHsKICAgICB0cnkgewogICAgICAgcmV2V2FsayA9IG5ldyBSZXZXYWxrKGRiKTsKLSAgICAgIGluc2VydGVyID0gZGIubmV3T2JqZWN0SW5zZXJ0ZXIoKTsKICAgICAgIHJlYWRlciA9IGRiLm5ld09iamVjdFJlYWRlcigpOwogICAgICAgbG9hZEJhc2Uobm90ZXNCcmFuY2gpOwogICAgICAgaWYgKG92ZXJ3cml0ZSkgewpAQCAtMTQ0LDcgKzE0NSw2IEBACiAgICAgICB1cGRhdGVSZWYobm90ZXNCcmFuY2gpOwogICAgIH0gZmluYWxseSB7CiAgICAgICByZXZXYWxrLnJlbGVhc2UoKTsKLSAgICAgIGluc2VydGVyLnJlbGVhc2UoKTsKICAgICAgIHJlYWRlci5yZWxlYXNlKCk7CiAgICAgfQogICB9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9SZWJhc2VJZk5lY2Vzc2FyeS5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvUmViYXNlSWZOZWNlc3NhcnkuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4xZjNkNmYwCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvUmViYXNlSWZOZWNlc3NhcnkuamF2YQpAQCAtMCwwICsxLDE2NCBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQ7CisKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5NZXJnZVV0aWwuY2FuQ2hlcnJ5UGljazsKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5NZXJnZVV0aWwuY2FuRmFzdEZvcndhcmQ7CitpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuTWVyZ2VVdGlsLmdldFN1Ym1pdHRlcjsKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5NZXJnZVV0aWwuaGFzTWlzc2luZ0RlcGVuZGVuY2llczsKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5NZXJnZVV0aWwubWFya0NsZWFuTWVyZ2VzOworaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0Lk1lcmdlVXRpbC5tZXJnZU9uZUNvbW1pdDsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5DaGFuZ2U7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldEFwcHJvdmFsOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jaGFuZ2VkZXRhaWwuUGF0aENvbmZsaWN0RXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jaGFuZ2VkZXRhaWwuUmViYXNlQ2hhbmdlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LkludmFsaWRDaGFuZ2VPcGVyYXRpb25FeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuTm9TdWNoQ2hhbmdlRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5Pcm1FeGNlcHRpb247CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5PYmplY3RJZDsKKworaW1wb3J0IGphdmEuaW8uSU9FeGNlcHRpb247CitpbXBvcnQgamF2YS51dGlsLkhhc2hNYXA7CitpbXBvcnQgamF2YS51dGlsLkxpc3Q7CitpbXBvcnQgamF2YS51dGlsLk1hcDsKKworcHVibGljIGNsYXNzIFJlYmFzZUlmTmVjZXNzYXJ5IGV4dGVuZHMgU3VibWl0U3RyYXRlZ3kgeworCisgIHByaXZhdGUgZmluYWwgUmViYXNlQ2hhbmdlIHJlYmFzZUNoYW5nZTsKKyAgcHJpdmF0ZSBmaW5hbCBNYXA8Q2hhbmdlLklkLCBDb2RlUmV2aWV3Q29tbWl0PiBuZXdDb21taXRzOworCisgIFJlYmFzZUlmTmVjZXNzYXJ5KGZpbmFsIFN1Ym1pdFN0cmF0ZWd5LkFyZ3VtZW50cyBhcmdzLAorICAgICAgZmluYWwgUmViYXNlQ2hhbmdlLkZhY3RvcnkgcmViYXNlQ2hhbmdlRmFjdG9yeSkgeworICAgIHN1cGVyKGFyZ3MpOworICAgIHRoaXMucmViYXNlQ2hhbmdlID0gcmViYXNlQ2hhbmdlRmFjdG9yeS5jcmVhdGUoKTsKKyAgICB0aGlzLm5ld0NvbW1pdHMgPSBuZXcgSGFzaE1hcDxDaGFuZ2UuSWQsIENvZGVSZXZpZXdDb21taXQ+KCk7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHJvdGVjdGVkIENvZGVSZXZpZXdDb21taXQgX3J1bihmaW5hbCBDb2RlUmV2aWV3Q29tbWl0IG1lcmdlVGlwLAorICAgICAgZmluYWwgTGlzdDxDb2RlUmV2aWV3Q29tbWl0PiB0b01lcmdlKSB0aHJvd3MgTWVyZ2VFeGNlcHRpb24geworICAgIENvZGVSZXZpZXdDb21taXQgbmV3TWVyZ2VUaXAgPSBtZXJnZVRpcDsKKyAgICBzb3J0KHRvTWVyZ2UpOworCisgICAgd2hpbGUgKCF0b01lcmdlLmlzRW1wdHkoKSkgeworICAgICAgZmluYWwgQ29kZVJldmlld0NvbW1pdCBuID0gdG9NZXJnZS5yZW1vdmUoMCk7CisKKyAgICAgIGlmIChuZXdNZXJnZVRpcCA9PSBudWxsKSB7CisgICAgICAgIC8vIFRoZSBicmFuY2ggaXMgdW5ib3JuLiBUYWtlIGEgZmFzdC1mb3J3YXJkIHJlc29sdXRpb24gdG8KKyAgICAgICAgLy8gY3JlYXRlIHRoZSBicmFuY2guCisgICAgICAgIC8vCisgICAgICAgIG5ld01lcmdlVGlwID0gbjsKKyAgICAgICAgbi5zdGF0dXNDb2RlID0gQ29tbWl0TWVyZ2VTdGF0dXMuQ0xFQU5fTUVSR0U7CisKKyAgICAgIH0gZWxzZSBpZiAobi5nZXRQYXJlbnRDb3VudCgpID09IDApIHsKKyAgICAgICAgLy8gUmVmdXNlIHRvIG1lcmdlIGEgcm9vdCBjb21taXQgaW50byBhbiBleGlzdGluZyBicmFuY2gsCisgICAgICAgIC8vIHdlIGNhbm5vdCBvYnRhaW4gYSBkZWx0YSBmb3IgdGhlIHJlYmFzZSB0byBhcHBseS4KKyAgICAgICAgLy8KKyAgICAgICAgbi5zdGF0dXNDb2RlID0gQ29tbWl0TWVyZ2VTdGF0dXMuQ0FOTk9UX1JFQkFTRV9ST09UOworCisgICAgICB9IGVsc2UgaWYgKG4uZ2V0UGFyZW50Q291bnQoKSA9PSAxKSB7CisgICAgICAgIGlmIChjYW5GYXN0Rm9yd2FyZChhcmdzLm1lcmdlU29ydGVyLCBuZXdNZXJnZVRpcCwgYXJncy5ydywgbikpIHsKKyAgICAgICAgICBuZXdNZXJnZVRpcCA9IG47CisgICAgICAgICAgbi5zdGF0dXNDb2RlID0gQ29tbWl0TWVyZ2VTdGF0dXMuQ0xFQU5fTUVSR0U7CisKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICB0cnkgeworICAgICAgICAgICAgZmluYWwgUGF0Y2hTZXQgbmV3UGF0Y2hTZXQgPQorICAgICAgICAgICAgICAgIHJlYmFzZUNoYW5nZS5yZWJhc2UoYXJncy5yZXBvLCBhcmdzLnJ3LCBhcmdzLmluc2VydGVyLAorICAgICAgICAgICAgICAgICAgICBuLnBhdGNoc2V0SWQsIG4uY2hhbmdlLCBnZXRTdWJtaXR0ZXIoYXJncy5kYiwgbi5wYXRjaHNldElkKQorICAgICAgICAgICAgICAgICAgICAgICAgLmdldEFjY291bnRJZCgpLCBuZXdNZXJnZVRpcCwgYXJncy51c2VDb250ZW50TWVyZ2UpOworICAgICAgICAgICAgbmV3TWVyZ2VUaXAgPQorICAgICAgICAgICAgICAgIChDb2RlUmV2aWV3Q29tbWl0KSBhcmdzLnJ3LnBhcnNlQ29tbWl0KE9iamVjdElkCisgICAgICAgICAgICAgICAgICAgIC5mcm9tU3RyaW5nKG5ld1BhdGNoU2V0LmdldFJldmlzaW9uKCkuZ2V0KCkpKTsKKyAgICAgICAgICAgIG5ld01lcmdlVGlwLmNvcHlGcm9tKG4pOworICAgICAgICAgICAgbmV3TWVyZ2VUaXAucGF0Y2hzZXRJZCA9IG5ld1BhdGNoU2V0LmdldElkKCk7CisgICAgICAgICAgICBuZXdNZXJnZVRpcC5jaGFuZ2UgPQorICAgICAgICAgICAgICAgIGFyZ3MuZGIuY2hhbmdlcygpLmdldChuZXdQYXRjaFNldC5nZXRJZCgpLmdldFBhcmVudEtleSgpKTsKKyAgICAgICAgICAgIG5ld01lcmdlVGlwLnN0YXR1c0NvZGUgPSBDb21taXRNZXJnZVN0YXR1cy5DTEVBTl9SRUJBU0U7CisgICAgICAgICAgICBuZXdDb21taXRzLnB1dChuZXdQYXRjaFNldC5nZXRJZCgpLmdldFBhcmVudEtleSgpLCBuZXdNZXJnZVRpcCk7CisgICAgICAgICAgICBzZXRSZWZMb2dJZGVudChnZXRTdWJtaXR0ZXIoYXJncy5kYiwgbi5wYXRjaHNldElkKSk7CisgICAgICAgICAgfSBjYXRjaCAoUGF0aENvbmZsaWN0RXhjZXB0aW9uIGUpIHsKKyAgICAgICAgICAgIG4uc3RhdHVzQ29kZSA9IENvbW1pdE1lcmdlU3RhdHVzLlBBVEhfQ09ORkxJQ1Q7CisgICAgICAgICAgfSBjYXRjaCAoTm9TdWNoQ2hhbmdlRXhjZXB0aW9uIGUpIHsKKyAgICAgICAgICAgIHRocm93IG5ldyBNZXJnZUV4Y2VwdGlvbigiQ2Fubm90IHJlYmFzZSAiICsgbi5uYW1lKCksIGUpOworICAgICAgICAgIH0gY2F0Y2ggKE9ybUV4Y2VwdGlvbiBlKSB7CisgICAgICAgICAgICB0aHJvdyBuZXcgTWVyZ2VFeGNlcHRpb24oIkNhbm5vdCByZWJhc2UgIiArIG4ubmFtZSgpLCBlKTsKKyAgICAgICAgICB9IGNhdGNoIChJT0V4Y2VwdGlvbiBlKSB7CisgICAgICAgICAgICB0aHJvdyBuZXcgTWVyZ2VFeGNlcHRpb24oIkNhbm5vdCByZWJhc2UgIiArIG4ubmFtZSgpLCBlKTsKKyAgICAgICAgICB9IGNhdGNoIChJbnZhbGlkQ2hhbmdlT3BlcmF0aW9uRXhjZXB0aW9uIGUpIHsKKyAgICAgICAgICAgIHRocm93IG5ldyBNZXJnZUV4Y2VwdGlvbigiQ2Fubm90IHJlYmFzZSAiICsgbi5uYW1lKCksIGUpOworICAgICAgICAgIH0KKyAgICAgICAgfQorCisgICAgICB9IGVsc2UgaWYgKG4uZ2V0UGFyZW50Q291bnQoKSA+IDEpIHsKKyAgICAgICAgLy8gVGhlcmUgYXJlIG11bHRpcGxlIHBhcmVudHMsIHNvIHRoaXMgaXMgYSBtZXJnZSBjb21taXQuIFdlCisgICAgICAgIC8vIGRvbid0IHdhbnQgdG8gcmViYXNlIHRoZSBtZXJnZSBhcyBjbGllbnRzIGNhbid0IGVhc2lseQorICAgICAgICAvLyByZWJhc2UgdGhlaXIgaGlzdG9yeSB3aXRoIHRoYXQgbWVyZ2UgcHJlc2VudCBhbmQgcmVwbGFjZWQKKyAgICAgICAgLy8gYnkgYW4gZXF1aXZhbGVudCBtZXJnZSB3aXRoIGEgZGlmZmVyZW50IGZpcnN0IHBhcmVudC4gU28KKyAgICAgICAgLy8gaW5zdGVhZCBiZWhhdmUgYXMgdGhvdWdoIE1FUkdFX0lGX05FQ0VTU0FSWSB3YXMgY29uZmlndXJlZC4KKyAgICAgICAgLy8KKyAgICAgICAgdHJ5IHsKKyAgICAgICAgICBpZiAoYXJncy5ydy5pc01lcmdlZEludG8obmV3TWVyZ2VUaXAsIG4pKSB7CisgICAgICAgICAgICBuZXdNZXJnZVRpcCA9IG47CisgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIG5ld01lcmdlVGlwID0KKyAgICAgICAgICAgICAgICBtZXJnZU9uZUNvbW1pdChhcmdzLmRiLCBhcmdzLmlkZW50aWZpZWRVc2VyRmFjdG9yeSwKKyAgICAgICAgICAgICAgICAgICAgYXJncy5teUlkZW50LCBhcmdzLnJlcG8sIGFyZ3MucncsIGFyZ3MuaW5zZXJ0ZXIsCisgICAgICAgICAgICAgICAgICAgIGFyZ3MuY2FuTWVyZ2VGbGFnLCBhcmdzLnVzZUNvbnRlbnRNZXJnZSwgYXJncy5kZXN0QnJhbmNoLAorICAgICAgICAgICAgICAgICAgICBuZXdNZXJnZVRpcCwgbik7CisgICAgICAgICAgfQorICAgICAgICAgIGZpbmFsIFBhdGNoU2V0QXBwcm92YWwgc3VibWl0QXBwcm92YWwgPQorICAgICAgICAgICAgICBtYXJrQ2xlYW5NZXJnZXMoYXJncy5kYiwgYXJncy5ydywgYXJncy5jYW5NZXJnZUZsYWcsIG5ld01lcmdlVGlwLAorICAgICAgICAgICAgICAgICAgYXJncy5hbHJlYWR5QWNjZXB0ZWQpOworICAgICAgICAgIHNldFJlZkxvZ0lkZW50KHN1Ym1pdEFwcHJvdmFsKTsKKyAgICAgICAgfSBjYXRjaCAoSU9FeGNlcHRpb24gZSkgeworICAgICAgICAgIHRocm93IG5ldyBNZXJnZUV4Y2VwdGlvbigiQ2Fubm90IG1lcmdlICIgKyBuLm5hbWUoKSwgZSk7CisgICAgICAgIH0KKyAgICAgIH0KKworICAgICAgYXJncy5hbHJlYWR5QWNjZXB0ZWQuYWRkKG5ld01lcmdlVGlwKTsKKyAgICB9CisKKyAgICByZXR1cm4gbmV3TWVyZ2VUaXA7CisgIH0KKworICBwcml2YXRlIHZvaWQgc29ydChmaW5hbCBMaXN0PENvZGVSZXZpZXdDb21taXQ+IHRvU29ydCkgdGhyb3dzIE1lcmdlRXhjZXB0aW9uIHsKKyAgICB0cnkgeworICAgICAgZmluYWwgTGlzdDxDb2RlUmV2aWV3Q29tbWl0PiBzb3J0ZWQgPQorICAgICAgICAgIG5ldyBSZWJhc2VTb3J0ZXIoYXJncy5ydywgYXJncy5hbHJlYWR5QWNjZXB0ZWQsIGFyZ3MuY2FuTWVyZ2VGbGFnKQorICAgICAgICAgICAgICAuc29ydCh0b1NvcnQpOworICAgICAgdG9Tb3J0LmNsZWFyKCk7CisgICAgICB0b1NvcnQuYWRkQWxsKHNvcnRlZCk7CisgICAgfSBjYXRjaCAoSU9FeGNlcHRpb24gZSkgeworICAgICAgdGhyb3cgbmV3IE1lcmdlRXhjZXB0aW9uKCJDb21taXQgc29ydGluZyBmYWlsZWQiLCBlKTsKKyAgICB9CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIE1hcDxDaGFuZ2UuSWQsIENvZGVSZXZpZXdDb21taXQ+IGdldE5ld0NvbW1pdHMoKSB7CisgICAgcmV0dXJuIG5ld0NvbW1pdHM7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIGJvb2xlYW4gZHJ5UnVuKGZpbmFsIENvZGVSZXZpZXdDb21taXQgbWVyZ2VUaXAsCisgICAgICBmaW5hbCBDb2RlUmV2aWV3Q29tbWl0IHRvTWVyZ2UpIHRocm93cyBNZXJnZUV4Y2VwdGlvbiB7CisgICAgcmV0dXJuICFoYXNNaXNzaW5nRGVwZW5kZW5jaWVzKGFyZ3MubWVyZ2VTb3J0ZXIsIHRvTWVyZ2UpCisgICAgICAgICYmIGNhbkNoZXJyeVBpY2soYXJncy5tZXJnZVNvcnRlciwgYXJncy5yZXBvLCBhcmdzLnVzZUNvbnRlbnRNZXJnZSwKKyAgICAgICAgICAgIG1lcmdlVGlwLCBhcmdzLnJ3LCB0b01lcmdlKTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvUmViYXNlU29ydGVyLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9SZWJhc2VTb3J0ZXIuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5hYzE5MjliCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvUmViYXNlU29ydGVyLmphdmEKQEAgLTAsMCArMSw5MSBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQ7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LnJldndhbGsuUmV2Q29tbWl0OworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQucmV2d2Fsay5SZXZGbGFnOworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQucmV2d2Fsay5SZXZXYWxrOworCitpbXBvcnQgamF2YS5pby5JT0V4Y2VwdGlvbjsKK2ltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OworaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uOworaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uczsKK2ltcG9ydCBqYXZhLnV0aWwuSGFzaFNldDsKK2ltcG9ydCBqYXZhLnV0aWwuSXRlcmF0b3I7CitpbXBvcnQgamF2YS51dGlsLkxpc3Q7CitpbXBvcnQgamF2YS51dGlsLlNldDsKKworY2xhc3MgUmViYXNlU29ydGVyIHsKKworICBwcml2YXRlIGZpbmFsIFJldldhbGsgcnc7CisgIHByaXZhdGUgZmluYWwgUmV2RmxhZyBjYW5NZXJnZUZsYWc7CisgIHByaXZhdGUgZmluYWwgU2V0PFJldkNvbW1pdD4gYWNjZXB0ZWQ7CisKKyAgUmViYXNlU29ydGVyKGZpbmFsIFJldldhbGsgcncsIGZpbmFsIFNldDxSZXZDb21taXQ+IGFscmVhZHlBY2NlcHRlZCwKKyAgICAgIGZpbmFsIFJldkZsYWcgY2FuTWVyZ2VGbGFnKSB7CisgICAgdGhpcy5ydyA9IHJ3OworICAgIHRoaXMuY2FuTWVyZ2VGbGFnID0gY2FuTWVyZ2VGbGFnOworICAgIHRoaXMuYWNjZXB0ZWQgPSBhbHJlYWR5QWNjZXB0ZWQ7CisgIH0KKworICBMaXN0PENvZGVSZXZpZXdDb21taXQ+IHNvcnQoQ29sbGVjdGlvbjxDb2RlUmV2aWV3Q29tbWl0PiBpbmNvbWluZykKKyAgICAgIHRocm93cyBJT0V4Y2VwdGlvbiB7CisgICAgZmluYWwgTGlzdDxDb2RlUmV2aWV3Q29tbWl0PiBzb3J0ZWQgPSBuZXcgQXJyYXlMaXN0PENvZGVSZXZpZXdDb21taXQ+KCk7CisgICAgZmluYWwgU2V0PENvZGVSZXZpZXdDb21taXQ+IHNvcnQgPSBuZXcgSGFzaFNldDxDb2RlUmV2aWV3Q29tbWl0PihpbmNvbWluZyk7CisgICAgd2hpbGUgKCFzb3J0LmlzRW1wdHkoKSkgeworICAgICAgZmluYWwgQ29kZVJldmlld0NvbW1pdCBuID0gcmVtb3ZlT25lKHNvcnQpOworCisgICAgICBydy5yZXNldFJldGFpbihjYW5NZXJnZUZsYWcpOworICAgICAgcncubWFya1N0YXJ0KG4pOworICAgICAgZm9yIChSZXZDb21taXQgYyA6IGFjY2VwdGVkKSB7CisgICAgICAgIHJ3Lm1hcmtVbmludGVyZXN0aW5nKGMpOworICAgICAgfQorCisgICAgICBDb2RlUmV2aWV3Q29tbWl0IGM7CisgICAgICBmaW5hbCBMaXN0PENvZGVSZXZpZXdDb21taXQ+IGNvbnRlbnRzID0gbmV3IEFycmF5TGlzdDxDb2RlUmV2aWV3Q29tbWl0PigpOworICAgICAgd2hpbGUgKChjID0gKENvZGVSZXZpZXdDb21taXQpIHJ3Lm5leHQoKSkgIT0gbnVsbCkgeworICAgICAgICBpZiAoIWMuaGFzKGNhbk1lcmdlRmxhZykgfHwgIWluY29taW5nLmNvbnRhaW5zKGMpKSB7CisgICAgICAgICAgLy8gV2UgY2Fubm90IG1lcmdlIG4gYXMgaXQgd291bGQgYnJpbmcgc29tZXRoaW5nIHdlCisgICAgICAgICAgLy8gYXJlbid0IHBlcm1pdHRlZCB0byBtZXJnZSBhdCB0aGlzIHRpbWUuIERyb3Agbi4KKyAgICAgICAgICAvLworICAgICAgICAgIGlmIChuLm1pc3NpbmcgPT0gbnVsbCkgeworICAgICAgICAgICAgbi5zdGF0dXNDb2RlID0gQ29tbWl0TWVyZ2VTdGF0dXMuTUlTU0lOR19ERVBFTkRFTkNZOworICAgICAgICAgICAgbi5taXNzaW5nID0gbmV3IEFycmF5TGlzdDxDb2RlUmV2aWV3Q29tbWl0PigpOworICAgICAgICAgIH0KKyAgICAgICAgICBuLm1pc3NpbmcuYWRkKChDb2RlUmV2aWV3Q29tbWl0KSBjKTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICBjb250ZW50cy5hZGQoYyk7CisgICAgICAgIH0KKyAgICAgIH0KKworICAgICAgaWYgKG4uc3RhdHVzQ29kZSA9PSBDb21taXRNZXJnZVN0YXR1cy5NSVNTSU5HX0RFUEVOREVOQ1kpIHsKKyAgICAgICAgY29udGludWU7CisgICAgICB9CisKKyAgICAgIHNvcnQucmVtb3ZlQWxsKGNvbnRlbnRzKTsKKyAgICAgIENvbGxlY3Rpb25zLnJldmVyc2UoY29udGVudHMpOworICAgICAgc29ydGVkLnJlbW92ZUFsbChjb250ZW50cyk7CisgICAgICBzb3J0ZWQuYWRkQWxsKGNvbnRlbnRzKTsKKyAgICB9CisgICAgcmV0dXJuIHNvcnRlZDsKKyAgfQorCisgIHByaXZhdGUgc3RhdGljIDxUPiBUIHJlbW92ZU9uZShmaW5hbCBDb2xsZWN0aW9uPFQ+IGMpIHsKKyAgICBmaW5hbCBJdGVyYXRvcjxUPiBpID0gYy5pdGVyYXRvcigpOworICAgIGZpbmFsIFQgciA9IGkubmV4dCgpOworICAgIGkucmVtb3ZlKCk7CisgICAgcmV0dXJuIHI7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L1JlY2VpdmVDb21taXRzLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9SZWNlaXZlQ29tbWl0cy5qYXZhCmluZGV4IDZhNmY5MDguLmViZTZiNDMgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L1JlY2VpdmVDb21taXRzLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvUmVjZWl2ZUNvbW1pdHMuamF2YQpAQCAtNjgsNiArNjgsNyBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LlByb2plY3RDb250cm9sOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LlByb2plY3RTdGF0ZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5SZWZDb250cm9sOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5zc2guU3NoSW5mbzsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIudXRpbC5NYWdpY0JyYW5jaDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIudXRpbC5SZXF1ZXN0U2NvcGVQcm9wYWdhdG9yOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5BdG9taWNVcGRhdGU7CkBAIC03Nyw2ICs3OCw3IEBACiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LmFzc2lzdGVkaW5qZWN0LkFzc2lzdGVkOwogCitpbXBvcnQgY29tLmpjcmFmdC5qc2NoLkhvc3RLZXk7CiBpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5lcnJvcnMuSW5jb3JyZWN0T2JqZWN0VHlwZUV4Y2VwdGlvbjsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmVycm9ycy5NaXNzaW5nT2JqZWN0RXhjZXB0aW9uOwogaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLkFiYnJldmlhdGVkT2JqZWN0SWQ7CkBAIC0xMDAsMTAgKzEwMiwxMyBAQAogaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQudHJhbnNwb3J0LlJlY2VpdmVDb21tYW5kOwogaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQudHJhbnNwb3J0LlJlY2VpdmVDb21tYW5kLlJlc3VsdDsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LnRyYW5zcG9ydC5SZWNlaXZlUGFjazsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LnV0aWwuU3lzdGVtUmVhZGVyOwogaW1wb3J0IG9yZy5zbGY0ai5Mb2dnZXI7CiBpbXBvcnQgb3JnLnNsZjRqLkxvZ2dlckZhY3Rvcnk7CiAKIGltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOworaW1wb3J0IGphdmEubmV0Lk1hbGZvcm1lZFVSTEV4Y2VwdGlvbjsKK2ltcG9ydCBqYXZhLm5ldC5VUkw7CiBpbXBvcnQgamF2YS5zcWwuVGltZXN0YW1wOwogaW1wb3J0IGphdmEudXRpbC5BcnJheUxpc3Q7CiBpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb247CkBAIC0yNDcsOSArMjUyLDExIEBACiAgIHByaXZhdGUgZmluYWwgUGVyc29uSWRlbnQgZ2Vycml0SWRlbnQ7CiAgIHByaXZhdGUgZmluYWwgVHJhY2tpbmdGb290ZXJzIHRyYWNraW5nRm9vdGVyczsKICAgcHJpdmF0ZSBmaW5hbCBUYWdDYWNoZSB0YWdDYWNoZTsKKyAgcHJpdmF0ZSBmaW5hbCBDaGFuZ2VDYWNoZSBjaGFuZ2VDYWNoZTsKICAgcHJpdmF0ZSBmaW5hbCBXb3JrUXVldWUgd29ya1F1ZXVlOwogICBwcml2YXRlIGZpbmFsIExpc3RlbmluZ0V4ZWN1dG9yU2VydmljZSBjaGFuZ2VVcGRhdGVFeGVjdG9yOwogICBwcml2YXRlIGZpbmFsIFJlcXVlc3RTY29wZVByb3BhZ2F0b3IgcmVxdWVzdFNjb3BlUHJvcGFnYXRvcjsKKyAgcHJpdmF0ZSBmaW5hbCBTc2hJbmZvIHNzaEluZm87CiAKICAgcHJpdmF0ZSBmaW5hbCBQcm9qZWN0Q29udHJvbCBwcm9qZWN0Q29udHJvbDsKICAgcHJpdmF0ZSBmaW5hbCBQcm9qZWN0IHByb2plY3Q7CkBAIC0yOTYsMTIgKzMwMywxNCBAQAogICAgICAgZmluYWwgUHJvamVjdENhY2hlIHByb2plY3RDYWNoZSwKICAgICAgIGZpbmFsIEdpdFJlcG9zaXRvcnlNYW5hZ2VyIHJlcG9NYW5hZ2VyLAogICAgICAgZmluYWwgVGFnQ2FjaGUgdGFnQ2FjaGUsCisgICAgICBmaW5hbCBDaGFuZ2VDYWNoZSBjaGFuZ2VDYWNoZSwKICAgICAgIEBDYW5vbmljYWxXZWJVcmwgQE51bGxhYmxlIGZpbmFsIFN0cmluZyBjYW5vbmljYWxXZWJVcmwsCiAgICAgICBAR2Vycml0UGVyc29uSWRlbnQgZmluYWwgUGVyc29uSWRlbnQgZ2Vycml0SWRlbnQsCiAgICAgICBmaW5hbCBUcmFja2luZ0Zvb3RlcnMgdHJhY2tpbmdGb290ZXJzLAogICAgICAgZmluYWwgV29ya1F1ZXVlIHdvcmtRdWV1ZSwKICAgICAgIEBDaGFuZ2VVcGRhdGVFeGVjdXRvciBMaXN0ZW5pbmdFeGVjdXRvclNlcnZpY2UgY2hhbmdlVXBkYXRlRXhlY3RvciwKICAgICAgIGZpbmFsIFJlcXVlc3RTY29wZVByb3BhZ2F0b3IgcmVxdWVzdFNjb3BlUHJvcGFnYXRvciwKKyAgICAgIGZpbmFsIFNzaEluZm8gc3NoSW5mbywKIAogICAgICAgQEFzc2lzdGVkIGZpbmFsIFByb2plY3RDb250cm9sIHByb2plY3RDb250cm9sLAogICAgICAgQEFzc2lzdGVkIGZpbmFsIFJlcG9zaXRvcnkgcmVwbywKQEAgLTMyMyw5ICszMzIsMTEgQEAKICAgICB0aGlzLmdlcnJpdElkZW50ID0gZ2Vycml0SWRlbnQ7CiAgICAgdGhpcy50cmFja2luZ0Zvb3RlcnMgPSB0cmFja2luZ0Zvb3RlcnM7CiAgICAgdGhpcy50YWdDYWNoZSA9IHRhZ0NhY2hlOworICAgIHRoaXMuY2hhbmdlQ2FjaGUgPSBjaGFuZ2VDYWNoZTsKICAgICB0aGlzLndvcmtRdWV1ZSA9IHdvcmtRdWV1ZTsKICAgICB0aGlzLmNoYW5nZVVwZGF0ZUV4ZWN0b3IgPSBjaGFuZ2VVcGRhdGVFeGVjdG9yOwogICAgIHRoaXMucmVxdWVzdFNjb3BlUHJvcGFnYXRvciA9IHJlcXVlc3RTY29wZVByb3BhZ2F0b3I7CisgICAgdGhpcy5zc2hJbmZvID0gc3NoSW5mbzsKIAogICAgIHRoaXMucHJvamVjdENvbnRyb2wgPSBwcm9qZWN0Q29udHJvbDsKICAgICB0aGlzLnByb2plY3QgPSBwcm9qZWN0Q29udHJvbC5nZXRQcm9qZWN0KCk7CkBAIC0zNDQsNyArMzU1LDcgQEAKIAogICAgIGlmICghcHJvamVjdENvbnRyb2wuYWxsUmVmc0FyZVZpc2libGUoKSkgewogICAgICAgcnAuc2V0Q2hlY2tSZWZlcmVuY2VkT2JqZWN0c0FyZVJlYWNoYWJsZSh0cnVlKTsKLSAgICAgIHJwLnNldEFkdmVydGlzZVJlZnNIb29rKG5ldyBWaXNpYmxlUmVmRmlsdGVyKHRhZ0NhY2hlLCByZXBvLCBwcm9qZWN0Q29udHJvbCwgZGIsIGZhbHNlKSk7CisgICAgICBycC5zZXRBZHZlcnRpc2VSZWZzSG9vayhuZXcgVmlzaWJsZVJlZkZpbHRlcih0YWdDYWNoZSwgY2hhbmdlQ2FjaGUsIHJlcG8sIHByb2plY3RDb250cm9sLCBkYiwgZmFsc2UpKTsKICAgICB9CiAgICAgTGlzdDxBZHZlcnRpc2VSZWZzSG9vaz4gYWR2SG9va3MgPSBuZXcgQXJyYXlMaXN0PEFkdmVydGlzZVJlZnNIb29rPigyKTsKICAgICBhZHZIb29rcy5hZGQocnAuZ2V0QWR2ZXJ0aXNlUmVmc0hvb2soKSk7CkBAIC04ODgsNyArODk5LDcgQEAKICAgICAgICAgcmVqZWN0KGNtZCwgImNhbm5vdCBkZWxldGUgcHJvamVjdCBjb25maWd1cmF0aW9uIik7CiAgICAgICB9IGVsc2UgewogICAgICAgICBlcnJvcnMucHV0KEVycm9yLkRFTEVURSwgY3RsLmdldFJlZk5hbWUoKSk7Ci0gICAgICAgIHJlamVjdChjbWQsICJjYW4gbm90IGRlbGV0ZSByZWZlcmVuY2VzIik7CisgICAgICAgIHJlamVjdChjbWQsICJjYW5ub3QgZGVsZXRlIHJlZmVyZW5jZXMiKTsKICAgICAgIH0KICAgICB9CiAgIH0KQEAgLTk4Nyw3ICs5OTgsNyBAQAogICAgIGRlc3RCcmFuY2hDdGwgPSBwcm9qZWN0Q29udHJvbC5jb250cm9sRm9yUmVmKGRlc3RCcmFuY2gpOwogICAgIGlmICghZGVzdEJyYW5jaEN0bC5jYW5VcGxvYWQoKSkgewogICAgICAgZXJyb3JzLnB1dChFcnJvci5DT0RFX1JFVklFVywgY21kLmdldFJlZk5hbWUoKSk7Ci0gICAgICByZWplY3QoY21kLCAiY2FuIG5vdCB1cGxvYWQgcmV2aWV3Iik7CisgICAgICByZWplY3QoY21kLCAiY2Fubm90IHVwbG9hZCByZXZpZXciKTsKICAgICAgIHJldHVybjsKICAgICB9CiAKQEAgLTIwMjIsNiArMjAzMyw3NiBAQAogICAgIHJldHVybiB0cnVlOwogICB9CiAKKyAgLyoqCisgICAqIEdldCB0aGUgR2Vycml0IGhvc3RuYW1lLgorICAgKiBAcmV0dXJuIHRoZSBob3N0bmFtZSBmcm9tIHRoZSBjYW5vbmljYWwgVVJMIGlmIGl0IGlzIGNvbmZpZ3VyZWQsCisgICAqIG90aGVyd2lzZSB3aGF0ZXZlciB0aGUgT1Mgc2F5cyB0aGUgaG9zdG5hbWUgaXMuCisgICAqLworICBwcml2YXRlIFN0cmluZyBnZXRHZXJyaXRIb3N0KCkgeworICAgIFN0cmluZyBob3N0OworICAgIGlmIChjYW5vbmljYWxXZWJVcmwgIT0gbnVsbCkgeworICAgICAgdHJ5IHsKKyAgICAgICAgaG9zdCA9IG5ldyBVUkwoY2Fub25pY2FsV2ViVXJsKS5nZXRIb3N0KCk7CisgICAgICB9IGNhdGNoIChNYWxmb3JtZWRVUkxFeGNlcHRpb24gZSkgeworICAgICAgICBob3N0ID0gU3lzdGVtUmVhZGVyLmdldEluc3RhbmNlKCkuZ2V0SG9zdG5hbWUoKTsKKyAgICAgIH0KKyAgICB9IGVsc2UgeworICAgICAgaG9zdCA9IFN5c3RlbVJlYWRlci5nZXRJbnN0YW5jZSgpLmdldEhvc3RuYW1lKCk7CisgICAgfQorICAgIHJldHVybiBob3N0OworICB9CisKKyAgLyoqCisgICAqIEdldCB0aGUgR2Vycml0IFVSTC4KKyAgICogQHJldHVybiB0aGUgY2Fub25pY2FsIFVSTCAod2l0aCBhbnkgdHJhaWxpbmcgc2xhc2ggcmVtb3ZlZCkgaWYgaXQgaXMKKyAgICogY29uZmlndXJlZCwgb3RoZXJ3aXNlIGZhbGwgYmFjayB0byAiaHR0cDovL2hvc3RuYW1lIiB3aGVyZSBob3N0bmFtZSBpcworICAgKiB0aGUgdmFsdWUgcmV0dXJuZWQgYnkge0BsaW5rICNnZXRHZXJyaXRIb3N0KCl9LgorICAgKi8KKyAgcHJpdmF0ZSBTdHJpbmcgZ2V0R2Vycml0VXJsKCkgeworICAgIGlmIChjYW5vbmljYWxXZWJVcmwgIT0gbnVsbCkgeworICAgICAgaWYgKGNhbm9uaWNhbFdlYlVybC5lbmRzV2l0aCgiLyIpKSB7CisgICAgICAgIHJldHVybiBjYW5vbmljYWxXZWJVcmwuc3Vic3RyaW5nKDAsIGNhbm9uaWNhbFdlYlVybC5sYXN0SW5kZXhPZigiLyIpKTsKKyAgICAgIH0KKyAgICAgIHJldHVybiBjYW5vbmljYWxXZWJVcmw7CisgICAgfSBlbHNlIHsKKyAgICAgIHJldHVybiAiaHR0cDovLyIgKyBnZXRHZXJyaXRIb3N0KCk7CisgICAgfQorICB9CisKKyAgLyoqCisgICAqIEdldCB0aGUgdGV4dCB3aXRoIGluc3RydWN0aW9ucyBmb3IgaW5zdGFsbGluZyB0aGUgY29tbWl0LW1zZyBob29rLCBzcGVjaWZpYworICAgKiB0byB0aGUgc2VydmVyIGhvc3RuYW1lIGFuZCB0cmFuc3BvcnQgcHJvdG9jb2wuCisgICAqIEByZXR1cm4gY29tbWl0LW1zZyBob29rIGluc3RhbGxhdGlvbiBpbnN0cnVjdGlvbnMgYXMgYSBTdHJpbmcuCisgICAqLworICBwcml2YXRlIFN0cmluZyBnZXRDb21taXRNZXNzYWdlSG9va0luc3RhbGxhdGlvbkhpbnQoKSB7CisgICAgZmluYWwgTGlzdDxIb3N0S2V5PiBob3N0S2V5cyA9IHNzaEluZm8uZ2V0SG9zdEtleXMoKTsKKworICAgIC8vIElmIHRoZXJlIGFyZSBubyBTU0gga2V5cywgdGhlIGNvbW1pdC1tc2cgaG9vayBtdXN0IGJlIGluc3RhbGxlZCB2aWEgSFRUUChTKQorICAgIGlmIChob3N0S2V5cy5pc0VtcHR5KCkpIHsKKyAgICAgIHJldHVybiAiJCBjdXJsIC1vIC5naXQvaG9va3MvY29tbWl0LW1zZyAiICsgZ2V0R2Vycml0VXJsKCkgKyAiL3Rvb2xzL2hvb2tzL2NvbW1pdC1tc2dcbiIKKyAgICAgICAgICArICIkIGNobW9kICt4IC5naXQvaG9va3MvY29tbWl0LW1zZyI7CisgICAgfQorCisgICAgLy8gU1NIIGtleXMgZXhpc3QsIHNvIHRoZSBob29rIGNhbiBiZSBpbnN0YWxsZWQgd2l0aCBzY3AuCisgICAgU3RyaW5nIHNzaEhvc3Q7CisgICAgaW50IHNzaFBvcnQ7CisgICAgU3RyaW5nIGhvc3QgPSBob3N0S2V5cy5nZXQoMCkuZ2V0SG9zdCgpOworICAgIGludCBjID0gaG9zdC5sYXN0SW5kZXhPZignOicpOworICAgIGlmICgwIDw9IGMpIHsKKyAgICAgIGlmIChob3N0LnN0YXJ0c1dpdGgoIio6IikpIHsKKyAgICAgICAgc3NoSG9zdCA9IGdldEdlcnJpdEhvc3QoKTsKKyAgICAgIH0gZWxzZSB7CisgICAgICAgIHNzaEhvc3QgPSBob3N0LnN1YnN0cmluZygwLCBjKTsKKyAgICAgIH0KKyAgICAgIHNzaFBvcnQgPSBJbnRlZ2VyLnBhcnNlSW50KGhvc3Quc3Vic3RyaW5nKGMrMSkpOworICAgIH0gZWxzZSB7CisgICAgICBzc2hIb3N0ID0gaG9zdDsKKyAgICAgIHNzaFBvcnQgPSAyMjsKKyAgICB9CisKKyAgICByZXR1cm4gIiQgc2NwIC1wIC1QICIgKyBzc2hQb3J0ICsgIiAiICsgY3VycmVudFVzZXIuZ2V0VXNlck5hbWUoKSArICJAIiArIHNzaEhvc3QgKyAiOmhvb2tzL2NvbW1pdC1tc2cgLmdpdC9ob29rcy8iOworICB9CisKICAgcHJpdmF0ZSBTdHJpbmcgZ2V0Rml4ZWRDb21taXRNc2dXaXRoQ2hhbmdlSWQoU3RyaW5nIGVyck1zZywgUmV2Q29tbWl0IGMpIHsKICAgICAvLyBXZSBoYW5kbGUgMyBjYXNlczoKICAgICAvLyAxLiBObyBjaGFuZ2UgaWQgaW4gdGhlIGNvbW1pdCBtZXNzYWdlIGF0IGFsbC4KQEAgLTIwNTYsNiArMjEzNyw5IEBACiAgICAgICAgIHNiLmFwcGVuZCgiXG5IaW50OiBBIHBvdGVudGlhbCBDaGFuZ2UtSWQgd2FzIGZvdW5kLCBidXQgaXQgd2FzIG5vdCBpbiB0aGUgZm9vdGVyIG9mIHRoZSBjb21taXQgbWVzc2FnZS4iKTsKICAgICAgIH0KICAgICB9CisgICAgc2IuYXBwZW5kKCJcbiIpOworICAgIHNiLmFwcGVuZCgiSGludDogVG8gYXV0b21hdGljYWxseSBhZGQgYSBDaGFuZ2UtSWQgdG8gY29tbWl0IG1lc3NhZ2VzLCBpbnN0YWxsIHRoZSBjb21taXQtbXNnIGhvb2s6XG4iKTsKKyAgICBzYi5hcHBlbmQoZ2V0Q29tbWl0TWVzc2FnZUhvb2tJbnN0YWxsYXRpb25IaW50KCkpOwogCiAgICAgcmV0dXJuIHNiLnRvU3RyaW5nKCk7CiAgIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L1N1Ym1pdFN0cmF0ZWd5LmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9TdWJtaXRTdHJhdGVneS5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmU0ZGE0NmQKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9TdWJtaXRTdHJhdGVneS5qYXZhCkBAIC0wLDAgKzEsMTg3IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdDsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5CcmFuY2g7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXRBcHByb3ZhbDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUHJvamVjdC5TdWJtaXRUeXBlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLnNlcnZlci5SZXZpZXdEYjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuSWRlbnRpZmllZFVzZXI7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5PYmplY3RJbnNlcnRlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5QZXJzb25JZGVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5SZWZVcGRhdGU7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuUmVwb3NpdG9yeTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LnJldndhbGsuUmV2Q29tbWl0OworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQucmV2d2Fsay5SZXZGbGFnOworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQucmV2d2Fsay5SZXZXYWxrOworCitpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb25zOworaW1wb3J0IGphdmEudXRpbC5MaXN0OworaW1wb3J0IGphdmEudXRpbC5NYXA7CitpbXBvcnQgamF2YS51dGlsLlNldDsKKworLyoqCisgKiBCYXNlIGNsYXNzIHRoYXQgc3VibWl0IHN0cmF0ZWdpZXMgbXVzdCBleHRlbmQuIEEgc3VibWl0IHN0cmF0ZWd5IGZvciBhCisgKiBjZXJ0YWluIHtAbGluayBTdWJtaXRUeXBlfSBkZWZpbmVzIGhvdyB0aGUgc3VibWl0dGVkIGNvbW1pdHMgc2hvdWxkIGJlCisgKiBtZXJnZWQuCisgKi8KK3B1YmxpYyBhYnN0cmFjdCBjbGFzcyBTdWJtaXRTdHJhdGVneSB7CisKKyAgcHJpdmF0ZSBQZXJzb25JZGVudCByZWZMb2dJZGVudDsKKworICBzdGF0aWMgY2xhc3MgQXJndW1lbnRzIHsKKyAgICBwcm90ZWN0ZWQgZmluYWwgSWRlbnRpZmllZFVzZXIuR2VuZXJpY0ZhY3RvcnkgaWRlbnRpZmllZFVzZXJGYWN0b3J5OworICAgIHByb3RlY3RlZCBmaW5hbCBQZXJzb25JZGVudCBteUlkZW50OworICAgIHByb3RlY3RlZCBmaW5hbCBSZXZpZXdEYiBkYjsKKworICAgIHByb3RlY3RlZCBmaW5hbCBSZXBvc2l0b3J5IHJlcG87CisgICAgcHJvdGVjdGVkIGZpbmFsIFJldldhbGsgcnc7CisgICAgcHJvdGVjdGVkIGZpbmFsIE9iamVjdEluc2VydGVyIGluc2VydGVyOworICAgIHByb3RlY3RlZCBmaW5hbCBSZXZGbGFnIGNhbk1lcmdlRmxhZzsKKyAgICBwcm90ZWN0ZWQgZmluYWwgU2V0PFJldkNvbW1pdD4gYWxyZWFkeUFjY2VwdGVkOworICAgIHByb3RlY3RlZCBmaW5hbCBCcmFuY2guTmFtZUtleSBkZXN0QnJhbmNoOworICAgIHByb3RlY3RlZCBmaW5hbCBib29sZWFuIHVzZUNvbnRlbnRNZXJnZTsKKyAgICBwcm90ZWN0ZWQgZmluYWwgTWVyZ2VTb3J0ZXIgbWVyZ2VTb3J0ZXI7CisKKyAgICBBcmd1bWVudHMoZmluYWwgSWRlbnRpZmllZFVzZXIuR2VuZXJpY0ZhY3RvcnkgaWRlbnRpZmllZFVzZXJGYWN0b3J5LAorICAgICAgICBmaW5hbCBQZXJzb25JZGVudCBteUlkZW50LCBmaW5hbCBSZXZpZXdEYiBkYiwgZmluYWwgUmVwb3NpdG9yeSByZXBvLAorICAgICAgICBmaW5hbCBSZXZXYWxrIHJ3LCBmaW5hbCBPYmplY3RJbnNlcnRlciBpbnNlcnRlciwKKyAgICAgICAgZmluYWwgUmV2RmxhZyBjYW5NZXJnZUZsYWcsIGZpbmFsIFNldDxSZXZDb21taXQ+IGFscmVhZHlBY2NlcHRlZCwKKyAgICAgICAgZmluYWwgQnJhbmNoLk5hbWVLZXkgZGVzdEJyYW5jaCwgZmluYWwgYm9vbGVhbiB1c2VDb250ZW50TWVyZ2UpIHsKKyAgICAgIHRoaXMuaWRlbnRpZmllZFVzZXJGYWN0b3J5ID0gaWRlbnRpZmllZFVzZXJGYWN0b3J5OworICAgICAgdGhpcy5teUlkZW50ID0gbXlJZGVudDsKKyAgICAgIHRoaXMuZGIgPSBkYjsKKworICAgICAgdGhpcy5yZXBvID0gcmVwbzsKKyAgICAgIHRoaXMucncgPSBydzsKKyAgICAgIHRoaXMuaW5zZXJ0ZXIgPSBpbnNlcnRlcjsKKyAgICAgIHRoaXMuY2FuTWVyZ2VGbGFnID0gY2FuTWVyZ2VGbGFnOworICAgICAgdGhpcy5hbHJlYWR5QWNjZXB0ZWQgPSBhbHJlYWR5QWNjZXB0ZWQ7CisgICAgICB0aGlzLmRlc3RCcmFuY2ggPSBkZXN0QnJhbmNoOworICAgICAgdGhpcy51c2VDb250ZW50TWVyZ2UgPSB1c2VDb250ZW50TWVyZ2U7CisgICAgICB0aGlzLm1lcmdlU29ydGVyID0gbmV3IE1lcmdlU29ydGVyKHJ3LCBhbHJlYWR5QWNjZXB0ZWQsIGNhbk1lcmdlRmxhZyk7CisgICAgfQorICB9CisKKyAgcHJvdGVjdGVkIGZpbmFsIEFyZ3VtZW50cyBhcmdzOworCisgIFN1Ym1pdFN0cmF0ZWd5KGZpbmFsIEFyZ3VtZW50cyBhcmdzKSB7CisgICAgdGhpcy5hcmdzID0gYXJnczsKKyAgfQorCisgIC8qKgorICAgKiBSdW5zIHRoaXMgc3VibWl0IHN0cmF0ZWd5LiBJZiBwb3NzaWJsZSB0aGUgcHJvdmlkZWQgY29tbWl0cyB3aWxsIGJlIG1lcmdlZAorICAgKiB3aXRoIHRoaXMgc3VibWl0IHN0cmF0ZWd5LgorICAgKgorICAgKiBAcGFyYW0gbWVyZ2VUaXAgdGhlIG1lcmdlVGlwCisgICAqIEBwYXJhbSB0b01lcmdlIHRoZSBsaXN0IG9mIHN1Ym1pdHRlZCBjb21taXRzIHRoYXQgc2hvdWxkIGJlIG1lcmdlZCB1c2luZworICAgKiAgICAgICAgdGhpcyBzdWJtaXQgc3RyYXRlZ3kKKyAgICogQHJldHVybiB0aGUgbmV3IG1lcmdlVGlwCisgICAqIEB0aHJvd3MgTWVyZ2VFeGNlcHRpb24KKyAgICovCisgIHB1YmxpYyBmaW5hbCBDb2RlUmV2aWV3Q29tbWl0IHJ1bihmaW5hbCBDb2RlUmV2aWV3Q29tbWl0IG1lcmdlVGlwLAorICAgICAgZmluYWwgTGlzdDxDb2RlUmV2aWV3Q29tbWl0PiB0b01lcmdlKSB0aHJvd3MgTWVyZ2VFeGNlcHRpb24geworICAgIHJlZkxvZ0lkZW50ID0gbnVsbDsKKyAgICByZXR1cm4gX3J1bihtZXJnZVRpcCwgdG9NZXJnZSk7CisgIH0KKworICAvKioKKyAgICogUnVucyB0aGlzIHN1Ym1pdCBzdHJhdGVneS4gSWYgcG9zc2libGUgdGhlIHByb3ZpZGVkIGNvbW1pdHMgd2lsbCBiZSBtZXJnZWQKKyAgICogd2l0aCB0aGlzIHN1Ym1pdCBzdHJhdGVneS4KKyAgICoKKyAgICogQHBhcmFtIG1lcmdlVGlwIHRoZSBtZXJnZVRpcAorICAgKiBAcGFyYW0gdG9NZXJnZSB0aGUgbGlzdCBvZiBzdWJtaXR0ZWQgY29tbWl0cyB0aGF0IHNob3VsZCBiZSBtZXJnZWQgdXNpbmcKKyAgICogICAgICAgIHRoaXMgc3VibWl0IHN0cmF0ZWd5CisgICAqIEByZXR1cm4gdGhlIG5ldyBtZXJnZVRpcAorICAgKiBAdGhyb3dzIE1lcmdlRXhjZXB0aW9uCisgICAqLworICBwcm90ZWN0ZWQgYWJzdHJhY3QgQ29kZVJldmlld0NvbW1pdCBfcnVuKENvZGVSZXZpZXdDb21taXQgbWVyZ2VUaXAsCisgICAgICBMaXN0PENvZGVSZXZpZXdDb21taXQ+IHRvTWVyZ2UpIHRocm93cyBNZXJnZUV4Y2VwdGlvbjsKKworICAvKioKKyAgICogQ2hlY2tzIHdoZXRoZXIgdGhlIGdpdmVuIGNvbW1pdCBjYW4gYmUgbWVyZ2VkLgorICAgKgorICAgKiBTdWJjbGFzc2VzIG11c3QgZW5zdXJlIHRoYXQgaW52b2tpbmcgdGhpcyBtZXRob2QgZG9lcyBuZWl0aGVyIG1vZGlmeSB0aGUKKyAgICogZ2l0IHJlcG9zaXRvcnkgbm9yIHRoZSBHZXJyaXQgZGF0YWJhc2UuCisgICAqCisgICAqIEBwYXJhbSBtZXJnZVRpcCB0aGUgbWVyZ2VUaXAKKyAgICogQHBhcmFtIHRvTWVyZ2UgdGhlIGNvbW1pdCBmb3Igd2hpY2ggaXQgc2hvdWxkIGJlIGNoZWNrZWQgd2hldGhlciBpdCBjYW4gYmUKKyAgICogICAgICAgIG1lcmdlZCBvciBub3QKKyAgICogQHJldHVybiA8Y29kZT50cnVlPC9jb2RlPiBpZiB0aGUgZ2l2ZW4gY29tbWl0IGNhbiBiZSBtZXJnZWQsIG90aGVyd2lzZQorICAgKiAgICAgICAgIDxjb2RlPmZhbHNlPC9jb2RlPgorICAgKiBAdGhyb3dzIE1lcmdlRXhjZXB0aW9uCisgICAqLworICBwdWJsaWMgYWJzdHJhY3QgYm9vbGVhbiBkcnlSdW4oQ29kZVJldmlld0NvbW1pdCBtZXJnZVRpcCwKKyAgICAgIENvZGVSZXZpZXdDb21taXQgdG9NZXJnZSkgdGhyb3dzIE1lcmdlRXhjZXB0aW9uOworCisgIC8qKgorICAgKiBSZXR1cm5zIHRoZSBQZXJzb25JZGVudCB0aGF0IHNob3VsZCBiZSB1c2VkIGZvciB0aGUgcmVmIGxvZyBlbnRyaWVzIHdoZW4KKyAgICogdXBkYXRpbmcgdGhlIGRlc3RpbmF0aW9uIGJyYW5jaC4gVGhlIHJlZiBsb2cgaWRlbnRpdHkgbWF5IGJlIHNldCBhZnRlciB0aGUKKyAgICoge0BsaW5rICNydW4oQ29kZVJldmlld0NvbW1pdCwgTGlzdCl9IG1ldGhvZCBmaW5pc2hlZC4KKyAgICoKKyAgICogRG8gb25seSBjYWxsIHRoaXMgbWV0aG9kIGFmdGVyIHRoZSB7QGxpbmsgI3J1bihDb2RlUmV2aWV3Q29tbWl0LCBMaXN0KX0KKyAgICogbWV0aG9kIGhhcyBiZWVuIGludm9rZWQuCisgICAqCisgICAqIEByZXR1cm4gdGhlIHJlZiBsb2cgaWRlbnRpdHksIG1heSBiZSA8Y29kZT5udWxsPC9jb2RlPgorICAgKi8KKyAgcHVibGljIGZpbmFsIFBlcnNvbklkZW50IGdldFJlZkxvZ0lkZW50KCkgeworICAgIHJldHVybiByZWZMb2dJZGVudDsKKyAgfQorCisgIC8qKgorICAgKiBSZXR1cm5zIGFsbCBjb21taXRzIHRoYXQgaGF2ZSBiZWVuIG5ld2x5IGNyZWF0ZWQgZm9yIHRoZSBjaGFuZ2VzIHRoYXQgYXJlCisgICAqIGdldHRpbmcgbWVyZ2VkLgorICAgKgorICAgKiBCeSBkZWZhdWx0IHRoaXMgbWV0aG9kIGlzIHJldHVybmluZyBhbiBlbXB0eSBtYXAsIGJ1dCBzdWJjbGFzc2VzIG1heQorICAgKiBvdmVyd3JpdGUgdGhpcyBtZXRob2QgdG8gcHJvdmlkZSBuZXdseSBjcmVhdGVkIGNvbW1pdHMuCisgICAqCisgICAqIERvIG9ubHkgY2FsbCB0aGlzIG1ldGhvZCBhZnRlciB0aGUge0BsaW5rICNydW4oQ29kZVJldmlld0NvbW1pdCwgTGlzdCl9CisgICAqIG1ldGhvZCBoYXMgYmVlbiBpbnZva2VkLgorICAgKgorICAgKiBAcmV0dXJuIG5ldyBjb21taXRzIGNyZWF0ZWQgZm9yIGNoYW5nZXMgdGhhdCBhcmUgZ2V0dGluZyBtZXJnZWQKKyAgICovCisgIHB1YmxpYyBNYXA8Q2hhbmdlLklkLCBDb2RlUmV2aWV3Q29tbWl0PiBnZXROZXdDb21taXRzKCkgeworICAgIHJldHVybiBDb2xsZWN0aW9ucy5lbXB0eU1hcCgpOworICB9CisKKyAgLyoqCisgICAqIFJldHVybnMgd2hldGhlciBhIG1lcmdlIHRoYXQgZmFpbGVkIHdpdGgKKyAgICoge0BsaW5rIFJlZlVwZGF0ZS5SZXN1bHQjTE9DS19GQUlMVVJFfSBzaG91bGQgYmUgcmV0cmllZC4KKyAgICoKKyAgICogTWF5IGJlIG92ZXJ3cml0dGVuIGJ5IHN1YmNsYXNzZXMuCisgICAqCisgICAqIEByZXR1cm4gPGNvZGU+dHJ1ZTwvY29kZT4gaWYgYSBtZXJnZSB0aGF0IGZhaWxlZCB3aXRoCisgICAqICAgICAgICAge0BsaW5rIFJlZlVwZGF0ZS5SZXN1bHQjTE9DS19GQUlMVVJFfSBzaG91bGQgYmUgcmV0cmllZCwgb3RoZXJ3aXNlCisgICAqICAgICAgICAgPGNvZGU+ZmFsc2U8L2NvZGU+CisgICAqLworICBwdWJsaWMgYm9vbGVhbiByZXRyeU9uTG9ja0ZhaWx1cmUoKSB7CisgICAgcmV0dXJuIHRydWU7CisgIH0KKworICAvKioKKyAgICogU2V0cyB0aGUgcmVmIGxvZyBpZGVudGl0eSBpZiBpdCB3YXNuJ3Qgc2V0IHlldC4KKyAgICoKKyAgICogQHBhcmFtIHN1Ym1pdEFwcHJvdmFsIHRoZSBhcHByb3ZhbCB0aGF0IHN1Ym1pdHRlZCB0aGUgcGF0Y2ggc2V0CisgICAqLworICBwcm90ZWN0ZWQgZmluYWwgdm9pZCBzZXRSZWZMb2dJZGVudChmaW5hbCBQYXRjaFNldEFwcHJvdmFsIHN1Ym1pdEFwcHJvdmFsKSB7CisgICAgaWYgKHJlZkxvZ0lkZW50ID09IG51bGwgJiYgc3VibWl0QXBwcm92YWwgIT0gbnVsbCkgeworICAgICAgcmVmTG9nSWRlbnQgPQorICAgICAgICAgIGFyZ3MuaWRlbnRpZmllZFVzZXJGYWN0b3J5LmNyZWF0ZShzdWJtaXRBcHByb3ZhbC5nZXRBY2NvdW50SWQoKSkKKyAgICAgICAgICAgICAgLm5ld1JlZkxvZ0lkZW50KCk7CisgICAgfQorICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9TdWJtaXRTdHJhdGVneUZhY3RvcnkuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L1N1Ym1pdFN0cmF0ZWd5RmFjdG9yeS5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmM1YTk5MGEKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9TdWJtaXRTdHJhdGVneUZhY3RvcnkuamF2YQpAQCAtMCwwICsxLDEwMCBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQ7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5BcHByb3ZhbFR5cGVzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5CcmFuY2g7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlByb2plY3QuU3VibWl0VHlwZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5zZXJ2ZXIuUmV2aWV3RGI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLkdlcnJpdFBlcnNvbklkZW50OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5JZGVudGlmaWVkVXNlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY2hhbmdlZGV0YWlsLlJlYmFzZUNoYW5nZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLkNhbm9uaWNhbFdlYlVybDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZXh0ZW5zaW9ucy5ldmVudHMuR2l0UmVmZXJlbmNlVXBkYXRlZDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucGF0Y2guUGF0Y2hTZXRJbmZvRmFjdG9yeTsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuUHJvdmlkZXI7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5PYmplY3RJbnNlcnRlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5QZXJzb25JZGVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5SZXBvc2l0b3J5OworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQucmV2d2Fsay5SZXZDb21taXQ7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5yZXZ3YWxrLlJldkZsYWc7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5yZXZ3YWxrLlJldldhbGs7CitpbXBvcnQgb3JnLnNsZjRqLkxvZ2dlcjsKK2ltcG9ydCBvcmcuc2xmNGouTG9nZ2VyRmFjdG9yeTsKKworaW1wb3J0IGphdmEudXRpbC5TZXQ7CisKK2ltcG9ydCBqYXZheC5hbm5vdGF0aW9uLk51bGxhYmxlOworCisvKiogRmFjdG9yeSB0byBjcmVhdGUgYSB7QGxpbmsgU3VibWl0U3RyYXRlZ3l9IGZvciBhIHtAbGluayBTdWJtaXRUeXBlfS4gKi8KK3B1YmxpYyBjbGFzcyBTdWJtaXRTdHJhdGVneUZhY3RvcnkgeworICBwcml2YXRlIHN0YXRpYyBmaW5hbCBMb2dnZXIgbG9nID0gTG9nZ2VyRmFjdG9yeQorICAgICAgLmdldExvZ2dlcihTdWJtaXRTdHJhdGVneUZhY3RvcnkuY2xhc3MpOworCisgIHByaXZhdGUgZmluYWwgSWRlbnRpZmllZFVzZXIuR2VuZXJpY0ZhY3RvcnkgaWRlbnRpZmllZFVzZXJGYWN0b3J5OworICBwcml2YXRlIGZpbmFsIFBlcnNvbklkZW50IG15SWRlbnQ7CisgIHByaXZhdGUgZmluYWwgUGF0Y2hTZXRJbmZvRmFjdG9yeSBwYXRjaFNldEluZm9GYWN0b3J5OworICBwcml2YXRlIGZpbmFsIFByb3ZpZGVyPFN0cmluZz4gdXJsUHJvdmlkZXI7CisgIHByaXZhdGUgZmluYWwgQXBwcm92YWxUeXBlcyBhcHByb3ZhbFR5cGVzOworICBwcml2YXRlIGZpbmFsIEdpdFJlZmVyZW5jZVVwZGF0ZWQgcmVwbGljYXRpb247CisgIHByaXZhdGUgZmluYWwgUmViYXNlQ2hhbmdlLkZhY3RvcnkgcmViYXNlQ2hhbmdlRmFjdG9yeTsKKworICBASW5qZWN0CisgIFN1Ym1pdFN0cmF0ZWd5RmFjdG9yeSgKKyAgICAgIGZpbmFsIElkZW50aWZpZWRVc2VyLkdlbmVyaWNGYWN0b3J5IGlkZW50aWZpZWRVc2VyRmFjdG9yeSwKKyAgICAgIEBHZXJyaXRQZXJzb25JZGVudCBmaW5hbCBQZXJzb25JZGVudCBteUlkZW50LAorICAgICAgZmluYWwgUGF0Y2hTZXRJbmZvRmFjdG9yeSBwYXRjaFNldEluZm9GYWN0b3J5LAorICAgICAgQENhbm9uaWNhbFdlYlVybCBATnVsbGFibGUgZmluYWwgUHJvdmlkZXI8U3RyaW5nPiB1cmxQcm92aWRlciwKKyAgICAgIGZpbmFsIEFwcHJvdmFsVHlwZXMgYXBwcm92YWxUeXBlcywgZmluYWwgR2l0UmVmZXJlbmNlVXBkYXRlZCByZXBsaWNhdGlvbiwKKyAgICAgIGZpbmFsIFJlYmFzZUNoYW5nZS5GYWN0b3J5IHJlYmFzZUNoYW5nZUZhY3RvcnkpIHsKKyAgICB0aGlzLmlkZW50aWZpZWRVc2VyRmFjdG9yeSA9IGlkZW50aWZpZWRVc2VyRmFjdG9yeTsKKyAgICB0aGlzLm15SWRlbnQgPSBteUlkZW50OworICAgIHRoaXMucGF0Y2hTZXRJbmZvRmFjdG9yeSA9IHBhdGNoU2V0SW5mb0ZhY3Rvcnk7CisgICAgdGhpcy51cmxQcm92aWRlciA9IHVybFByb3ZpZGVyOworICAgIHRoaXMuYXBwcm92YWxUeXBlcyA9IGFwcHJvdmFsVHlwZXM7CisgICAgdGhpcy5yZXBsaWNhdGlvbiA9IHJlcGxpY2F0aW9uOworICAgIHRoaXMucmViYXNlQ2hhbmdlRmFjdG9yeSA9IHJlYmFzZUNoYW5nZUZhY3Rvcnk7CisgIH0KKworICBwdWJsaWMgU3VibWl0U3RyYXRlZ3kgY3JlYXRlKGZpbmFsIFN1Ym1pdFR5cGUgc3VibWl0VHlwZSwgZmluYWwgUmV2aWV3RGIgZGIsCisgICAgICBmaW5hbCBSZXBvc2l0b3J5IHJlcG8sIGZpbmFsIFJldldhbGsgcncsIGZpbmFsIE9iamVjdEluc2VydGVyIGluc2VydGVyLAorICAgICAgZmluYWwgUmV2RmxhZyBjYW5NZXJnZUZsYWcsIGZpbmFsIFNldDxSZXZDb21taXQ+IGFscmVhZHlBY2NlcHRlZCwKKyAgICAgIGZpbmFsIEJyYW5jaC5OYW1lS2V5IGRlc3RCcmFuY2gsIGZpbmFsIGJvb2xlYW4gdXNlQ29udGVudE1lcmdlKQorICAgICAgdGhyb3dzIE1lcmdlRXhjZXB0aW9uIHsKKyAgICBmaW5hbCBTdWJtaXRTdHJhdGVneS5Bcmd1bWVudHMgYXJncyA9CisgICAgICAgIG5ldyBTdWJtaXRTdHJhdGVneS5Bcmd1bWVudHMoaWRlbnRpZmllZFVzZXJGYWN0b3J5LCBteUlkZW50LCBkYiwgcmVwbywKKyAgICAgICAgICAgIHJ3LCBpbnNlcnRlciwgY2FuTWVyZ2VGbGFnLCBhbHJlYWR5QWNjZXB0ZWQsIGRlc3RCcmFuY2gsCisgICAgICAgICAgICB1c2VDb250ZW50TWVyZ2UpOworICAgIHN3aXRjaCAoc3VibWl0VHlwZSkgeworICAgICAgY2FzZSBDSEVSUllfUElDSzoKKyAgICAgICAgcmV0dXJuIG5ldyBDaGVycnlQaWNrKGFyZ3MsIHBhdGNoU2V0SW5mb0ZhY3RvcnksIHVybFByb3ZpZGVyLAorICAgICAgICAgICAgYXBwcm92YWxUeXBlcywgcmVwbGljYXRpb24pOworICAgICAgY2FzZSBGQVNUX0ZPUldBUkRfT05MWToKKyAgICAgICAgcmV0dXJuIG5ldyBGYXN0Rm9yd2FyZE9ubHkoYXJncyk7CisgICAgICBjYXNlIE1FUkdFX0FMV0FZUzoKKyAgICAgICAgcmV0dXJuIG5ldyBNZXJnZUFsd2F5cyhhcmdzKTsKKyAgICAgIGNhc2UgTUVSR0VfSUZfTkVDRVNTQVJZOgorICAgICAgICByZXR1cm4gbmV3IE1lcmdlSWZOZWNlc3NhcnkoYXJncyk7CisgICAgICBjYXNlIFJFQkFTRV9JRl9ORUNFU1NBUlk6CisgICAgICAgIHJldHVybiBuZXcgUmViYXNlSWZOZWNlc3NhcnkoYXJncywgcmViYXNlQ2hhbmdlRmFjdG9yeSk7CisgICAgICBkZWZhdWx0OgorICAgICAgICBmaW5hbCBTdHJpbmcgZXJyb3JNc2cgPSAiTm8gc3VibWl0IHN0cmF0ZWd5IGZvcjogIiArIHN1Ym1pdFR5cGU7CisgICAgICAgIGxvZy5lcnJvcihlcnJvck1zZyk7CisgICAgICAgIHRocm93IG5ldyBNZXJnZUV4Y2VwdGlvbihlcnJvck1zZyk7CisgICAgfQorICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9TdWJtb2R1bGVPcC5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvU3VibW9kdWxlT3AuamF2YQppbmRleCBjY2I5MWEzLi43MTI5Yjg2IDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9TdWJtb2R1bGVPcC5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L1N1Ym1vZHVsZU9wLmphdmEKQEAgLTIxNyw3ICsyMTcsOCBAQAogICAgICAgICAgIGZvciAoZmluYWwgQ2hhbmdlIGNoZyA6IHN1Ym1pdHRlZCkgewogICAgICAgICAgICAgZmluYWwgQ29kZVJldmlld0NvbW1pdCBjID0gY29tbWl0cy5nZXQoY2hnLmdldElkKCkpOwogICAgICAgICAgICAgaWYgKGMgIT0gbnVsbAotICAgICAgICAgICAgICAgICYmIChjLnN0YXR1c0NvZGUgPT0gQ29tbWl0TWVyZ2VTdGF0dXMuQ0xFQU5fTUVSR0UgfHwgYy5zdGF0dXNDb2RlID09IENvbW1pdE1lcmdlU3RhdHVzLkNMRUFOX1BJQ0spKSB7CisgICAgICAgICAgICAgICAgJiYgKGMuc3RhdHVzQ29kZSA9PSBDb21taXRNZXJnZVN0YXR1cy5DTEVBTl9NRVJHRQorICAgICAgICAgICAgICAgICAgICB8fCBjLnN0YXR1c0NvZGUgPT0gQ29tbWl0TWVyZ2VTdGF0dXMuQ0xFQU5fUElDSyB8fCBjLnN0YXR1c0NvZGUgPT0gQ29tbWl0TWVyZ2VTdGF0dXMuQ0xFQU5fUkVCQVNFKSkgewogICAgICAgICAgICAgICBtc2didWYgKz0gIlxuIjsKICAgICAgICAgICAgICAgbXNnYnVmICs9IGMuZ2V0RnVsbE1lc3NhZ2UoKTsKICAgICAgICAgICAgIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L1Zpc2libGVSZWZGaWx0ZXIuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L1Zpc2libGVSZWZGaWx0ZXIuamF2YQppbmRleCBiYzlkOWY3Li42ZWE1YjExIDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9WaXNpYmxlUmVmRmlsdGVyLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvVmlzaWJsZVJlZkZpbHRlci5qYXZhCkBAIC0yMiw3ICsyMiw2IEBACiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuc2VydmVyLlJldmlld0RiOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LlByb2plY3RDb250cm9sOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5Pcm1FeGNlcHRpb247Ci0KIGltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5Db25zdGFudHM7CiBpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuUmVmOwogaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLlJlcG9zaXRvcnk7CkBAIC00NCwxNiArNDMsMTkgQEAKICAgICAgIExvZ2dlckZhY3RvcnkuZ2V0TG9nZ2VyKFZpc2libGVSZWZGaWx0ZXIuY2xhc3MpOwogCiAgIHByaXZhdGUgZmluYWwgVGFnQ2FjaGUgdGFnQ2FjaGU7CisgIHByaXZhdGUgZmluYWwgQ2hhbmdlQ2FjaGUgY2hhbmdlQ2FjaGU7CiAgIHByaXZhdGUgZmluYWwgUmVwb3NpdG9yeSBkYjsKICAgcHJpdmF0ZSBmaW5hbCBQcm9qZWN0Lk5hbWVLZXkgcHJvamVjdE5hbWU7CiAgIHByaXZhdGUgZmluYWwgUHJvamVjdENvbnRyb2wgcHJvamVjdEN0bDsKICAgcHJpdmF0ZSBmaW5hbCBSZXZpZXdEYiByZXZpZXdEYjsKICAgcHJpdmF0ZSBmaW5hbCBib29sZWFuIHNob3dDaGFuZ2VzOwogCi0gIHB1YmxpYyBWaXNpYmxlUmVmRmlsdGVyKGZpbmFsIFRhZ0NhY2hlIHRhZ0NhY2hlLCBmaW5hbCBSZXBvc2l0b3J5IGRiLAorICBwdWJsaWMgVmlzaWJsZVJlZkZpbHRlcihmaW5hbCBUYWdDYWNoZSB0YWdDYWNoZSwgZmluYWwgQ2hhbmdlQ2FjaGUgY2hhbmdlQ2FjaGUsCisgICAgICBmaW5hbCBSZXBvc2l0b3J5IGRiLAogICAgICAgZmluYWwgUHJvamVjdENvbnRyb2wgcHJvamVjdENvbnRyb2wsIGZpbmFsIFJldmlld0RiIHJldmlld0RiLAogICAgICAgZmluYWwgYm9vbGVhbiBzaG93Q2hhbmdlcykgewogICAgIHRoaXMudGFnQ2FjaGUgPSB0YWdDYWNoZTsKKyAgICB0aGlzLmNoYW5nZUNhY2hlID0gY2hhbmdlQ2FjaGU7CiAgICAgdGhpcy5kYiA9IGRiOwogICAgIHRoaXMucHJvamVjdE5hbWUgPSBwcm9qZWN0Q29udHJvbC5nZXRQcm9qZWN0KCkuZ2V0TmFtZUtleSgpOwogICAgIHRoaXMucHJvamVjdEN0bCA9IHByb2plY3RDb250cm9sOwpAQCAtMTMzLDcgKzEzNSw3IEBACiAgICAgZmluYWwgUHJvamVjdCBwcm9qZWN0ID0gcHJvamVjdEN0bC5nZXRQcm9qZWN0KCk7CiAgICAgdHJ5IHsKICAgICAgIGZpbmFsIFNldDxDaGFuZ2UuSWQ+IHZpc2libGVDaGFuZ2VzID0gbmV3IEhhc2hTZXQ8Q2hhbmdlLklkPigpOwotICAgICAgZm9yIChDaGFuZ2UgY2hhbmdlIDogcmV2aWV3RGIuY2hhbmdlcygpLmJ5UHJvamVjdChwcm9qZWN0LmdldE5hbWVLZXkoKSkpIHsKKyAgICAgIGZvciAoQ2hhbmdlIGNoYW5nZSA6IGNoYW5nZUNhY2hlLmdldChwcm9qZWN0LmdldE5hbWVLZXkoKSkpIHsKICAgICAgICAgaWYgKHByb2plY3RDdGwuY29udHJvbEZvcihjaGFuZ2UpLmlzVmlzaWJsZShyZXZpZXdEYikpIHsKICAgICAgICAgICB2aXNpYmxlQ2hhbmdlcy5hZGQoY2hhbmdlLmdldElkKCkpOwogICAgICAgICB9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL21haWwvQ2hhbmdlRW1haWwuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvbWFpbC9DaGFuZ2VFbWFpbC5qYXZhCmluZGV4IDMxYzhiZDUuLjE4NjgzYWIgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvbWFpbC9DaGFuZ2VFbWFpbC5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvbWFpbC9DaGFuZ2VFbWFpbC5qYXZhCkBAIC0xMjEsMTEgKzEyMSwxNiBAQAogICAgICAgfQogICAgIH0gY2F0Y2ggKE9ybUV4Y2VwdGlvbiBlKSB7CiAgICAgfQorICAgIGZvcm1hdEZvb3RlcigpOwogICB9CiAKICAgLyoqIEZvcm1hdCB0aGUgbWVzc2FnZSBib2R5IGJ5IGNhbGxpbmcge0BsaW5rICNhcHBlbmRUZXh0KFN0cmluZyl9LiAqLwogICBwcm90ZWN0ZWQgYWJzdHJhY3Qgdm9pZCBmb3JtYXRDaGFuZ2UoKSB0aHJvd3MgRW1haWxFeGNlcHRpb247CiAKKyAgLyoqIEZvcm1hdCB0aGUgbWVzc2FnZSBmb290ZXIgYnkgY2FsbGluZyB7QGxpbmsgI2FwcGVuZFRleHQoU3RyaW5nKX0uICovCisgIHByb3RlY3RlZCB2b2lkIGZvcm1hdEZvb3RlcigpIHRocm93cyBFbWFpbEV4Y2VwdGlvbiB7CisgIH0KKwogICAvKiogU2V0dXAgdGhlIG1lc3NhZ2UgaGVhZGVycyBhbmQgZW52ZWxvcGUgKFRPLCBDQywgQkNDKS4gKi8KICAgcHJvdGVjdGVkIHZvaWQgaW5pdCgpIHRocm93cyBFbWFpbEV4Y2VwdGlvbiB7CiAgICAgaWYgKGFyZ3MucHJvamVjdENhY2hlICE9IG51bGwpIHsKZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvbWFpbC9Db21tZW50U2VuZGVyLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL21haWwvQ29tbWVudFNlbmRlci5qYXZhCmluZGV4IGU3Y2MxZmYuLmJmYmExYjMgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvbWFpbC9Db21tZW50U2VuZGVyLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9tYWlsL0NvbW1lbnRTZW5kZXIuamF2YQpAQCAtNzcsNiArNzcsMTUgQEAKICAgICBhcHBlbmRUZXh0KHZlbG9jaWZ5RmlsZSgiQ29tbWVudC52bSIpKTsKICAgfQogCisgIEBPdmVycmlkZQorICBwdWJsaWMgdm9pZCBmb3JtYXRGb290ZXIoKSB0aHJvd3MgRW1haWxFeGNlcHRpb24geworICAgIGFwcGVuZFRleHQodmVsb2NpZnlGaWxlKCJDb21tZW50Rm9vdGVyLnZtIikpOworICB9CisKKyAgcHVibGljIGJvb2xlYW4gaGFzSW5saW5lQ29tbWVudHMoKSB7CisgICAgcmV0dXJuICFpbmxpbmVDb21tZW50cy5pc0VtcHR5KCk7CisgIH0KKwogICBwdWJsaWMgU3RyaW5nIGdldElubGluZUNvbW1lbnRzKCkgewogICAgIHJldHVybiBnZXRJbmxpbmVDb21tZW50cygxKTsKICAgfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wYXRjaC9BZGRSZXZpZXdlci5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wYXRjaC9BZGRSZXZpZXdlci5qYXZhCmluZGV4IGRmOTM4NTIuLjUzZmQxODIgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcGF0Y2gvQWRkUmV2aWV3ZXIuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3BhdGNoL0FkZFJldmlld2VyLmphdmEKQEAgLTE1LDYgKzE1LDcgQEAKIAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucGF0Y2g7CiAKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uQ2hhbmdlSG9va3M7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQXBwcm92YWxUeXBlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkFwcHJvdmFsVHlwZXM7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuUmV2aWV3ZXJSZXN1bHQ7CkBAIC0yNiw2ICsyNyw3IEBACiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0QXBwcm92YWw7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuc2VydmVyLlJldmlld0RiOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5JZGVudGlmaWVkVXNlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5BY2NvdW50Q2FjaGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuQWNjb3VudFJlc29sdmVyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50Lkdyb3VwQ2FjaGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuR3JvdXBNZW1iZXJzOwpAQCAtNjQsNiArNjYsOCBAQAogICBwcml2YXRlIGZpbmFsIElkZW50aWZpZWRVc2VyLkdlbmVyaWNGYWN0b3J5IGlkZW50aWZpZWRVc2VyRmFjdG9yeTsKICAgcHJpdmF0ZSBmaW5hbCBBcHByb3ZhbENhdGVnb3J5LklkIGFkZFJldmlld2VyQ2F0ZWdvcnlJZDsKICAgcHJpdmF0ZSBmaW5hbCBDb25maWcgY2ZnOworICBwcml2YXRlIGZpbmFsIENoYW5nZUhvb2tzIGhvb2tzOworICBwcml2YXRlIGZpbmFsIEFjY291bnRDYWNoZSBhY2NvdW50Q2FjaGU7CiAKICAgcHJpdmF0ZSBmaW5hbCBDaGFuZ2UuSWQgY2hhbmdlSWQ7CiAgIHByaXZhdGUgZmluYWwgQ29sbGVjdGlvbjxTdHJpbmc+IHJldmlld2VyczsKQEAgLTc2LDcgKzgwLDkgQEAKICAgICAgIGZpbmFsIENoYW5nZUNvbnRyb2wuRmFjdG9yeSBjaGFuZ2VDb250cm9sRmFjdG9yeSwgZmluYWwgUmV2aWV3RGIgZGIsCiAgICAgICBmaW5hbCBJZGVudGlmaWVkVXNlci5HZW5lcmljRmFjdG9yeSBpZGVudGlmaWVkVXNlckZhY3RvcnksCiAgICAgICBmaW5hbCBJZGVudGlmaWVkVXNlciBjdXJyZW50VXNlciwgZmluYWwgQXBwcm92YWxUeXBlcyBhcHByb3ZhbFR5cGVzLAotICAgICAgZmluYWwgQEdlcnJpdFNlcnZlckNvbmZpZyBDb25maWcgY2ZnLCBAQXNzaXN0ZWQgZmluYWwgQ2hhbmdlLklkIGNoYW5nZUlkLAorICAgICAgZmluYWwgQEdlcnJpdFNlcnZlckNvbmZpZyBDb25maWcgY2ZnLCBmaW5hbCBDaGFuZ2VIb29rcyBob29rcywKKyAgICAgIGZpbmFsIEFjY291bnRDYWNoZSBhY2NvdW50Q2FjaGUsCisgICAgICBAQXNzaXN0ZWQgZmluYWwgQ2hhbmdlLklkIGNoYW5nZUlkLAogICAgICAgQEFzc2lzdGVkIGZpbmFsIENvbGxlY3Rpb248U3RyaW5nPiByZXZpZXdlcnMsCiAgICAgICBAQXNzaXN0ZWQgZmluYWwgYm9vbGVhbiBjb25maXJtZWQpIHsKICAgICB0aGlzLmFkZFJldmlld2VyU2VuZGVyRmFjdG9yeSA9IGFkZFJldmlld2VyU2VuZGVyRmFjdG9yeTsKQEAgLTg4LDYgKzk0LDggQEAKICAgICB0aGlzLmlkZW50aWZpZWRVc2VyRmFjdG9yeSA9IGlkZW50aWZpZWRVc2VyRmFjdG9yeTsKICAgICB0aGlzLmN1cnJlbnRVc2VyID0gY3VycmVudFVzZXI7CiAgICAgdGhpcy5jZmcgPSBjZmc7CisgICAgdGhpcy5ob29rcyA9IGhvb2tzOworICAgIHRoaXMuYWNjb3VudENhY2hlID0gYWNjb3VudENhY2hlOwogCiAgICAgZmluYWwgTGlzdDxBcHByb3ZhbFR5cGU+IGFsbFR5cGVzID0gYXBwcm92YWxUeXBlcy5nZXRBcHByb3ZhbFR5cGVzKCk7CiAgICAgYWRkUmV2aWV3ZXJDYXRlZ29yeUlkID0KQEAgLTE5Nyw3ICsyMDUsOCBAQAogICAgIC8vCiAgICAgZmluYWwgU2V0PEFjY291bnQuSWQ+IGFkZGVkID0gbmV3IEhhc2hTZXQ8QWNjb3VudC5JZD4oKTsKICAgICBmaW5hbCBMaXN0PFBhdGNoU2V0QXBwcm92YWw+IHRvSW5zZXJ0ID0gbmV3IEFycmF5TGlzdDxQYXRjaFNldEFwcHJvdmFsPigpOwotICAgIGZpbmFsIFBhdGNoU2V0LklkIHBzaWQgPSBjb250cm9sLmdldENoYW5nZSgpLmN1cnJlbnRQYXRjaFNldElkKCk7CisgICAgZmluYWwgQ2hhbmdlIGNoYW5nZSA9IGNvbnRyb2wuZ2V0Q2hhbmdlKCk7CisgICAgZmluYWwgUGF0Y2hTZXQuSWQgcHNpZCA9IGNoYW5nZS5jdXJyZW50UGF0Y2hTZXRJZCgpOwogICAgIGZvciAoZmluYWwgQWNjb3VudC5JZCByZXZpZXdlciA6IHJldmlld2VySWRzKSB7CiAgICAgICBpZiAoIWV4aXN0cyhwc2lkLCByZXZpZXdlcikpIHsKICAgICAgICAgLy8gVGhpcyByZXZpZXdlciBoYXMgbm90IGVudGVyZWQgYW4gYXBwcm92YWwgZm9yIHRoaXMgY2hhbmdlIHlldC4KQEAgLTIxMCw2ICsyMTksMTQgQEAKICAgICB9CiAgICAgZGIucGF0Y2hTZXRBcHByb3ZhbHMoKS5pbnNlcnQodG9JbnNlcnQpOwogCisgICAgLy8gRXhlY3V0ZSBob29rIGZvciBhZGRlZCByZXZpZXdlcnMKKyAgICAvLworICAgIGZpbmFsIFBhdGNoU2V0IHBhdGNoU2V0ID0gZGIucGF0Y2hTZXRzKCkuZ2V0KHBzaWQpOworICAgIGZvciAoZmluYWwgQWNjb3VudC5JZCBpZCA6IGFkZGVkKSB7CisgICAgICBmaW5hbCBBY2NvdW50IGFjY291bnQgPSBhY2NvdW50Q2FjaGUuZ2V0KGlkKS5nZXRBY2NvdW50KCk7CisgICAgICBob29rcy5kb1Jldmlld2VyQWRkZWRIb29rKGNoYW5nZSwgYWNjb3VudCwgcGF0Y2hTZXQsIGRiKTsKKyAgICB9CisKICAgICAvLyBFbWFpbCB0aGUgcmV2aWV3ZXJzCiAgICAgLy8KICAgICAvLyBUaGUgdXNlciBrbm93cyB0aGV5IGFkZGVkIHRoZW1zZWx2ZXMsIGRvbid0IGJvdGhlciBlbWFpbGluZyB0aGVtLgpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wYXRjaC9JbnRyYUxpbmVEaWZmS2V5LmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3BhdGNoL0ludHJhTGluZURpZmZLZXkuamF2YQppbmRleCA2MmVkNWU0Li41YjM3YjkyIDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3BhdGNoL0ludHJhTGluZURpZmZLZXkuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3BhdGNoL0ludHJhTGluZURpZmZLZXkuamF2YQpAQCAtODIsNiArODIsMTAgQEAKICAgICByZXR1cm4gYklkOwogICB9CiAKKyAgcHVibGljIGJvb2xlYW4gaXNJZ25vcmVXaGl0ZXNwYWNlKCkgeworICAgIHJldHVybiBpZ25vcmVXaGl0ZXNwYWNlOworICB9CisKICAgUHJvamVjdC5OYW1lS2V5IGdldFByb2plY3QoKSB7CiAgICAgcmV0dXJuIHByb2plY3RLZXk7CiAgIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcGx1Z2lucy9BdXRvUmVnaXN0ZXJNb2R1bGVzLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3BsdWdpbnMvQXV0b1JlZ2lzdGVyTW9kdWxlcy5qYXZhCmluZGV4IGU4YWYwNjAuLmVhY2RmYTAgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcGx1Z2lucy9BdXRvUmVnaXN0ZXJNb2R1bGVzLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wbHVnaW5zL0F1dG9SZWdpc3Rlck1vZHVsZXMuamF2YQpAQCAtMjk5LDcgKzI5OSw3IEBACiAgICAgcmV0dXJuIGRhdGE7CiAgIH0KIAotICBwcml2YXRlIHN0YXRpYyBjbGFzcyBDbGFzc0RhdGEgaW1wbGVtZW50cyBDbGFzc1Zpc2l0b3IgeworICBwcml2YXRlIHN0YXRpYyBjbGFzcyBDbGFzc0RhdGEgZXh0ZW5kcyBDbGFzc1Zpc2l0b3IgewogICAgIHByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZyBFWFBPUlQgPSBUeXBlLmdldFR5cGUoRXhwb3J0LmNsYXNzKS5nZXREZXNjcmlwdG9yKCk7CiAgICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgU3RyaW5nIExJU1RFTiA9IFR5cGUuZ2V0VHlwZShMaXN0ZW4uY2xhc3MpLmdldERlc2NyaXB0b3IoKTsKIApAQCAtMzA4LDYgKzMwOCwxMCBAQAogICAgIFN0cmluZyBleHBvcnRlZEFzTmFtZTsKICAgICBib29sZWFuIGxpc3RlbjsKIAorICAgIENsYXNzRGF0YSgpIHsKKyAgICAgIHN1cGVyKE9wY29kZXMuQVNNNCk7CisgICAgfQorCiAgICAgYm9vbGVhbiBpc0NvbmNyZXRlKCkgewogICAgICAgcmV0dXJuIChhY2Nlc3MgJiBPcGNvZGVzLkFDQ19BQlNUUkFDVCkgPT0gMAogICAgICAgICAgICYmIChhY2Nlc3MgJiBPcGNvZGVzLkFDQ19JTlRFUkZBQ0UpID09IDA7CkBAIC0zNzAsOCArMzc0LDEyIEBACiAgICAgfQogICB9CiAKLSAgcHJpdmF0ZSBzdGF0aWMgYWJzdHJhY3QgY2xhc3MgQWJzdHJhY3RBbm5vdGF0aW9uVmlzaXRvciBpbXBsZW1lbnRzCisgIHByaXZhdGUgc3RhdGljIGFic3RyYWN0IGNsYXNzIEFic3RyYWN0QW5ub3RhdGlvblZpc2l0b3IgZXh0ZW5kcwogICAgICAgQW5ub3RhdGlvblZpc2l0b3IgeworICAgIEFic3RyYWN0QW5ub3RhdGlvblZpc2l0b3IoKSB7CisgICAgICBzdXBlcihPcGNvZGVzLkFTTTQpOworICAgIH0KKwogICAgIEBPdmVycmlkZQogICAgIHB1YmxpYyBBbm5vdGF0aW9uVmlzaXRvciB2aXNpdEFubm90YXRpb24oU3RyaW5nIGFyZzAsIFN0cmluZyBhcmcxKSB7CiAgICAgICByZXR1cm4gbnVsbDsKZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9DaGFuZ2VDb250cm9sLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Byb2plY3QvQ2hhbmdlQ29udHJvbC5qYXZhCmluZGV4IGRiNGIwMjEuLjQ0OTQ4NTMgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9DaGFuZ2VDb250cm9sLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L0NoYW5nZUNvbnRyb2wuamF2YQpAQCAtMTYsMTQgKzE2LDEzIEBACiAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5QZXJtaXNzaW9uUmFuZ2U7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuU3VibWl0UmVjb3JkOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLlN1Ym1pdFR5cGVSZWNvcmQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0QXBwcm92YWw7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlByb2plY3Q7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuc2VydmVyLlJldmlld0RiOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJ1bGVzLlByb2xvZ0Vudmlyb25tZW50OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJ1bGVzLlN0b3JlZFZhbHVlczsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuQ3VycmVudFVzZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLklkZW50aWZpZWRVc2VyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5xdWVyeS5jaGFuZ2UuQ2hhbmdlRGF0YTsKQEAgLTMyLDIzICszMSwxOCBAQAogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlByb3ZpZGVyOwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LnV0aWwuUHJvdmlkZXJzOwogCi1pbXBvcnQgY29tLmdvb2dsZWNvZGUucHJvbG9nX2NhZmUuY29tcGlsZXIuQ29tcGlsZUV4Y2VwdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlY29kZS5wcm9sb2dfY2FmZS5sYW5nLkludGVnZXJUZXJtOwogaW1wb3J0IGNvbS5nb29nbGVjb2RlLnByb2xvZ19jYWZlLmxhbmcuTGlzdFRlcm07CiBpbXBvcnQgY29tLmdvb2dsZWNvZGUucHJvbG9nX2NhZmUubGFuZy5Qcm9sb2c7Ci1pbXBvcnQgY29tLmdvb2dsZWNvZGUucHJvbG9nX2NhZmUubGFuZy5Qcm9sb2dFeGNlcHRpb247CiBpbXBvcnQgY29tLmdvb2dsZWNvZGUucHJvbG9nX2NhZmUubGFuZy5TdHJ1Y3R1cmVUZXJtOwogaW1wb3J0IGNvbS5nb29nbGVjb2RlLnByb2xvZ19jYWZlLmxhbmcuVGVybTsKLWltcG9ydCBjb20uZ29vZ2xlY29kZS5wcm9sb2dfY2FmZS5sYW5nLlZhcmlhYmxlVGVybTsKIAogaW1wb3J0IG9yZy5zbGY0ai5Mb2dnZXI7CiBpbXBvcnQgb3JnLnNsZjRqLkxvZ2dlckZhY3Rvcnk7CiAKIGltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OwogaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uczsKLWltcG9ydCBqYXZhLnV0aWwuSGFzaFNldDsKIGltcG9ydCBqYXZhLnV0aWwuTGlzdDsKLWltcG9ydCBqYXZhLnV0aWwuU2V0OwogCiBpbXBvcnQgamF2YXguYW5ub3RhdGlvbi5OdWxsYWJsZTsKIApAQCAtMjgyLDkgKzI3NiwxMCBAQAogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgIH0KIAotICAgICAgLy8gVGhlIGJyYW5jaCBvd25lciwgcHJvamVjdCBvd25lciwgc2l0ZSBhZG1pbiBjYW4gcmVtb3ZlIGFueW9uZS4KLSAgICAgIC8vCi0gICAgICBpZiAoZ2V0UmVmQ29udHJvbCgpLmlzT3duZXIoKSAvLyBicmFuY2ggb3duZXIKKyAgICAgIC8vIFVzZXJzIHdpdGggdGhlIHJlbW92ZSByZXZpZXdlciBwZXJtaXNzaW9uLCB0aGUgYnJhbmNoIG93bmVyLCBwcm9qZWN0CisgICAgICAvLyBvd25lciBhbmQgc2l0ZSBhZG1pbiBjYW4gcmVtb3ZlIGFueW9uZQorICAgICAgaWYgKGdldFJlZkNvbnRyb2woKS5jYW5SZW1vdmVSZXZpZXdlcigpIC8vIGhhcyByZW1vdmFsIHBlcm1pc3Npb25zCisgICAgICAgICAgfHwgZ2V0UmVmQ29udHJvbCgpLmlzT3duZXIoKSAvLyBicmFuY2ggb3duZXIKICAgICAgICAgICB8fCBnZXRQcm9qZWN0Q29udHJvbCgpLmlzT3duZXIoKSAvLyBwcm9qZWN0IG93bmVyCiAgICAgICAgICAgfHwgZ2V0Q3VycmVudFVzZXIoKS5nZXRDYXBhYmlsaXRpZXMoKS5jYW5BZG1pbmlzdHJhdGVTZXJ2ZXIoKSkgewogICAgICAgICByZXR1cm4gdHJ1ZTsKQEAgLTMwMiw2ICsyOTcsNyBAQAogICAgIHJldHVybiBjYW5TdWJtaXQoZGIsIHBhdGNoU2V0LCBudWxsLCBmYWxzZSwgZmFsc2UpOwogICB9CiAKKyBAU3VwcHJlc3NXYXJuaW5ncygidW5jaGVja2VkIikKICAgcHVibGljIExpc3Q8U3VibWl0UmVjb3JkPiBjYW5TdWJtaXQoUmV2aWV3RGIgZGIsIFBhdGNoU2V0IHBhdGNoU2V0LAogICAgICAgQE51bGxhYmxlIENoYW5nZURhdGEgY2QsIGJvb2xlYW4gZmFzdEV2YWxMYWJlbHMsIGJvb2xlYW4gYWxsb3dDbG9zZWQpIHsKICAgICBpZiAoIWFsbG93Q2xvc2VkICYmIGNoYW5nZS5nZXRTdGF0dXMoKS5pc0Nsb3NlZCgpKSB7CkBAIC0zMzMsMTAzICszMjksMTggQEAKICAgICAgIHJldHVybiBsb2dSdWxlRXJyb3IoIkNhbm5vdCByZWFkIHBhdGNoIHNldCAiICsgcGF0Y2hTZXQuZ2V0SWQoKSwgZXJyKTsKICAgICB9CiAKLSAgICBMaXN0PFRlcm0+IHJlc3VsdHMgPSBuZXcgQXJyYXlMaXN0PFRlcm0+KCk7Ci0gICAgVGVybSBzdWJtaXRSdWxlOwotICAgIFByb2plY3RTdGF0ZSBwcm9qZWN0U3RhdGUgPSBnZXRQcm9qZWN0Q29udHJvbCgpLmdldFByb2plY3RTdGF0ZSgpOwotICAgIFByb2xvZ0Vudmlyb25tZW50IGVudjsKLQorICAgIExpc3Q8VGVybT4gcmVzdWx0czsKKyAgICBTdWJtaXRSdWxlRXZhbHVhdG9yIGV2YWx1YXRvcjsKICAgICB0cnkgewotICAgICAgZW52ID0gcHJvamVjdFN0YXRlLm5ld1Byb2xvZ0Vudmlyb25tZW50KCk7Ci0gICAgfSBjYXRjaCAoQ29tcGlsZUV4Y2VwdGlvbiBlcnIpIHsKLSAgICAgIHJldHVybiBsb2dSdWxlRXJyb3IoIkNhbm5vdCBjb25zdWx0IHJ1bGVzLnBsIGZvciAiCi0gICAgICAgICAgKyBnZXRQcm9qZWN0KCkuZ2V0TmFtZSgpLCBlcnIpOwotICAgIH0KLQotICAgIHRyeSB7Ci0gICAgICBlbnYuc2V0KFN0b3JlZFZhbHVlcy5SRVZJRVdfREIsIGRiKTsKLSAgICAgIGVudi5zZXQoU3RvcmVkVmFsdWVzLkNIQU5HRSwgY2hhbmdlKTsKLSAgICAgIGVudi5zZXQoU3RvcmVkVmFsdWVzLkNIQU5HRV9EQVRBLCBjZCk7Ci0gICAgICBlbnYuc2V0KFN0b3JlZFZhbHVlcy5QQVRDSF9TRVQsIHBhdGNoU2V0KTsKLSAgICAgIGVudi5zZXQoU3RvcmVkVmFsdWVzLkNIQU5HRV9DT05UUk9MLCB0aGlzKTsKLQotICAgICAgc3VibWl0UnVsZSA9IGVudi5vbmNlKAotICAgICAgICAiZ2Vycml0IiwgImxvY2F0ZV9zdWJtaXRfcnVsZSIsCi0gICAgICAgIG5ldyBWYXJpYWJsZVRlcm0oKSk7Ci0gICAgICBpZiAoc3VibWl0UnVsZSA9PSBudWxsKSB7Ci0gICAgICAgIHJldHVybiBsb2dSdWxlRXJyb3IoIk5vIHVzZXI6c3VibWl0X3J1bGUgZm91bmQgZm9yICIKLSAgICAgICAgICAgICsgZ2V0UHJvamVjdCgpLmdldE5hbWUoKSk7Ci0gICAgICB9Ci0KLSAgICAgIGlmIChmYXN0RXZhbExhYmVscykgewotICAgICAgICBlbnYub25jZSgiZ2Vycml0IiwgImFzc3VtZV9yYW5nZV9mcm9tX2xhYmVsIik7Ci0gICAgICB9Ci0KLSAgICAgIHRyeSB7Ci0gICAgICAgIGZvciAoVGVybVtdIHRlbXBsYXRlIDogZW52LmFsbCgKLSAgICAgICAgICAgICJnZXJyaXQiLCAiY2FuX3N1Ym1pdCIsCi0gICAgICAgICAgICBzdWJtaXRSdWxlLAotICAgICAgICAgICAgbmV3IFZhcmlhYmxlVGVybSgpKSkgewotICAgICAgICAgIHJlc3VsdHMuYWRkKHRlbXBsYXRlWzFdKTsKLSAgICAgICAgfQotICAgICAgfSBjYXRjaCAoUHJvbG9nRXhjZXB0aW9uIGVycikgewotICAgICAgICByZXR1cm4gbG9nUnVsZUVycm9yKCJFeGNlcHRpb24gY2FsbGluZyAiICsgc3VibWl0UnVsZSArICIgb24gY2hhbmdlICIKLSAgICAgICAgICAgICsgY2hhbmdlLmdldElkKCkgKyAiIG9mICIgKyBnZXRQcm9qZWN0KCkuZ2V0TmFtZSgpLCBlcnIpOwotICAgICAgfSBjYXRjaCAoUnVudGltZUV4Y2VwdGlvbiBlcnIpIHsKLSAgICAgICAgcmV0dXJuIGxvZ1J1bGVFcnJvcigiRXhjZXB0aW9uIGNhbGxpbmcgIiArIHN1Ym1pdFJ1bGUgKyAiIG9uIGNoYW5nZSAiCi0gICAgICAgICAgICArIGNoYW5nZS5nZXRJZCgpICsgIiBvZiAiICsgZ2V0UHJvamVjdCgpLmdldE5hbWUoKSwgZXJyKTsKLSAgICAgIH0KLQotICAgICAgUHJvamVjdFN0YXRlIHBhcmVudFN0YXRlID0gcHJvamVjdFN0YXRlLmdldFBhcmVudFN0YXRlKCk7Ci0gICAgICBQcm9sb2dFbnZpcm9ubWVudCBjaGlsZEVudiA9IGVudjsKLSAgICAgIFNldDxQcm9qZWN0Lk5hbWVLZXk+IHByb2plY3RzU2VlbiA9IG5ldyBIYXNoU2V0PFByb2plY3QuTmFtZUtleT4oKTsKLSAgICAgIHByb2plY3RzU2Vlbi5hZGQoZ2V0UHJvamVjdCgpLmdldE5hbWVLZXkoKSk7Ci0KLSAgICAgIHdoaWxlIChwYXJlbnRTdGF0ZSAhPSBudWxsKSB7Ci0gICAgICAgIGlmICghcHJvamVjdHNTZWVuLmFkZChwYXJlbnRTdGF0ZS5nZXRQcm9qZWN0KCkuZ2V0TmFtZUtleSgpKSkgewotICAgICAgICAgIC8vcGFyZW50IGhhcyBiZWVuIHNlZW4gYmVmb3JlLCBzdG9wIHdhbGsgdXAgaW5oZXJpdGFuY2UgdHJlZQotICAgICAgICAgIGJyZWFrOwotICAgICAgICB9Ci0gICAgICAgIFByb2xvZ0Vudmlyb25tZW50IHBhcmVudEVudjsKLSAgICAgICAgdHJ5IHsKLSAgICAgICAgICBwYXJlbnRFbnYgPSBwYXJlbnRTdGF0ZS5uZXdQcm9sb2dFbnZpcm9ubWVudCgpOwotICAgICAgICB9IGNhdGNoIChDb21waWxlRXhjZXB0aW9uIGVycikgewotICAgICAgICAgIHJldHVybiBsb2dSdWxlRXJyb3IoIkNhbm5vdCBjb25zdWx0IHJ1bGVzLnBsIGZvciAiCi0gICAgICAgICAgICAgICsgcGFyZW50U3RhdGUuZ2V0UHJvamVjdCgpLmdldE5hbWUoKSwgZXJyKTsKLSAgICAgICAgfQotCi0gICAgICAgIHBhcmVudEVudi5jb3B5U3RvcmVkVmFsdWVzKGNoaWxkRW52KTsKLSAgICAgICAgVGVybSBmaWx0ZXJSdWxlID0KLSAgICAgICAgICAgIHBhcmVudEVudi5vbmNlKCJnZXJyaXQiLCAibG9jYXRlX3N1Ym1pdF9maWx0ZXIiLCBuZXcgVmFyaWFibGVUZXJtKCkpOwotICAgICAgICBpZiAoZmlsdGVyUnVsZSAhPSBudWxsKSB7Ci0gICAgICAgICAgdHJ5IHsKLSAgICAgICAgICAgIGlmIChmYXN0RXZhbExhYmVscykgewotICAgICAgICAgICAgICBlbnYub25jZSgiZ2Vycml0IiwgImFzc3VtZV9yYW5nZV9mcm9tX2xhYmVsIik7Ci0gICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgIFRlcm0gcmVzdWx0c1Rlcm0gPSB0b0xpc3RUZXJtKHJlc3VsdHMpOwotICAgICAgICAgICAgcmVzdWx0cy5jbGVhcigpOwotICAgICAgICAgICAgVGVybVtdIHRlbXBsYXRlID0gcGFyZW50RW52Lm9uY2UoCi0gICAgICAgICAgICAgICAgImdlcnJpdCIsICJmaWx0ZXJfc3VibWl0X3Jlc3VsdHMiLAotICAgICAgICAgICAgICAgIGZpbHRlclJ1bGUsCi0gICAgICAgICAgICAgICAgcmVzdWx0c1Rlcm0sCi0gICAgICAgICAgICAgICAgbmV3IFZhcmlhYmxlVGVybSgpKTsKLSAgICAgICAgICAgIEBTdXBwcmVzc1dhcm5pbmdzKCJ1bmNoZWNrZWQiKQotICAgICAgICAgICAgZmluYWwgTGlzdDw/IGV4dGVuZHMgVGVybT4gdGVybUxpc3QgPSAoKExpc3RUZXJtKSB0ZW1wbGF0ZVsyXSkudG9KYXZhKCk7Ci0gICAgICAgICAgICByZXN1bHRzLmFkZEFsbCh0ZXJtTGlzdCk7Ci0gICAgICAgICAgfSBjYXRjaCAoUHJvbG9nRXhjZXB0aW9uIGVycikgewotICAgICAgICAgICAgcmV0dXJuIGxvZ1J1bGVFcnJvcigiRXhjZXB0aW9uIGNhbGxpbmcgIiArIGZpbHRlclJ1bGUgKyAiIG9uIGNoYW5nZSAiCi0gICAgICAgICAgICAgICAgKyBjaGFuZ2UuZ2V0SWQoKSArICIgb2YgIiArIHBhcmVudFN0YXRlLmdldFByb2plY3QoKS5nZXROYW1lKCksIGVycik7Ci0gICAgICAgICAgfSBjYXRjaCAoUnVudGltZUV4Y2VwdGlvbiBlcnIpIHsKLSAgICAgICAgICAgIHJldHVybiBsb2dSdWxlRXJyb3IoIkV4Y2VwdGlvbiBjYWxsaW5nICIgKyBmaWx0ZXJSdWxlICsgIiBvbiBjaGFuZ2UgIgotICAgICAgICAgICAgICAgICsgY2hhbmdlLmdldElkKCkgKyAiIG9mICIgKyBwYXJlbnRTdGF0ZS5nZXRQcm9qZWN0KCkuZ2V0TmFtZSgpLCBlcnIpOwotICAgICAgICAgIH0KLSAgICAgICAgfQotCi0gICAgICAgIHBhcmVudFN0YXRlID0gcGFyZW50U3RhdGUuZ2V0UGFyZW50U3RhdGUoKTsKLSAgICAgICAgY2hpbGRFbnYgPSBwYXJlbnRFbnY7Ci0gICAgICB9Ci0gICAgfSBmaW5hbGx5IHsKLSAgICAgIGVudi5jbG9zZSgpOworICAgICAgZXZhbHVhdG9yID0gbmV3IFN1Ym1pdFJ1bGVFdmFsdWF0b3IoZGIsIHBhdGNoU2V0LAorICAgICAgICAgIGdldFByb2plY3RDb250cm9sKCksCisgICAgICAgICAgdGhpcywgY2hhbmdlLCBjZCwKKyAgICAgICAgICBmYXN0RXZhbExhYmVscywKKyAgICAgICAgICAibG9jYXRlX3N1Ym1pdF9ydWxlIiwgImNhbl9zdWJtaXQiLAorICAgICAgICAgICJsb2NhdGVfc3VibWl0X2ZpbHRlciIsICJmaWx0ZXJfc3VibWl0X3Jlc3VsdHMiKTsKKyAgICAgIHJlc3VsdHMgPSBldmFsdWF0b3IuZXZhbHVhdGUoKS50b0phdmEoKTsKKyAgICB9IGNhdGNoIChSdWxlRXZhbEV4Y2VwdGlvbiBlKSB7CisgICAgICByZXR1cm4gbG9nUnVsZUVycm9yKGUuZ2V0TWVzc2FnZSgpLCBlKTsKICAgICB9CiAKICAgICBpZiAocmVzdWx0cy5pc0VtcHR5KCkpIHsKQEAgLTQzNywxMiArMzQ4LDEzIEBACiAgICAgICAvLyBhdCBsZWFzdCBvbmUgcmVzdWx0IGluZm9ybWluZyB0aGUgY2FsbGVyIG9mIHRoZSBsYWJlbHMgdGhhdCBhcmUKICAgICAgIC8vIHJlcXVpcmVkIGZvciB0aGlzIGNoYW5nZSB0byBiZSBzdWJtaXR0YWJsZS4gRWFjaCBsYWJlbCB3aWxsIGluZGljYXRlCiAgICAgICAvLyB3aGV0aGVyIG9yIG5vdCB0aGF0IGlzIGFjdHVhbGx5IHBvc3NpYmxlIGdpdmVuIHRoZSBwZXJtaXNzaW9ucy4KLSAgICAgIGxvZy5lcnJvcigiU3VibWl0IHJ1bGUgIiArIHN1Ym1pdFJ1bGUgKyAiIGZvciBjaGFuZ2UgIiArIGNoYW5nZS5nZXRJZCgpCi0gICAgICAgICAgKyAiIG9mICIgKyBnZXRQcm9qZWN0KCkuZ2V0TmFtZSgpICsgIiBoYXMgbm8gc29sdXRpb24uIik7CisgICAgICBsb2cuZXJyb3IoIlN1Ym1pdCBydWxlICciICsgZXZhbHVhdG9yLmdldFN1Ym1pdFJ1bGUoKSArICInIGZvciBjaGFuZ2UgIgorICAgICAgICAgICsgY2hhbmdlLmdldElkKCkgKyAiIG9mICIgKyBnZXRQcm9qZWN0KCkuZ2V0TmFtZSgpCisgICAgICAgICAgKyAiIGhhcyBubyBzb2x1dGlvbi4iKTsKICAgICAgIHJldHVybiBydWxlRXJyb3IoIlByb2plY3Qgc3VibWl0IHJ1bGUgaGFzIG5vIHNvbHV0aW9uIik7CiAgICAgfQogCi0gICAgcmV0dXJuIHJlc3VsdHNUb1N1Ym1pdFJlY29yZChzdWJtaXRSdWxlLCByZXN1bHRzKTsKKyAgICByZXR1cm4gcmVzdWx0c1RvU3VibWl0UmVjb3JkKGV2YWx1YXRvci5nZXRTdWJtaXRSdWxlKCksIHJlc3VsdHMpOwogICB9CiAKICAgLyoqCkBAIC01MjcsNiArNDM5LDY1IEBACiAgICAgcmV0dXJuIG91dDsKICAgfQogCisgIHB1YmxpYyBTdWJtaXRUeXBlUmVjb3JkIGdldFN1Ym1pdFR5cGVSZWNvcmQoUmV2aWV3RGIgZGIsIFBhdGNoU2V0IHBhdGNoU2V0KSB7CisgICAgcmV0dXJuIGdldFN1Ym1pdFR5cGVSZWNvcmQoZGIsIHBhdGNoU2V0LCBudWxsKTsKKyAgfQorCisgIEBTdXBwcmVzc1dhcm5pbmdzKCJ1bmNoZWNrZWQiKQorICBwdWJsaWMgU3VibWl0VHlwZVJlY29yZCBnZXRTdWJtaXRUeXBlUmVjb3JkKFJldmlld0RiIGRiLCBQYXRjaFNldCBwYXRjaFNldCwKKyAgICAgIEBOdWxsYWJsZSBDaGFuZ2VEYXRhIGNkKSB7CisgICAgaWYgKCFwYXRjaFNldC5nZXRJZCgpLmVxdWFscyhjaGFuZ2UuY3VycmVudFBhdGNoU2V0SWQoKSkpIHsKKyAgICAgIHJldHVybiB0eXBlUnVsZUVycm9yKCJQYXRjaCBzZXQgIiArIHBhdGNoU2V0LmdldFBhdGNoU2V0SWQoKQorICAgICAgICAgICsgIiBpcyBub3QgY3VycmVudCIpOworICAgIH0KKworICAgIHRyeSB7CisgICAgICBpZiAoY2hhbmdlLmdldFN0YXR1cygpID09IENoYW5nZS5TdGF0dXMuRFJBRlQgJiYgIWlzRHJhZnRWaXNpYmxlKGRiLCBjZCkpIHsKKyAgICAgICAgcmV0dXJuIHR5cGVSdWxlRXJyb3IoIlBhdGNoIHNldCAiICsgcGF0Y2hTZXQuZ2V0UGF0Y2hTZXRJZCgpCisgICAgICAgICAgICArICIgbm90IGZvdW5kIik7CisgICAgICB9CisgICAgICBpZiAocGF0Y2hTZXQuaXNEcmFmdCgpICYmICFpc0RyYWZ0VmlzaWJsZShkYiwgY2QpKSB7CisgICAgICAgIHJldHVybiB0eXBlUnVsZUVycm9yKCJQYXRjaCBzZXQgIiArIHBhdGNoU2V0LmdldFBhdGNoU2V0SWQoKQorICAgICAgICAgICAgKyAiIG5vdCBmb3VuZCIpOworICAgICAgfQorICAgIH0gY2F0Y2ggKE9ybUV4Y2VwdGlvbiBlcnIpIHsKKyAgICAgIHJldHVybiBsb2dUeXBlUnVsZUVycm9yKCJDYW5ub3QgcmVhZCBwYXRjaCBzZXQgIiArIHBhdGNoU2V0LmdldElkKCksCisgICAgICAgICAgZXJyKTsKKyAgICB9CisKKyAgICBMaXN0PFN0cmluZz4gcmVzdWx0czsKKyAgICBTdWJtaXRSdWxlRXZhbHVhdG9yIGV2YWx1YXRvcjsKKyAgICB0cnkgeworICAgICAgZXZhbHVhdG9yID0gbmV3IFN1Ym1pdFJ1bGVFdmFsdWF0b3IoZGIsIHBhdGNoU2V0LAorICAgICAgICAgIGdldFByb2plY3RDb250cm9sKCksIHRoaXMsIGNoYW5nZSwgY2QsCisgICAgICAgICAgZmFsc2UsCisgICAgICAgICAgImxvY2F0ZV9zdWJtaXRfdHlwZSIsICJnZXRfc3VibWl0X3R5cGUiLAorICAgICAgICAgICJsb2NhdGVfc3VibWl0X3R5cGVfZmlsdGVyIiwgImZpbHRlcl9zdWJtaXRfdHlwZV9yZXN1bHRzIik7CisgICAgICByZXN1bHRzID0gZXZhbHVhdG9yLmV2YWx1YXRlKCkudG9KYXZhKCk7CisgICAgfSBjYXRjaCAoUnVsZUV2YWxFeGNlcHRpb24gZSkgeworICAgICAgcmV0dXJuIGxvZ1R5cGVSdWxlRXJyb3IoZS5nZXRNZXNzYWdlKCksIGUpOworICAgIH0KKworICAgIGlmIChyZXN1bHRzLmlzRW1wdHkoKSkgeworICAgICAgLy8gU2hvdWxkIG5ldmVyIG9jY3VyIGZvciBhIHdlbGwgd3JpdHRlbiBydWxlCisgICAgICBsb2cuZXJyb3IoIlN1Ym1pdCBydWxlICciICsgZXZhbHVhdG9yLmdldFN1Ym1pdFJ1bGUoKSArICInIGZvciBjaGFuZ2UgIgorICAgICAgICAgICsgY2hhbmdlLmdldElkKCkgKyAiIG9mICIgKyBnZXRQcm9qZWN0KCkuZ2V0TmFtZSgpCisgICAgICAgICAgKyAiIGhhcyBubyBzb2x1dGlvbi4iKTsKKyAgICAgIHJldHVybiB0eXBlUnVsZUVycm9yKCJQcm9qZWN0IHN1Ym1pdCBydWxlIGhhcyBubyBzb2x1dGlvbiIpOworICAgIH0KKworICAgIC8vIFRha2Ugb25seSB0aGUgZmlyc3QgcmVzdWx0IGFuZCBjb252ZXJ0IGl0IHRvIFN1Ym1pdFR5cGVSZWNvcmQKKyAgICAvLyBUaGlzIGxvZ2ljIHdpbGwgbmVlZCB0byBjaGFuZ2Ugb25jZSB3ZSBzdXBwb3J0IG11bHRpcGxlIHN1Ym1pdCB0eXBlcworICAgIC8vIGluIHRoZSBVSQorICAgIFN0cmluZyB0eXBlTmFtZSA9IHJlc3VsdHMuZ2V0KDApOworICAgIHRyeSB7CisgICAgICByZXR1cm4gU3VibWl0VHlwZVJlY29yZC5PSygKKyAgICAgICAgICBQcm9qZWN0LlN1Ym1pdFR5cGUudmFsdWVPZih0eXBlTmFtZS50b1VwcGVyQ2FzZSgpKSk7CisgICAgfSBjYXRjaCAoSWxsZWdhbEFyZ3VtZW50RXhjZXB0aW9uIGUpIHsKKyAgICAgIHJldHVybiBsb2dJbnZhbGlkVHlwZShldmFsdWF0b3IuZ2V0U3VibWl0UnVsZSgpLCB0eXBlTmFtZSk7CisgICAgfQorICB9CisKICAgcHJpdmF0ZSBMaXN0PFN1Ym1pdFJlY29yZD4gbG9nSW52YWxpZFJlc3VsdChUZXJtIHJ1bGUsIFRlcm0gcmVjb3JkKSB7CiAgICAgcmV0dXJuIGxvZ1J1bGVFcnJvcigiU3VibWl0IHJ1bGUgIiArIHJ1bGUgKyAiIGZvciBjaGFuZ2UgIiArIGNoYW5nZS5nZXRJZCgpCiAgICAgICAgICsgIiBvZiAiICsgZ2V0UHJvamVjdCgpLmdldE5hbWUoKSArICIgb3V0cHV0IGludmFsaWQgcmVzdWx0OiAiICsgcmVjb3JkKTsKQEAgLTU0OSw2ICs1MjAsMjkgQEAKICAgICByZXR1cm4gQ29sbGVjdGlvbnMuc2luZ2xldG9uTGlzdChyZWMpOwogICB9CiAKKyAgcHJpdmF0ZSBTdWJtaXRUeXBlUmVjb3JkIGxvZ0ludmFsaWRUeXBlKFRlcm0gcnVsZSwgU3RyaW5nIHJlY29yZCkgeworICAgIHJldHVybiBsb2dUeXBlUnVsZUVycm9yKCJTdWJtaXQgdHlwZSBydWxlICIgKyBydWxlICsgIiBmb3IgY2hhbmdlICIKKyAgICAgICAgKyBjaGFuZ2UuZ2V0SWQoKSArICIgb2YgIiArIGdldFByb2plY3QoKS5nZXROYW1lKCkKKyAgICAgICAgKyAiIG91dHB1dCBpbnZhbGlkIHJlc3VsdDogIiArIHJlY29yZCk7CisgIH0KKworICBwcml2YXRlIFN1Ym1pdFR5cGVSZWNvcmQgbG9nVHlwZVJ1bGVFcnJvcihTdHJpbmcgZXJyLCBFeGNlcHRpb24gZSkgeworICAgIGxvZy5lcnJvcihlcnIsIGUpOworICAgIHJldHVybiB0eXBlUnVsZUVycm9yKCJFcnJvciBldmFsdWF0aW5nIHByb2plY3QgdHlwZSBydWxlcywgY2hlY2sgc2VydmVyIGxvZyIpOworICB9CisKKyAgcHJpdmF0ZSBTdWJtaXRUeXBlUmVjb3JkIGxvZ1R5cGVSdWxlRXJyb3IoU3RyaW5nIGVycikgeworICAgIGxvZy5lcnJvcihlcnIpOworICAgIHJldHVybiB0eXBlUnVsZUVycm9yKCJFcnJvciBldmFsdWF0aW5nIHByb2plY3QgdHlwZSBydWxlcywgY2hlY2sgc2VydmVyIGxvZyIpOworICB9CisKKyAgcHJpdmF0ZSBTdWJtaXRUeXBlUmVjb3JkIHR5cGVSdWxlRXJyb3IoU3RyaW5nIGVycikgeworICAgIFN1Ym1pdFR5cGVSZWNvcmQgcmVjID0gbmV3IFN1Ym1pdFR5cGVSZWNvcmQoKTsKKyAgICByZWMuc3RhdHVzID0gU3VibWl0VHlwZVJlY29yZC5TdGF0dXMuUlVMRV9FUlJPUjsKKyAgICByZWMuZXJyb3JNZXNzYWdlID0gZXJyOworICAgIHJldHVybiByZWM7CisgIH0KKwogICBwcml2YXRlIHZvaWQgYXBwbGllZEJ5KFN1Ym1pdFJlY29yZC5MYWJlbCBsYWJlbCwgVGVybSBzdGF0dXMpIHsKICAgICBpZiAoc3RhdHVzLmlzU3RydWN0dXJlKCkgJiYgc3RhdHVzLmFyaXR5KCkgPT0gMSkgewogICAgICAgVGVybSB3aG8gPSBzdGF0dXMuYXJnKDApOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L0xpc3RQcm9qZWN0cy5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L0xpc3RQcm9qZWN0cy5qYXZhCmluZGV4IGU1YTExY2EuLjk4ZTBmNmMgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9MaXN0UHJvamVjdHMuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Byb2plY3QvTGlzdFByb2plY3RzLmphdmEKQEAgLTE1LDExICsxNSwxNiBAQAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdDsKIAogaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuTWFwczsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5Hcm91cFJlZmVyZW5jZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZXJyb3JzLk5vU3VjaEdyb3VwRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R3JvdXA7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlByb2plY3Q7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlByb2plY3QuTmFtZUtleTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuQ3VycmVudFVzZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLk91dHB1dEZvcm1hdDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuU3RyaW5nVXRpbDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5Hcm91cENhY2hlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50Lkdyb3VwQ29udHJvbDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LkdpdFJlcG9zaXRvcnlNYW5hZ2VyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci51dGlsLlRyZWVGb3JtYXR0ZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nc29uLnJlZmxlY3QuVHlwZVRva2VuOwpAQCAtODYsNiArOTEsOCBAQAogCiAgIHByaXZhdGUgZmluYWwgQ3VycmVudFVzZXIgY3VycmVudFVzZXI7CiAgIHByaXZhdGUgZmluYWwgUHJvamVjdENhY2hlIHByb2plY3RDYWNoZTsKKyAgcHJpdmF0ZSBmaW5hbCBHcm91cENhY2hlIGdyb3VwQ2FjaGU7CisgIHByaXZhdGUgZmluYWwgR3JvdXBDb250cm9sLkZhY3RvcnkgZ3JvdXBDb250cm9sRmFjdG9yeTsKICAgcHJpdmF0ZSBmaW5hbCBHaXRSZXBvc2l0b3J5TWFuYWdlciByZXBvTWFuYWdlcjsKICAgcHJpdmF0ZSBmaW5hbCBQcm9qZWN0Tm9kZS5GYWN0b3J5IHByb2plY3ROb2RlRmFjdG9yeTsKIApAQCAtMTE1LDEyICsxMjIsMTggQEAKIAogICBwcml2YXRlIFN0cmluZyBtYXRjaFByZWZpeDsKIAorICBAT3B0aW9uKG5hbWUgPSAiLS1oYXMtYWNsLWZvciIsIG1ldGFWYXIgPSAiR1JPVVAiLCB1c2FnZSA9CisgICAgICAiZGlzcGxheXMgb25seSBwcm9qZWN0cyBvbiB3aGljaCBhY2Nlc3MgcmlnaHRzIGZvciB0aGlzIGdyb3VwIGFyZSBkaXJlY3RseSBhc3NpZ25lZCIpCisgIHByaXZhdGUgQWNjb3VudEdyb3VwLlVVSUQgZ3JvdXBVdWlkOworCiAgIEBJbmplY3QKICAgcHJvdGVjdGVkIExpc3RQcm9qZWN0cyhDdXJyZW50VXNlciBjdXJyZW50VXNlciwgUHJvamVjdENhY2hlIHByb2plY3RDYWNoZSwKLSAgICAgIEdpdFJlcG9zaXRvcnlNYW5hZ2VyIHJlcG9NYW5hZ2VyLAotICAgICAgUHJvamVjdE5vZGUuRmFjdG9yeSBwcm9qZWN0Tm9kZUZhY3RvcnkpIHsKKyAgICAgIEdyb3VwQ2FjaGUgZ3JvdXBDYWNoZSwgR3JvdXBDb250cm9sLkZhY3RvcnkgZ3JvdXBDb250cm9sRmFjdG9yeSwKKyAgICAgIEdpdFJlcG9zaXRvcnlNYW5hZ2VyIHJlcG9NYW5hZ2VyLCBQcm9qZWN0Tm9kZS5GYWN0b3J5IHByb2plY3ROb2RlRmFjdG9yeSkgewogICAgIHRoaXMuY3VycmVudFVzZXIgPSBjdXJyZW50VXNlcjsKICAgICB0aGlzLnByb2plY3RDYWNoZSA9IHByb2plY3RDYWNoZTsKKyAgICB0aGlzLmdyb3VwQ2FjaGUgPSBncm91cENhY2hlOworICAgIHRoaXMuZ3JvdXBDb250cm9sRmFjdG9yeSA9IGdyb3VwQ29udHJvbEZhY3Rvcnk7CiAgICAgdGhpcy5yZXBvTWFuYWdlciA9IHJlcG9NYW5hZ2VyOwogICAgIHRoaXMucHJvamVjdE5vZGVGYWN0b3J5ID0gcHJvamVjdE5vZGVGYWN0b3J5OwogICB9CkBAIC0xNzUsNiArMTg4LDIyIEBACiAgICAgICAgICAgLy8KICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQorCisgICAgICAgIGZpbmFsIFByb2plY3RDb250cm9sIHBjdGwgPSBlLmNvbnRyb2xGb3IoY3VycmVudFVzZXIpOworICAgICAgICBpZiAoZ3JvdXBVdWlkICE9IG51bGwpIHsKKyAgICAgICAgICB0cnkgeworICAgICAgICAgICAgaWYgKCFncm91cENvbnRyb2xGYWN0b3J5LmNvbnRyb2xGb3IoZ3JvdXBVdWlkKS5pc1Zpc2libGUoKSkgeworICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICB9IGNhdGNoIChOb1N1Y2hHcm91cEV4Y2VwdGlvbiBleCkgeworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgfQorICAgICAgICAgIGlmICghcGN0bC5nZXRMb2NhbEdyb3VwcygpLmNvbnRhaW5zKAorICAgICAgICAgICAgICBHcm91cFJlZmVyZW5jZS5mb3JHcm91cChncm91cENhY2hlLmdldChncm91cFV1aWQpKSkpIHsKKyAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgIH0KKyAgICAgICAgfQorCiAgICAgICAgIFByb2plY3RJbmZvIGluZm8gPSBuZXcgUHJvamVjdEluZm8oKTsKICAgICAgICAgaWYgKHR5cGUgPT0gRmlsdGVyVHlwZS5QQVJFTlRfQ0FORElEQVRFUykgewogICAgICAgICAgIFByb2plY3RTdGF0ZSBwYXJlbnRTdGF0ZSA9IGUuZ2V0UGFyZW50U3RhdGUoKTsKQEAgLTE5NCw3ICsyMjMsNiBAQAogICAgICAgICAgIH0KIAogICAgICAgICB9IGVsc2UgewotICAgICAgICAgIGZpbmFsIFByb2plY3RDb250cm9sIHBjdGwgPSBlLmNvbnRyb2xGb3IoY3VycmVudFVzZXIpOwogICAgICAgICAgIGZpbmFsIGJvb2xlYW4gaXNWaXNpYmxlID0gcGN0bC5pc1Zpc2libGUoKSB8fCAoYWxsICYmIHBjdGwuaXNPd25lcigpKTsKICAgICAgICAgICBpZiAoc2hvd1RyZWUgJiYgIWZvcm1hdC5pc0pzb24oKSkgewogICAgICAgICAgICAgdHJlZU1hcC5wdXQocHJvamVjdE5hbWUsCmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Byb2plY3QvUHJvamVjdENvbnRyb2wuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9Qcm9qZWN0Q29udHJvbC5qYXZhCmluZGV4IDUxM2YxYjEuLmI2ZDUzZTMgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9Qcm9qZWN0Q29udHJvbC5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9Qcm9qZWN0Q29udHJvbC5qYXZhCkBAIC0xMjAsNiArMTIwLDcgQEAKICAgcHJpdmF0ZSBmaW5hbCBDb2xsZWN0aW9uPENvbnRyaWJ1dG9yQWdyZWVtZW50PiBjb250cmlidXRvckFncmVlbWVudHM7CiAKICAgcHJpdmF0ZSBMaXN0PFNlY3Rpb25NYXRjaGVyPiBhbGxTZWN0aW9uczsKKyAgcHJpdmF0ZSBMaXN0PFNlY3Rpb25NYXRjaGVyPiBsb2NhbFNlY3Rpb25zOwogICBwcml2YXRlIE1hcDxTdHJpbmcsIFJlZkNvbnRyb2w+IHJlZkNvbnRyb2xzOwogICBwcml2YXRlIEJvb2xlYW4gZGVjbGFyZWRPd25lcjsKIApAQCAtMjM5LDggKzI0MCwxNyBAQAogICB9CiAKICAgcHVibGljIFNldDxHcm91cFJlZmVyZW5jZT4gZ2V0QWxsR3JvdXBzKCkgeworICAgIHJldHVybiBnZXRHcm91cHMoYWNjZXNzKCkpOworICB9CisKKyAgcHVibGljIFNldDxHcm91cFJlZmVyZW5jZT4gZ2V0TG9jYWxHcm91cHMoKSB7CisgICAgcmV0dXJuIGdldEdyb3Vwcyhsb2NhbEFjY2VzcygpKTsKKyAgfQorCisgIHByaXZhdGUgc3RhdGljIFNldDxHcm91cFJlZmVyZW5jZT4gZ2V0R3JvdXBzKAorICAgICAgZmluYWwgTGlzdDxTZWN0aW9uTWF0Y2hlcj4gc2VjdGlvbk1hdGNoZXJMaXN0KSB7CiAgICAgZmluYWwgU2V0PEdyb3VwUmVmZXJlbmNlPiBhbGwgPSBuZXcgSGFzaFNldDxHcm91cFJlZmVyZW5jZT4oKTsKLSAgICBmb3IgKGZpbmFsIFNlY3Rpb25NYXRjaGVyIG1hdGNoZXIgOiBhY2Nlc3MoKSkgeworICAgIGZvciAoZmluYWwgU2VjdGlvbk1hdGNoZXIgbWF0Y2hlciA6IHNlY3Rpb25NYXRjaGVyTGlzdCkgewogICAgICAgZmluYWwgQWNjZXNzU2VjdGlvbiBzZWN0aW9uID0gbWF0Y2hlci5zZWN0aW9uOwogICAgICAgZm9yIChmaW5hbCBQZXJtaXNzaW9uIHBlcm1pc3Npb24gOiBzZWN0aW9uLmdldFBlcm1pc3Npb25zKCkpIHsKICAgICAgICAgZm9yIChmaW5hbCBQZXJtaXNzaW9uUnVsZSBydWxlIDogcGVybWlzc2lvbi5nZXRSdWxlcygpKSB7CkBAIC0zOTIsNiArNDAyLDEzIEBACiAgICAgcmV0dXJuIGFsbFNlY3Rpb25zOwogICB9CiAKKyAgcHJpdmF0ZSBMaXN0PFNlY3Rpb25NYXRjaGVyPiBsb2NhbEFjY2VzcygpIHsKKyAgICBpZiAobG9jYWxTZWN0aW9ucyA9PSBudWxsKSB7CisgICAgICBsb2NhbFNlY3Rpb25zID0gc3RhdGUuZ2V0TG9jYWxBY2Nlc3NTZWN0aW9ucygpOworICAgIH0KKyAgICByZXR1cm4gbG9jYWxTZWN0aW9uczsKKyAgfQorCiAgIGJvb2xlYW4gbWF0Y2goUGVybWlzc2lvblJ1bGUgcnVsZSkgewogICAgIHJldHVybiBtYXRjaChydWxlLmdldEdyb3VwKCkuZ2V0VVVJRCgpKTsKICAgfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L1Byb2plY3RTdGF0ZS5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L1Byb2plY3RTdGF0ZS5qYXZhCmluZGV4IGUwNmM5NDguLjc0YzEyNDcgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9Qcm9qZWN0U3RhdGUuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Byb2plY3QvUHJvamVjdFN0YXRlLmphdmEKQEAgLTE3NCw3ICsxNzQsNyBAQAogICB9CiAKICAgLyoqIEdldCB0aGUgc2VjdGlvbnMgdGhhdCBwZXJ0YWluIG9ubHkgdG8gdGhpcyBwcm9qZWN0LiAqLwotICBwcml2YXRlIExpc3Q8U2VjdGlvbk1hdGNoZXI+IGdldExvY2FsQWNjZXNzU2VjdGlvbnMoKSB7CisgIExpc3Q8U2VjdGlvbk1hdGNoZXI+IGdldExvY2FsQWNjZXNzU2VjdGlvbnMoKSB7CiAgICAgTGlzdDxTZWN0aW9uTWF0Y2hlcj4gc20gPSBsb2NhbEFjY2Vzc1NlY3Rpb25zOwogICAgIGlmIChzbSA9PSBudWxsKSB7CiAgICAgICBDb2xsZWN0aW9uPEFjY2Vzc1NlY3Rpb24+IGZyb21Db25maWcgPSBjb25maWcuZ2V0QWNjZXNzU2VjdGlvbnMoKTsKZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9SZWZDb250cm9sLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Byb2plY3QvUmVmQ29udHJvbC5qYXZhCmluZGV4IGE2MTgyZDEuLjQ2ZjBmZmEgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9SZWZDb250cm9sLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L1JlZkNvbnRyb2wuamF2YQpAQCAtMzIyLDYgKzMyMiwxMSBAQAogICAgIHJldHVybiBjYW5QZXJmb3JtKFBlcm1pc3Npb24uQUJBTkRPTik7CiAgIH0KIAorICAvKiogQHJldHVybiB0cnVlIGlmIHRoaXMgdXNlciBjYW4gcmVtb3ZlIGEgcmV2aWV3ZXIgZm9yIGEgY2hhbmdlLiAqLworICBwdWJsaWMgYm9vbGVhbiBjYW5SZW1vdmVSZXZpZXdlcigpIHsKKyAgICByZXR1cm4gY2FuUGVyZm9ybShQZXJtaXNzaW9uLlJFTU9WRV9SRVZJRVdFUik7CisgIH0KKwogICAvKiogQWxsIHZhbHVlIHJhbmdlcyBvZiBhbnkgYWxsb3dlZCBsYWJlbCBwZXJtaXNzaW9uLiAqLwogICBwdWJsaWMgTGlzdDxQZXJtaXNzaW9uUmFuZ2U+IGdldExhYmVsUmFuZ2VzKCkgewogICAgIExpc3Q8UGVybWlzc2lvblJhbmdlPiByID0gbmV3IEFycmF5TGlzdDxQZXJtaXNzaW9uUmFuZ2U+KCk7CkBAIC00MjgsNyArNDMzLDEyIEBACiAKICAgcHVibGljIHN0YXRpYyBTdHJpbmcgc2hvcnRlc3RFeGFtcGxlKFN0cmluZyBwYXR0ZXJuKSB7CiAgICAgaWYgKGlzUkUocGF0dGVybikpIHsKLSAgICAgIHJldHVybiB0b1JlZ0V4cChwYXR0ZXJuKS50b0F1dG9tYXRvbigpLmdldFNob3J0ZXN0RXhhbXBsZSh0cnVlKTsKKyAgICAgIC8vIFNpbmNlIEJyaWNzIHdpbGwgc3Vic3RpdHV0ZSBkb3QgWy5dIHdpdGggXDAgd2hlbiBnZW5lcmF0aW5nCisgICAgICAvLyBzaG9ydGVzdCBleGFtcGxlLCBhbnkgdXNhZ2Ugb2YgZG90IHdpbGwgZmFpbCBpbgorICAgICAgLy8gUmVwb3NpdG9yeS5pc1ZhbGlkUmVmTmFtZSgpIGlmIG5vdCBjb21iaW5lZCB3aXRoIHN0YXIgWypdLgorICAgICAgLy8gVG8gZ2V0IGFyb3VuZCB0aGlzLCB3ZSBzdWJzdGl0dXRlIHRoZSBcMCB3aXRoIGFuIGFyYml0cmFyeQorICAgICAgLy8gYWNjZXB0ZWQgY2hhcmFjdGVyLgorICAgICAgcmV0dXJuIHRvUmVnRXhwKHBhdHRlcm4pLnRvQXV0b21hdG9uKCkuZ2V0U2hvcnRlc3RFeGFtcGxlKHRydWUpLnJlcGxhY2UoJ1wwJywgJy0nKTsKICAgICB9IGVsc2UgaWYgKHBhdHRlcm4uZW5kc1dpdGgoIi8qIikpIHsKICAgICAgIHJldHVybiBwYXR0ZXJuLnN1YnN0cmluZygwLCBwYXR0ZXJuLmxlbmd0aCgpIC0gMSkgKyAnMSc7CiAgICAgfSBlbHNlIHsKZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9SdWxlRXZhbEV4Y2VwdGlvbi5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L1J1bGVFdmFsRXhjZXB0aW9uLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uOWRhZTExYwotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9SdWxlRXZhbEV4Y2VwdGlvbi5qYXZhCkBAIC0wLDAgKzEsMjYgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdDsKKworQFN1cHByZXNzV2FybmluZ3MoInNlcmlhbCIpCitwdWJsaWMgY2xhc3MgUnVsZUV2YWxFeGNlcHRpb24gZXh0ZW5kcyBFeGNlcHRpb24geworICBwdWJsaWMgUnVsZUV2YWxFeGNlcHRpb24oU3RyaW5nIG1lc3NhZ2UpIHsKKyAgICBzdXBlcihtZXNzYWdlKTsKKyAgfQorCisgIFJ1bGVFdmFsRXhjZXB0aW9uKFN0cmluZyBtZXNzYWdlLCBUaHJvd2FibGUgY2F1c2UpIHsKKyAgICBzdXBlcihtZXNzYWdlLCBjYXVzZSk7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9TdWJtaXRSdWxlRXZhbHVhdG9yLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Byb2plY3QvU3VibWl0UnVsZUV2YWx1YXRvci5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjE5Nzc2MjQKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Byb2plY3QvU3VibWl0UnVsZUV2YWx1YXRvci5qYXZhCkBAIC0wLDAgKzEsMjA3IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3Q7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQ2hhbmdlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUHJvamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5zZXJ2ZXIuUmV2aWV3RGI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucnVsZXMuUHJvbG9nRW52aXJvbm1lbnQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucnVsZXMuU3RvcmVkVmFsdWVzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5xdWVyeS5jaGFuZ2UuQ2hhbmdlRGF0YTsKKworaW1wb3J0IGNvbS5nb29nbGVjb2RlLnByb2xvZ19jYWZlLmNvbXBpbGVyLkNvbXBpbGVFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZWNvZGUucHJvbG9nX2NhZmUubGFuZy5MaXN0VGVybTsKK2ltcG9ydCBjb20uZ29vZ2xlY29kZS5wcm9sb2dfY2FmZS5sYW5nLlByb2xvZzsKK2ltcG9ydCBjb20uZ29vZ2xlY29kZS5wcm9sb2dfY2FmZS5sYW5nLlByb2xvZ0V4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlY29kZS5wcm9sb2dfY2FmZS5sYW5nLlRlcm07CitpbXBvcnQgY29tLmdvb2dsZWNvZGUucHJvbG9nX2NhZmUubGFuZy5WYXJpYWJsZVRlcm07CisKK2ltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OworaW1wb3J0IGphdmEudXRpbC5IYXNoU2V0OworaW1wb3J0IGphdmEudXRpbC5MaXN0OworaW1wb3J0IGphdmEudXRpbC5TZXQ7CisKK2ltcG9ydCBqYXZheC5hbm5vdGF0aW9uLk51bGxhYmxlOworCisvKioKKyAqIEV2YWx1YXRlcyBhIHN1Ym1pdC1saWtlIFByb2xvZyBydWxlIGZvdW5kIGluIHRoZSBydWxlcy5wbCBmaWxlIG9mIHRoZSBjdXJyZW50CisgKiBwcm9qZWN0IGFuZCBmaWx0ZXJzIHRoZSByZXN1bHRzIHRocm91Z2ggcnVsZXMgZm91bmQgaW4gdGhlIHBhcmVudCBwcm9qZWN0cywKKyAqIGFsbCB0aGUgd2F5IHVwIHRvIEFsbC1Qcm9qZWN0cy4KKyAqLworcHVibGljIGNsYXNzIFN1Ym1pdFJ1bGVFdmFsdWF0b3IgeworICBwcml2YXRlIGZpbmFsIFJldmlld0RiIGRiOworICBwcml2YXRlIGZpbmFsIFBhdGNoU2V0IHBhdGNoU2V0OworICBwcml2YXRlIGZpbmFsIFByb2plY3RDb250cm9sIHByb2plY3RDb250cm9sOworICBwcml2YXRlIGZpbmFsIENoYW5nZUNvbnRyb2wgY2hhbmdlQ29udHJvbDsKKyAgcHJpdmF0ZSBmaW5hbCBDaGFuZ2UgY2hhbmdlOworICBwcml2YXRlIGZpbmFsIENoYW5nZURhdGEgY2Q7CisgIHByaXZhdGUgZmluYWwgYm9vbGVhbiBmYXN0RXZhbExhYmVsczsKKyAgcHJpdmF0ZSBmaW5hbCBTdHJpbmcgdXNlclJ1bGVMb2NhdG9yTmFtZTsKKyAgcHJpdmF0ZSBmaW5hbCBTdHJpbmcgdXNlclJ1bGVXcmFwcGVyTmFtZTsKKyAgcHJpdmF0ZSBmaW5hbCBTdHJpbmcgZmlsdGVyUnVsZUxvY2F0b3JOYW1lOworICBwcml2YXRlIGZpbmFsIFN0cmluZyBmaWx0ZXJSdWxlV3JhcHBlck5hbWU7CisKKyAgcHJpdmF0ZSBUZXJtIHN1Ym1pdFJ1bGU7CisgIHByaXZhdGUgU3RyaW5nIHByb2plY3ROYW1lOworCisgIC8qKgorICAgKiBAcGFyYW0gdXNlclJ1bGVMb2NhdG9yTmFtZSBUaGUgbmFtZSBvZiB0aGUgcnVsZSB1c2VkIHRvIGxvY2F0ZSB0aGUKKyAgICogICAgICAgIHVzZXItc3VwcGxpZWQgcnVsZS4KKyAgICogQHBhcmFtIHVzZXJSdWxlV3JhcHBlck5hbWUgVGhlIG5hbWUgb2YgdGhlIHdyYXBwZXIgcnVsZSB1c2VkIHRvIGV2YWx1YXRlCisgICAqICAgICAgICB0aGUgdXNlci1zdXBwbGllZCBydWxlLgorICAgKiBAcGFyYW0gZmlsdGVyUnVsZUxvY2F0b3JOYW1lIFRoZSBuYW1lIG9mIHRoZSBydWxlIHVzZWQgdG8gbG9jYXRlIHRoZSBmaWx0ZXIKKyAgICogICAgICAgIHJ1bGUuCisgICAqIEBwYXJhbSBmaWx0ZXJSdWxlV3JhcHBlck5hbWUgVGhlIG5hbWUgb2YgdGhlIHJ1bGUgdXNlZCB0byBldmFsdWF0ZSB0aGUKKyAgICogICAgICAgIGZpbHRlciBydWxlLgorICAgKi8KKyAgU3VibWl0UnVsZUV2YWx1YXRvcihSZXZpZXdEYiBkYiwgUGF0Y2hTZXQgcGF0Y2hTZXQsCisgICAgICBQcm9qZWN0Q29udHJvbCBwcm9qZWN0Q29udHJvbCwKKyAgICAgIENoYW5nZUNvbnRyb2wgY2hhbmdlQ29udHJvbCwgQ2hhbmdlIGNoYW5nZSwgQE51bGxhYmxlIENoYW5nZURhdGEgY2QsCisgICAgICBib29sZWFuIGZhc3RFdmFsTGFiZWxzLAorICAgICAgU3RyaW5nIHVzZXJSdWxlTG9jYXRvck5hbWUsIFN0cmluZyB1c2VyUnVsZVdyYXBwZXJOYW1lLAorICAgICAgU3RyaW5nIGZpbHRlclJ1bGVMb2NhdG9yTmFtZSwgU3RyaW5nIGZpbHRlclJ1bGVXcmFwcGVyTmFtZSkgeworICAgIHRoaXMuZGIgPSBkYjsKKyAgICB0aGlzLnBhdGNoU2V0ID0gcGF0Y2hTZXQ7CisgICAgdGhpcy5wcm9qZWN0Q29udHJvbCA9IHByb2plY3RDb250cm9sOworICAgIHRoaXMuY2hhbmdlQ29udHJvbCA9IGNoYW5nZUNvbnRyb2w7CisgICAgdGhpcy5jaGFuZ2UgPSBjaGFuZ2U7CisgICAgdGhpcy5jZCA9IGNkOworICAgIHRoaXMuZmFzdEV2YWxMYWJlbHMgPSBmYXN0RXZhbExhYmVsczsKKyAgICB0aGlzLnVzZXJSdWxlTG9jYXRvck5hbWUgPSB1c2VyUnVsZUxvY2F0b3JOYW1lOworICAgIHRoaXMudXNlclJ1bGVXcmFwcGVyTmFtZSA9IHVzZXJSdWxlV3JhcHBlck5hbWU7CisgICAgdGhpcy5maWx0ZXJSdWxlTG9jYXRvck5hbWUgPSBmaWx0ZXJSdWxlTG9jYXRvck5hbWU7CisgICAgdGhpcy5maWx0ZXJSdWxlV3JhcHBlck5hbWUgPSBmaWx0ZXJSdWxlV3JhcHBlck5hbWU7CisgIH0KKworICAvKioKKyAgICogRXZhbHVhdGVzIHRoZSBnaXZlbiBydWxlIGFuZCBmaWx0ZXJzLgorICAgKgorICAgKiBTZXRzIHRoZSB7QGxpbmsgI3N1Ym1pdFJ1bGV9IHRvIHRoZSBUZXJtIGZvdW5kIGJ5IHRoZQorICAgKiB7QGxpbmsgI3VzZXJSdWxlTG9jYXRvck5hbWV9LiBUaGlzIGNhbiBiZSB1c2VkIHdoZW4gcmVwb3J0aW5nIGVycm9yKHMpIG9uCisgICAqIHVuZXhwZWN0ZWQgcmV0dXJuIHZhbHVlIG9mIHRoaXMgbWV0aG9kLgorICAgKgorICAgKiBAcmV0dXJuIExpc3Qgb2Yge0BsaW5rIFRlcm19IG9iamVjdHMgcmV0dXJuZWQgZnJvbSB0aGUgZXZhbHVhdGVkIHJ1bGVzLgorICAgKiBAdGhyb3dzIFJ1bGVFdmFsRXhjZXB0aW9uCisgICAqLworICBMaXN0VGVybSBldmFsdWF0ZSgpIHRocm93cyBSdWxlRXZhbEV4Y2VwdGlvbiB7CisgICAgTGlzdDxUZXJtPiByZXN1bHRzID0gbmV3IEFycmF5TGlzdDxUZXJtPigpOworICAgIFByb2plY3RTdGF0ZSBwcm9qZWN0U3RhdGUgPSBwcm9qZWN0Q29udHJvbC5nZXRQcm9qZWN0U3RhdGUoKTsKKyAgICBQcm9sb2dFbnZpcm9ubWVudCBlbnY7CisKKyAgICB0cnkgeworICAgICAgZW52ID0gcHJvamVjdFN0YXRlLm5ld1Byb2xvZ0Vudmlyb25tZW50KCk7CisgICAgfSBjYXRjaCAoQ29tcGlsZUV4Y2VwdGlvbiBlcnIpIHsKKyAgICAgIHRocm93IG5ldyBSdWxlRXZhbEV4Y2VwdGlvbigiQ2Fubm90IGNvbnN1bHQgcnVsZXMucGwgZm9yICIKKyAgICAgICAgICArIGdldFByb2plY3ROYW1lKCksIGVycik7CisgICAgfQorCisgICAgdHJ5IHsKKyAgICAgIGVudi5zZXQoU3RvcmVkVmFsdWVzLlJFVklFV19EQiwgZGIpOworICAgICAgZW52LnNldChTdG9yZWRWYWx1ZXMuQ0hBTkdFLCBjaGFuZ2UpOworICAgICAgZW52LnNldChTdG9yZWRWYWx1ZXMuQ0hBTkdFX0RBVEEsIGNkKTsKKyAgICAgIGVudi5zZXQoU3RvcmVkVmFsdWVzLlBBVENIX1NFVCwgcGF0Y2hTZXQpOworICAgICAgZW52LnNldChTdG9yZWRWYWx1ZXMuQ0hBTkdFX0NPTlRST0wsIGNoYW5nZUNvbnRyb2wpOworCisgICAgICBzdWJtaXRSdWxlID0gZW52Lm9uY2UoImdlcnJpdCIsIHVzZXJSdWxlTG9jYXRvck5hbWUsIG5ldyBWYXJpYWJsZVRlcm0oKSk7CisgICAgICBpZiAoZmFzdEV2YWxMYWJlbHMpIHsKKyAgICAgICAgZW52Lm9uY2UoImdlcnJpdCIsICJhc3N1bWVfcmFuZ2VfZnJvbV9sYWJlbCIpOworICAgICAgfQorCisgICAgICB0cnkgeworICAgICAgICBmb3IgKFRlcm1bXSB0ZW1wbGF0ZSA6IGVudi5hbGwoImdlcnJpdCIsIHVzZXJSdWxlV3JhcHBlck5hbWUsCisgICAgICAgICAgICBzdWJtaXRSdWxlLCBuZXcgVmFyaWFibGVUZXJtKCkpKSB7CisgICAgICAgICAgcmVzdWx0cy5hZGQodGVtcGxhdGVbMV0pOworICAgICAgICB9CisgICAgICB9IGNhdGNoIChQcm9sb2dFeGNlcHRpb24gZXJyKSB7CisgICAgICAgIHRocm93IG5ldyBSdWxlRXZhbEV4Y2VwdGlvbigiRXhjZXB0aW9uIGNhbGxpbmcgIiArIHN1Ym1pdFJ1bGUKKyAgICAgICAgICAgICsgIiBvbiBjaGFuZ2UgIiArIGNoYW5nZS5nZXRJZCgpICsgIiBvZiAiICsgZ2V0UHJvamVjdE5hbWUoKSwKKyAgICAgICAgICAgIGVycik7CisgICAgICB9IGNhdGNoIChSdW50aW1lRXhjZXB0aW9uIGVycikgeworICAgICAgICB0aHJvdyBuZXcgUnVsZUV2YWxFeGNlcHRpb24oIkV4Y2VwdGlvbiBjYWxsaW5nICIgKyBzdWJtaXRSdWxlCisgICAgICAgICAgICArICIgb24gY2hhbmdlICIgKyBjaGFuZ2UuZ2V0SWQoKSArICIgb2YgIiArIGdldFByb2plY3ROYW1lKCksCisgICAgICAgICAgICBlcnIpOworICAgICAgfQorCisgICAgICBQcm9qZWN0U3RhdGUgcGFyZW50U3RhdGUgPSBwcm9qZWN0U3RhdGUuZ2V0UGFyZW50U3RhdGUoKTsKKyAgICAgIFByb2xvZ0Vudmlyb25tZW50IGNoaWxkRW52ID0gZW52OworICAgICAgU2V0PFByb2plY3QuTmFtZUtleT4gcHJvamVjdHNTZWVuID0gbmV3IEhhc2hTZXQ8UHJvamVjdC5OYW1lS2V5PigpOworICAgICAgcHJvamVjdHNTZWVuLmFkZChwcm9qZWN0U3RhdGUuZ2V0UHJvamVjdCgpLmdldE5hbWVLZXkoKSk7CisKKyAgICAgIFRlcm0gcmVzdWx0c1Rlcm0gPSB0b0xpc3RUZXJtKHJlc3VsdHMpOworICAgICAgd2hpbGUgKHBhcmVudFN0YXRlICE9IG51bGwpIHsKKyAgICAgICAgaWYgKCFwcm9qZWN0c1NlZW4uYWRkKHBhcmVudFN0YXRlLmdldFByb2plY3QoKS5nZXROYW1lS2V5KCkpKSB7CisgICAgICAgICAgLy8gcGFyZW50IGhhcyBiZWVuIHNlZW4gYmVmb3JlLCBzdG9wIHdhbGsgdXAgaW5oZXJpdGFuY2UgdHJlZQorICAgICAgICAgIGJyZWFrOworICAgICAgICB9CisgICAgICAgIFByb2xvZ0Vudmlyb25tZW50IHBhcmVudEVudjsKKyAgICAgICAgdHJ5IHsKKyAgICAgICAgICBwYXJlbnRFbnYgPSBwYXJlbnRTdGF0ZS5uZXdQcm9sb2dFbnZpcm9ubWVudCgpOworICAgICAgICB9IGNhdGNoIChDb21waWxlRXhjZXB0aW9uIGVycikgeworICAgICAgICAgIHRocm93IG5ldyBSdWxlRXZhbEV4Y2VwdGlvbigiQ2Fubm90IGNvbnN1bHQgcnVsZXMucGwgZm9yICIKKyAgICAgICAgICAgICAgKyBwYXJlbnRTdGF0ZS5nZXRQcm9qZWN0KCkuZ2V0TmFtZSgpLCBlcnIpOworICAgICAgICB9CisKKyAgICAgICAgcGFyZW50RW52LmNvcHlTdG9yZWRWYWx1ZXMoY2hpbGRFbnYpOworICAgICAgICBUZXJtIGZpbHRlclJ1bGUgPQorICAgICAgICAgICAgcGFyZW50RW52Lm9uY2UoImdlcnJpdCIsIGZpbHRlclJ1bGVMb2NhdG9yTmFtZSwgbmV3IFZhcmlhYmxlVGVybSgpKTsKKyAgICAgICAgdHJ5IHsKKyAgICAgICAgICBpZiAoZmFzdEV2YWxMYWJlbHMpIHsKKyAgICAgICAgICAgIGVudi5vbmNlKCJnZXJyaXQiLCAiYXNzdW1lX3JhbmdlX2Zyb21fbGFiZWwiKTsKKyAgICAgICAgICB9CisKKyAgICAgICAgICBUZXJtW10gdGVtcGxhdGUgPQorICAgICAgICAgICAgICBwYXJlbnRFbnYub25jZSgiZ2Vycml0IiwgZmlsdGVyUnVsZVdyYXBwZXJOYW1lLCBmaWx0ZXJSdWxlLAorICAgICAgICAgICAgICAgICAgcmVzdWx0c1Rlcm0sIG5ldyBWYXJpYWJsZVRlcm0oKSk7CisgICAgICAgICAgcmVzdWx0c1Rlcm0gPSB0ZW1wbGF0ZVsyXTsKKyAgICAgICAgfSBjYXRjaCAoUHJvbG9nRXhjZXB0aW9uIGVycikgeworICAgICAgICAgIHRocm93IG5ldyBSdWxlRXZhbEV4Y2VwdGlvbigiRXhjZXB0aW9uIGNhbGxpbmcgIiArIGZpbHRlclJ1bGUKKyAgICAgICAgICAgICAgKyAiIG9uIGNoYW5nZSAiICsgY2hhbmdlLmdldElkKCkgKyAiIG9mICIKKyAgICAgICAgICAgICAgKyBwYXJlbnRTdGF0ZS5nZXRQcm9qZWN0KCkuZ2V0TmFtZSgpLCBlcnIpOworICAgICAgICB9IGNhdGNoIChSdW50aW1lRXhjZXB0aW9uIGVycikgeworICAgICAgICAgIHRocm93IG5ldyBSdWxlRXZhbEV4Y2VwdGlvbigiRXhjZXB0aW9uIGNhbGxpbmcgIiArIGZpbHRlclJ1bGUKKyAgICAgICAgICAgICAgKyAiIG9uIGNoYW5nZSAiICsgY2hhbmdlLmdldElkKCkgKyAiIG9mICIKKyAgICAgICAgICAgICAgKyBwYXJlbnRTdGF0ZS5nZXRQcm9qZWN0KCkuZ2V0TmFtZSgpLCBlcnIpOworICAgICAgICB9CisKKyAgICAgICAgcGFyZW50U3RhdGUgPSBwYXJlbnRTdGF0ZS5nZXRQYXJlbnRTdGF0ZSgpOworICAgICAgICBjaGlsZEVudiA9IHBhcmVudEVudjsKKyAgICAgIH0KKworICAgICAgcmV0dXJuIChMaXN0VGVybSkgcmVzdWx0c1Rlcm07CisgICAgfSBmaW5hbGx5IHsKKyAgICAgIGVudi5jbG9zZSgpOworICAgIH0KKyAgfQorCisgIHByaXZhdGUgc3RhdGljIFRlcm0gdG9MaXN0VGVybShMaXN0PFRlcm0+IHRlcm1zKSB7CisgICAgVGVybSBsaXN0ID0gUHJvbG9nLk5pbDsKKyAgICBmb3IgKGludCBpID0gdGVybXMuc2l6ZSgpIC0gMTsgaSA+PSAwOyBpLS0pIHsKKyAgICAgIGxpc3QgPSBuZXcgTGlzdFRlcm0odGVybXMuZ2V0KGkpLCBsaXN0KTsKKyAgICB9CisgICAgcmV0dXJuIGxpc3Q7CisgIH0KKworICBUZXJtIGdldFN1Ym1pdFJ1bGUoKSB7CisgICAgcmV0dXJuIHN1Ym1pdFJ1bGU7CisgIH0KKworICBwcml2YXRlIFN0cmluZyBnZXRQcm9qZWN0TmFtZSgpIHsKKyAgICBpZiAocHJvamVjdE5hbWUgPT0gbnVsbCkgeworICAgICAgcHJvamVjdE5hbWUgPSBwcm9qZWN0Q29udHJvbC5nZXRQcm9qZWN0U3RhdGUoKS5nZXRQcm9qZWN0KCkuZ2V0TmFtZSgpOworICAgIH0KKyAgICByZXR1cm4gcHJvamVjdE5hbWU7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcXVlcnkvUXVlcnlSZXdyaXRlci5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9xdWVyeS9RdWVyeVJld3JpdGVyLmphdmEKaW5kZXggYjNjMTBlZi4uMmE2YmFlMCAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9xdWVyeS9RdWVyeVJld3JpdGVyLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9xdWVyeS9RdWVyeVJld3JpdGVyLmphdmEKQEAgLTQ3OCwyOCArNDc4LDYgQEAKICAgICByZXR1cm4gcjsKICAgfQogCi0gIHByaXZhdGUgc3RhdGljIDxUPiB2b2lkIGV4cGFuZChmaW5hbCBMaXN0PFByZWRpY2F0ZTxUPj4gb3V0LAotICAgICAgZmluYWwgTGlzdDxQcmVkaWNhdGU8VD4+IGFsbE9SLCBmaW5hbCBMaXN0PFByZWRpY2F0ZTxUPj4gdG1wLAotICAgICAgZmluYWwgTGlzdDxQcmVkaWNhdGU8VD4+IG5vbk9SKSB7Ci0gICAgaWYgKHRtcC5zaXplKCkgPT0gYWxsT1Iuc2l6ZSgpKSB7Ci0gICAgICBmaW5hbCBpbnQgc3ogPSBub25PUi5zaXplKCkgKyB0bXAuc2l6ZSgpOwotICAgICAgZmluYWwgTGlzdDxQcmVkaWNhdGU8VD4+IG5ld0xpc3QgPSBuZXcgQXJyYXlMaXN0PFByZWRpY2F0ZTxUPj4oc3opOwotICAgICAgbmV3TGlzdC5hZGRBbGwobm9uT1IpOwotICAgICAgbmV3TGlzdC5hZGRBbGwodG1wKTsKLSAgICAgIG91dC5hZGQoUHJlZGljYXRlLmFuZChuZXdMaXN0KSk7Ci0KLSAgICB9IGVsc2UgewotICAgICAgZm9yIChmaW5hbCBQcmVkaWNhdGU8VD4gYyA6IGFsbE9SLmdldCh0bXAuc2l6ZSgpKS5nZXRDaGlsZHJlbigpKSB7Ci0gICAgICAgIHRyeSB7Ci0gICAgICAgICAgdG1wLmFkZChjKTsKLSAgICAgICAgICBleHBhbmQob3V0LCBhbGxPUiwgdG1wLCBub25PUik7Ci0gICAgICAgIH0gZmluYWxseSB7Ci0gICAgICAgICAgdG1wLnJlbW92ZSh0bXAuc2l6ZSgpIC0gMSk7Ci0gICAgICAgIH0KLSAgICAgIH0KLSAgICB9Ci0gIH0KLQogICBwcml2YXRlIHN0YXRpYyA8VD4gYm9vbGVhbiBpc0FORChmaW5hbCBQcmVkaWNhdGU8VD4gcCkgewogICAgIHJldHVybiBwIGluc3RhbmNlb2YgQW5kUHJlZGljYXRlOwogICB9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3F1ZXJ5L2NoYW5nZS9RdWVyeVByb2Nlc3Nvci5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9xdWVyeS9jaGFuZ2UvUXVlcnlQcm9jZXNzb3IuamF2YQppbmRleCBmNDQyODJhLi40OTA1OWM5IDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3F1ZXJ5L2NoYW5nZS9RdWVyeVByb2Nlc3Nvci5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcXVlcnkvY2hhbmdlL1F1ZXJ5UHJvY2Vzc29yLmphdmEKQEAgLTExMCw2ICsxMTAsNyBAQAogCiAgIHByaXZhdGUgT3V0cHV0U3RyZWFtIG91dHB1dFN0cmVhbSA9IERpc2FibGVkT3V0cHV0U3RyZWFtLklOU1RBTkNFOwogICBwcml2YXRlIFByaW50V3JpdGVyIG91dDsKKyAgcHJpdmF0ZSBib29sZWFuIG1vcmVSZXN1bHRzOwogCiAgIEBJbmplY3QKICAgUXVlcnlQcm9jZXNzb3IoRXZlbnRGYWN0b3J5IGV2ZW50RmFjdG9yeSwKQEAgLTEyNCw2ICsxMjUsNyBAQAogICAgIHRoaXMubWF4TGltaXQgPSBjdXJyZW50VXNlci5nZXRDYXBhYmlsaXRpZXMoKQogICAgICAgLmdldFJhbmdlKEdsb2JhbENhcGFiaWxpdHkuUVVFUllfTElNSVQpCiAgICAgICAuZ2V0TWF4KCk7CisgICAgdGhpcy5tb3JlUmVzdWx0cyA9IGZhbHNlOwogICB9CiAKICAgaW50IGdldExpbWl0KCkgewpAQCAtMjM0LDYgKzIzNiw5IEBACiAKICAgICBDb2xsZWN0aW9ucy5zb3J0KHJlc3VsdHMsIHNvcnRrZXlBZnRlciAhPSBudWxsID8gY21wQWZ0ZXIgOiBjbXBCZWZvcmUpOwogICAgIGludCBsaW1pdCA9IGxpbWl0KHMpOworICAgIGlmIChyZXN1bHRzLnNpemUoKSA+IG1heExpbWl0KSB7CisgICAgICBtb3JlUmVzdWx0cyA9IHRydWU7CisgICAgfQogICAgIGlmIChsaW1pdCA8IHJlc3VsdHMuc2l6ZSgpKSB7CiAgICAgICByZXN1bHRzID0gcmVzdWx0cy5zdWJMaXN0KDAsIGxpbWl0KTsKICAgICB9CkBAIC0yNjAsMTUgKzI2NSwxNSBAQAogICAgICAgICBzdGF0cy5ydW5UaW1lTWlsbGlzZWNvbmRzID0gU3lzdGVtLmN1cnJlbnRUaW1lTWlsbGlzKCk7CiAKICAgICAgICAgTGlzdDxDaGFuZ2VEYXRhPiByZXN1bHRzID0gcXVlcnlDaGFuZ2VzKHF1ZXJ5U3RyaW5nKTsKKyAgICAgICAgQ2hhbmdlQXR0cmlidXRlIGMgPSBudWxsOwogICAgICAgICBmb3IgKENoYW5nZURhdGEgZCA6IHJlc3VsdHMpIHsKLSAgICAgICAgICBDaGFuZ2VBdHRyaWJ1dGUgYyA9IGV2ZW50RmFjdG9yeS5hc0NoYW5nZUF0dHJpYnV0ZShkLmdldENoYW5nZSgpKTsKKyAgICAgICAgICBjID0gZXZlbnRGYWN0b3J5LmFzQ2hhbmdlQXR0cmlidXRlKGQuZ2V0Q2hhbmdlKCkpOwogICAgICAgICAgIGV2ZW50RmFjdG9yeS5leHRlbmQoYywgZC5nZXRDaGFuZ2UoKSk7CiAgICAgICAgICAgZXZlbnRGYWN0b3J5LmFkZFRyYWNraW5nSWRzKGMsIGQudHJhY2tpbmdJZHMoZGIpKTsKIAogICAgICAgICAgIGlmIChpbmNsdWRlU3VibWl0UmVjb3JkcykgewogICAgICAgICAgICAgUGF0Y2hTZXQuSWQgcHNJZCA9IGQuZ2V0Q2hhbmdlKCkuY3VycmVudFBhdGNoU2V0SWQoKTsKICAgICAgICAgICAgIFBhdGNoU2V0IHBhdGNoU2V0ID0gZGIuZ2V0KCkucGF0Y2hTZXRzKCkuZ2V0KHBzSWQpOwotICAgICAgICAgICAgQ2hhbmdlLklkIGNoYW5nZUlkID0gcHNJZC5nZXRQYXJlbnRLZXkoKTsKICAgICAgICAgICAgIExpc3Q8U3VibWl0UmVjb3JkPiBzdWJtaXRSZXN1bHQgPSBkLmNoYW5nZUNvbnRyb2woKS5jYW5TdWJtaXQoIC8vCiAgICAgICAgICAgICAgICAgZGIuZ2V0KCksIHBhdGNoU2V0LCBudWxsLCBmYWxzZSwgdHJ1ZSk7CiAgICAgICAgICAgICBldmVudEZhY3RvcnkuYWRkU3VibWl0UmVjb3JkcyhjLCBzdWJtaXRSZXN1bHQpOwpAQCAtMzIwLDYgKzMyNSw5IEBACiAgICAgICAgIH0KIAogICAgICAgICBzdGF0cy5yb3dDb3VudCA9IHJlc3VsdHMuc2l6ZSgpOworICAgICAgICBpZiAobW9yZVJlc3VsdHMpIHsKKyAgICAgICAgICBzdGF0cy5yZXN1bWVTb3J0S2V5ID0gYy5zb3J0S2V5OworICAgICAgICB9CiAgICAgICAgIHN0YXRzLnJ1blRpbWVNaWxsaXNlY29uZHMgPQogICAgICAgICAgICAgU3lzdGVtLmN1cnJlbnRUaW1lTWlsbGlzKCkgLSBzdGF0cy5ydW5UaW1lTWlsbGlzZWNvbmRzOwogICAgICAgICBzaG93KHN0YXRzKTsKZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvc2NoZW1hL0Jhc2VEYXRhU291cmNlVHlwZS5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9zY2hlbWEvQmFzZURhdGFTb3VyY2VUeXBlLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMWQxMmZlYQotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvc2NoZW1hL0Jhc2VEYXRhU291cmNlVHlwZS5qYXZhCkBAIC0wLDAgKzEsNjYgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuc2NoZW1hOworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuc2VydmVyLlJldmlld0RiOworCitpbXBvcnQgamF2YS5pby5JT0V4Y2VwdGlvbjsKK2ltcG9ydCBqYXZhLmlvLklucHV0U3RyZWFtOworCitwdWJsaWMgYWJzdHJhY3QgY2xhc3MgQmFzZURhdGFTb3VyY2VUeXBlIGltcGxlbWVudHMgRGF0YVNvdXJjZVR5cGUgeworCisgIHByaXZhdGUgZmluYWwgU3RyaW5nIGRyaXZlcjsKKworICBwcm90ZWN0ZWQgQmFzZURhdGFTb3VyY2VUeXBlKFN0cmluZyBkcml2ZXIpIHsKKyAgICB0aGlzLmRyaXZlciA9IGRyaXZlcjsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgZmluYWwgU3RyaW5nIGdldERyaXZlcigpIHsKKyAgICByZXR1cm4gZHJpdmVyOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBib29sZWFuIHVzZVBvb2woKSB7CisgICAgcmV0dXJuIHRydWU7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIFNjcmlwdFJ1bm5lciBnZXRJbmRleFNjcmlwdCgpIHRocm93cyBJT0V4Y2VwdGlvbiB7CisgICAgcmV0dXJuIGdldFNjcmlwdFJ1bm5lcigiaW5kZXhfZ2VuZXJpYy5zcWwiKTsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgU2NyaXB0UnVubmVyIGdldE5leHRWYWxTY3JpcHQoKSB0aHJvd3MgSU9FeGNlcHRpb24geworICAgIHJldHVybiBTY3JpcHRSdW5uZXIuTk9PUDsKKyAgfQorCisgIHByb3RlY3RlZCBzdGF0aWMgZmluYWwgU2NyaXB0UnVubmVyIGdldFNjcmlwdFJ1bm5lcihTdHJpbmcgcGF0aCkgdGhyb3dzIElPRXhjZXB0aW9uIHsKKyAgICBpZiAocGF0aCA9PSBudWxsKSB7CisgICAgICByZXR1cm4gU2NyaXB0UnVubmVyLk5PT1A7CisgICAgfQorICAgIElucHV0U3RyZWFtIGluID0gIFJldmlld0RiLmNsYXNzLmdldFJlc291cmNlQXNTdHJlYW0ocGF0aCk7CisgICAgaWYgKGluID09IG51bGwpIHsKKyAgICAgIHRocm93IG5ldyBJbGxlZ2FsU3RhdGVFeGNlcHRpb24oIlNRTCBzY3JpcHQgIiArIHBhdGggKyAiIG5vdCBmb3VuZCIpOworICAgIH0KKyAgICBTY3JpcHRSdW5uZXIgcnVubmVyOworICAgIHRyeSB7CisgICAgICBydW5uZXIgPSBuZXcgU2NyaXB0UnVubmVyKHBhdGgsIGluKTsKKyAgICB9IGZpbmFsbHkgeworICAgICAgaW4uY2xvc2UoKTsKKyAgICB9CisgICAgcmV0dXJuIHJ1bm5lcjsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9zY2hlbWEvRGF0YVNvdXJjZU1vZHVsZS5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9zY2hlbWEvRGF0YVNvdXJjZU1vZHVsZS5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjQwNjZhZDMKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3NjaGVtYS9EYXRhU291cmNlTW9kdWxlLmphdmEKQEAgLTAsMCArMSwyOSBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5zY2hlbWE7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5BYnN0cmFjdE1vZHVsZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5uYW1lLk5hbWVzOworCitwdWJsaWMgY2xhc3MgRGF0YVNvdXJjZU1vZHVsZSBleHRlbmRzIEFic3RyYWN0TW9kdWxlIHsKKworICBAT3ZlcnJpZGUKKyAgcHJvdGVjdGVkIHZvaWQgY29uZmlndXJlKCkgeworICAgIGJpbmQoRGF0YVNvdXJjZVR5cGUuY2xhc3MpLmFubm90YXRlZFdpdGgoTmFtZXMubmFtZWQoImgyIikpLnRvKEgyLmNsYXNzKTsKKyAgICBiaW5kKERhdGFTb3VyY2VUeXBlLmNsYXNzKS5hbm5vdGF0ZWRXaXRoKE5hbWVzLm5hbWVkKCJqZGJjIikpLnRvKEpEQkMuY2xhc3MpOworICAgIGJpbmQoRGF0YVNvdXJjZVR5cGUuY2xhc3MpLmFubm90YXRlZFdpdGgoTmFtZXMubmFtZWQoIm15c3FsIikpLnRvKE15U3FsLmNsYXNzKTsKKyAgICBiaW5kKERhdGFTb3VyY2VUeXBlLmNsYXNzKS5hbm5vdGF0ZWRXaXRoKE5hbWVzLm5hbWVkKCJwb3N0Z3Jlc3FsIikpLnRvKFBvc3RncmVTUUwuY2xhc3MpOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3NjaGVtYS9EYXRhU291cmNlUHJvdmlkZXIuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvc2NoZW1hL0RhdGFTb3VyY2VQcm92aWRlci5qYXZhCmluZGV4IGNjNDgwMTkuLjBjNTQ4ODMgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvc2NoZW1hL0RhdGFTb3VyY2VQcm92aWRlci5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvc2NoZW1hL0RhdGFTb3VyY2VQcm92aWRlci5qYXZhCkBAIC0xNCwxMSArMTQsMTIgQEAKIAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuc2NoZW1hOwogCi1pbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuQ29uZmlnVXRpbC5nZXRFbnVtOwogaW1wb3J0IHN0YXRpYyBqYXZhLnV0aWwuY29uY3VycmVudC5UaW1lVW5pdC5NSUxMSVNFQ09ORFM7CiBpbXBvcnQgc3RhdGljIGphdmEudXRpbC5jb25jdXJyZW50LlRpbWVVbml0LlNFQ09ORFM7CiAKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5iYXNlLlN0cmluZ3M7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5ldmVudHMuTGlmZWN5Y2xlTGlzdGVuZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5Db25maWdTZWN0aW9uOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuQ29uZmlnVXRpbDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLkdlcnJpdFNlcnZlckNvbmZpZzsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLlNpdGVQYXRoczsKQEAgLTMxLDggKzMyLDYgQEAKIGltcG9ydCBvcmcuYXBhY2hlLmNvbW1vbnMuZGJjcC5CYXNpY0RhdGFTb3VyY2U7CiBpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuQ29uZmlnOwogCi1pbXBvcnQgamF2YS5pby5GaWxlOwotaW1wb3J0IGphdmEuaW8uSU9FeGNlcHRpb247CiBpbXBvcnQgamF2YS5zcWwuU1FMRXhjZXB0aW9uOwogaW1wb3J0IGphdmEudXRpbC5Qcm9wZXJ0aWVzOwogCkBAIC00Niw4ICs0NSw4IEBACiAKICAgQEluamVjdAogICBEYXRhU291cmNlUHJvdmlkZXIoZmluYWwgU2l0ZVBhdGhzIHNpdGUsCi0gICAgICBAR2Vycml0U2VydmVyQ29uZmlnIGZpbmFsIENvbmZpZyBjZmcsIENvbnRleHQgY3R4KSB7Ci0gICAgZHMgPSBvcGVuKHNpdGUsIGNmZywgY3R4KTsKKyAgICAgIEBHZXJyaXRTZXJ2ZXJDb25maWcgZmluYWwgQ29uZmlnIGNmZywgQ29udGV4dCBjdHgsIERhdGFTb3VyY2VUeXBlIGRzdCkgeworICAgIGRzID0gb3BlbihzaXRlLCBjZmcsIGN0eCwgZHN0KTsKICAgfQogCiAgIEBPdmVycmlkZQpAQCAtNzQsMTAwICs3MywyNyBAQAogICAgIFNJTkdMRV9VU0VSLCBNVUxUSV9VU0VSOwogICB9CiAKLSAgcHVibGljIHN0YXRpYyBlbnVtIFR5cGUgewotICAgIEgyLCBQT1NUR1JFU1FMLCBNWVNRTCwgSkRCQzsKLSAgfQotCiAgIHByaXZhdGUgRGF0YVNvdXJjZSBvcGVuKGZpbmFsIFNpdGVQYXRocyBzaXRlLCBmaW5hbCBDb25maWcgY2ZnLAotICAgICAgZmluYWwgQ29udGV4dCBjb250ZXh0KSB7Ci0gICAgVHlwZSB0eXBlID0gZ2V0RW51bShjZmcsICJkYXRhYmFzZSIsIG51bGwsICJ0eXBlIiwgVHlwZS52YWx1ZXMoKSwgbnVsbCk7Ci0gICAgU3RyaW5nIGRyaXZlciA9IG9wdGlvbmFsKGNmZywgImRyaXZlciIpOwotICAgIFN0cmluZyB1cmwgPSBvcHRpb25hbChjZmcsICJ1cmwiKTsKLSAgICBTdHJpbmcgdXNlcm5hbWUgPSBvcHRpb25hbChjZmcsICJ1c2VybmFtZSIpOwotICAgIFN0cmluZyBwYXNzd29yZCA9IG9wdGlvbmFsKGNmZywgInBhc3N3b3JkIik7Ci0KLSAgICBpZiAodXJsID09IG51bGwgfHwgdXJsLmlzRW1wdHkoKSkgewotICAgICAgaWYgKHR5cGUgPT0gbnVsbCkgewotICAgICAgICB0eXBlID0gVHlwZS5IMjsKLSAgICAgIH0KLQotICAgICAgc3dpdGNoICh0eXBlKSB7Ci0gICAgICAgIGNhc2UgSDI6IHsKLSAgICAgICAgICBTdHJpbmcgZGF0YWJhc2UgPSBvcHRpb25hbChjZmcsICJkYXRhYmFzZSIpOwotICAgICAgICAgIGlmIChkYXRhYmFzZSA9PSBudWxsIHx8IGRhdGFiYXNlLmlzRW1wdHkoKSkgewotICAgICAgICAgICAgZGF0YWJhc2UgPSAiZGIvUmV2aWV3REIiOwotICAgICAgICAgIH0KLSAgICAgICAgICBGaWxlIGRiID0gc2l0ZS5yZXNvbHZlKGRhdGFiYXNlKTsKLSAgICAgICAgICB0cnkgewotICAgICAgICAgICAgZGIgPSBkYi5nZXRDYW5vbmljYWxGaWxlKCk7Ci0gICAgICAgICAgfSBjYXRjaCAoSU9FeGNlcHRpb24gZSkgewotICAgICAgICAgICAgZGIgPSBkYi5nZXRBYnNvbHV0ZUZpbGUoKTsKLSAgICAgICAgICB9Ci0gICAgICAgICAgdXJsID0gImpkYmM6aDI6IiArIGRiLnRvVVJJKCkudG9TdHJpbmcoKTsKLSAgICAgICAgICBicmVhazsKLSAgICAgICAgfQotCi0gICAgICAgIGNhc2UgUE9TVEdSRVNRTDogewotICAgICAgICAgIGZpbmFsIFN0cmluZ0J1aWxkZXIgYiA9IG5ldyBTdHJpbmdCdWlsZGVyKCk7Ci0gICAgICAgICAgYi5hcHBlbmQoImpkYmM6cG9zdGdyZXNxbDovLyIpOwotICAgICAgICAgIGIuYXBwZW5kKGhvc3RuYW1lKG9wdGlvbmFsKGNmZywgImhvc3RuYW1lIikpKTsKLSAgICAgICAgICBiLmFwcGVuZChwb3J0KG9wdGlvbmFsKGNmZywgInBvcnQiKSkpOwotICAgICAgICAgIGIuYXBwZW5kKCIvIik7Ci0gICAgICAgICAgYi5hcHBlbmQocmVxdWlyZWQoY2ZnLCAiZGF0YWJhc2UiKSk7Ci0gICAgICAgICAgdXJsID0gYi50b1N0cmluZygpOwotICAgICAgICAgIGJyZWFrOwotICAgICAgICB9Ci0KLSAgICAgICAgY2FzZSBNWVNRTDogewotICAgICAgICAgIGZpbmFsIFN0cmluZ0J1aWxkZXIgYiA9IG5ldyBTdHJpbmdCdWlsZGVyKCk7Ci0gICAgICAgICAgYi5hcHBlbmQoImpkYmM6bXlzcWw6Ly8iKTsKLSAgICAgICAgICBiLmFwcGVuZChob3N0bmFtZShvcHRpb25hbChjZmcsICJob3N0bmFtZSIpKSk7Ci0gICAgICAgICAgYi5hcHBlbmQocG9ydChvcHRpb25hbChjZmcsICJwb3J0IikpKTsKLSAgICAgICAgICBiLmFwcGVuZCgiLyIpOwotICAgICAgICAgIGIuYXBwZW5kKHJlcXVpcmVkKGNmZywgImRhdGFiYXNlIikpOwotICAgICAgICAgIHVybCA9IGIudG9TdHJpbmcoKTsKLSAgICAgICAgICBicmVhazsKLSAgICAgICAgfQotCi0gICAgICAgIGNhc2UgSkRCQzoKLSAgICAgICAgICBkcml2ZXIgPSByZXF1aXJlZChjZmcsICJkcml2ZXIiKTsKLSAgICAgICAgICB1cmwgPSByZXF1aXJlZChjZmcsICJ1cmwiKTsKLSAgICAgICAgICBicmVhazsKLQotICAgICAgICBkZWZhdWx0OgotICAgICAgICAgIHRocm93IG5ldyBJbGxlZ2FsQXJndW1lbnRFeGNlcHRpb24odHlwZSArICIgbm90IHN1cHBvcnRlZCIpOwotICAgICAgfQorICAgICAgZmluYWwgQ29udGV4dCBjb250ZXh0LCBmaW5hbCBEYXRhU291cmNlVHlwZSBkc3QpIHsKKyAgICBDb25maWdTZWN0aW9uIGRicyA9IG5ldyBDb25maWdTZWN0aW9uKGNmZywgImRhdGFiYXNlIik7CisgICAgU3RyaW5nIGRyaXZlciA9IGRicy5vcHRpb25hbCgiZHJpdmVyIik7CisgICAgaWYgKFN0cmluZ3MuaXNOdWxsT3JFbXB0eShkcml2ZXIpKSB7CisgICAgICBkcml2ZXIgPSBkc3QuZ2V0RHJpdmVyKCk7CiAgICAgfQogCi0gICAgaWYgKGRyaXZlciA9PSBudWxsIHx8IGRyaXZlci5pc0VtcHR5KCkpIHsKLSAgICAgIGlmICh1cmwuc3RhcnRzV2l0aCgiamRiYzpoMjoiKSkgewotICAgICAgICBkcml2ZXIgPSAib3JnLmgyLkRyaXZlciI7Ci0KLSAgICAgIH0gZWxzZSBpZiAodXJsLnN0YXJ0c1dpdGgoImpkYmM6cG9zdGdyZXNxbDoiKSkgewotICAgICAgICBkcml2ZXIgPSAib3JnLnBvc3RncmVzcWwuRHJpdmVyIjsKLQotICAgICAgfSBlbHNlIGlmICh1cmwuc3RhcnRzV2l0aCgiamRiYzpteXNxbDoiKSkgewotICAgICAgICBkcml2ZXIgPSAiY29tLm15c3FsLmpkYmMuRHJpdmVyIjsKLQotICAgICAgfSBlbHNlIHsKLSAgICAgICAgdGhyb3cgbmV3IElsbGVnYWxBcmd1bWVudEV4Y2VwdGlvbigiZGF0YWJhc2UuZHJpdmVyIG11c3QgYmUgc2V0Iik7Ci0gICAgICB9CisgICAgU3RyaW5nIHVybCA9IGRicy5vcHRpb25hbCgidXJsIik7CisgICAgaWYgKFN0cmluZ3MuaXNOdWxsT3JFbXB0eSh1cmwpKSB7CisgICAgICB1cmwgPSBkc3QuZ2V0VXJsKCk7CiAgICAgfQogCisgICAgU3RyaW5nIHVzZXJuYW1lID0gZGJzLm9wdGlvbmFsKCJ1c2VybmFtZSIpOworICAgIFN0cmluZyBwYXNzd29yZCA9IGRicy5vcHRpb25hbCgicGFzc3dvcmQiKTsKKwogICAgIGJvb2xlYW4gdXNlUG9vbDsKLSAgICBpZiAodXJsLnN0YXJ0c1dpdGgoImpkYmM6bXlzcWw6IikpIHsKLSAgICAgIC8vIE15U1FMIGhhcyBnaXZlbiB1cyB0cm91YmxlIHdpdGggdGhlIGNvbm5lY3Rpb24gcG9vbCwKLSAgICAgIC8vIHNvbWV0aW1lcyB0aGUgYmFja2VuZCBkaXNjb25uZWN0cyBhbmQgdGhlIHBvb2wgd2luZHMKLSAgICAgIC8vIHVwIHdpdGggYSBzdGFsZSBjb25uZWN0aW9uLiBGb3J0dW5hdGVseSBvcGVuaW5nIHVwCi0gICAgICAvLyBhIG5ldyBNeVNRTCBjb25uZWN0aW9uIGlzIHVzdWFsbHkgdmVyeSBmYXN0LgotICAgICAgLy8KLSAgICAgIHVzZVBvb2wgPSBmYWxzZTsKLSAgICB9IGVsc2UgewotICAgICAgdXNlUG9vbCA9IHRydWU7Ci0gICAgfQotICAgIHVzZVBvb2wgPSBjZmcuZ2V0Qm9vbGVhbigiZGF0YWJhc2UiLCAiY29ubmVjdGlvbnBvb2wiLCB1c2VQb29sKTsKICAgICBpZiAoY29udGV4dCA9PSBDb250ZXh0LlNJTkdMRV9VU0VSKSB7CiAgICAgICB1c2VQb29sID0gZmFsc2U7CisgICAgfSBlbHNlIHsKKyAgICAgIHVzZVBvb2wgPSBjZmcuZ2V0Qm9vbGVhbigiZGF0YWJhc2UiLCAiY29ubmVjdGlvbnBvb2wiLCBkc3QudXNlUG9vbCgpKTsKICAgICB9CiAKICAgICBpZiAodXNlUG9vbCkgewpAQCAtMjA3LDMzICsxMzMsNCBAQAogICAgICAgfQogICAgIH0KICAgfQotCi0gIHByaXZhdGUgc3RhdGljIFN0cmluZyBob3N0bmFtZShTdHJpbmcgaG9zdG5hbWUpIHsKLSAgICBpZiAoaG9zdG5hbWUgPT0gbnVsbCB8fCBob3N0bmFtZS5pc0VtcHR5KCkpIHsKLSAgICAgIGhvc3RuYW1lID0gImxvY2FsaG9zdCI7Ci0KLSAgICB9IGVsc2UgaWYgKGhvc3RuYW1lLmNvbnRhaW5zKCI6IikgJiYgIWhvc3RuYW1lLnN0YXJ0c1dpdGgoIlsiKSkgewotICAgICAgaG9zdG5hbWUgPSAiWyIgKyBob3N0bmFtZSArICJdIjsKLSAgICB9Ci0gICAgcmV0dXJuIGhvc3RuYW1lOwotICB9Ci0KLSAgcHJpdmF0ZSBzdGF0aWMgU3RyaW5nIHBvcnQoU3RyaW5nIHBvcnQpIHsKLSAgICBpZiAocG9ydCAhPSBudWxsICYmICFwb3J0LmlzRW1wdHkoKSkgewotICAgICAgcmV0dXJuICI6IiArIHBvcnQ7Ci0gICAgfQotICAgIHJldHVybiAiIjsKLSAgfQotCi0gIHByaXZhdGUgc3RhdGljIFN0cmluZyBvcHRpb25hbChmaW5hbCBDb25maWcgY29uZmlnLCBmaW5hbCBTdHJpbmcgbmFtZSkgewotICAgIHJldHVybiBjb25maWcuZ2V0U3RyaW5nKCJkYXRhYmFzZSIsIG51bGwsIG5hbWUpOwotICB9Ci0KLSAgcHJpdmF0ZSBzdGF0aWMgU3RyaW5nIHJlcXVpcmVkKGZpbmFsIENvbmZpZyBjb25maWcsIGZpbmFsIFN0cmluZyBuYW1lKSB7Ci0gICAgZmluYWwgU3RyaW5nIHYgPSBvcHRpb25hbChjb25maWcsIG5hbWUpOwotICAgIGlmICh2ID09IG51bGwgfHwgIiIuZXF1YWxzKHYpKSB7Ci0gICAgICB0aHJvdyBuZXcgSWxsZWdhbEFyZ3VtZW50RXhjZXB0aW9uKCJObyBkYXRhYmFzZS4iICsgbmFtZSArICIgY29uZmlndXJlZCIpOwotICAgIH0KLSAgICByZXR1cm4gdjsKLSAgfQogfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9zY2hlbWEvRGF0YVNvdXJjZVR5cGUuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvc2NoZW1hL0RhdGFTb3VyY2VUeXBlLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNTEzZWY2NwotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvc2NoZW1hL0RhdGFTb3VyY2VUeXBlLmphdmEKQEAgLTAsMCArMSw0NCBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5zY2hlbWE7CisKK2ltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOworCisKKy8qKiBBYnN0cmFjdGlvbiBvZiBhIHN1cHBvcnRlZCBkYXRhYmFzZSBwbGF0Zm9ybSAqLworcHVibGljIGludGVyZmFjZSBEYXRhU291cmNlVHlwZSB7CisKKyAgcHVibGljIFN0cmluZyBnZXREcml2ZXIoKTsKKworICBwdWJsaWMgU3RyaW5nIGdldFVybCgpOworCisgIHB1YmxpYyBib29sZWFuIHVzZVBvb2woKTsKKworICAvKioKKyAgICogUmV0dXJuIGEgU2NyaXB0UnVubmVyIHRoYXQgcnVucyB0aGUgaW5kZXggc2NyaXB0LiBNdXN0IG5vdCByZXR1cm4KKyAgICogPGNvZGU+bnVsbDwvY29kZT4sIGJ1dCBtYXkgcmV0dXJuIGEgU2NyaXB0UnVubmVyIHRoYXQgZG9lcyBub3RoaW5nLgorICAgKgorICAgKiBAdGhyb3dzIElPRXhjZXB0aW9uCisgICAqLworICBwdWJsaWMgU2NyaXB0UnVubmVyIGdldEluZGV4U2NyaXB0KCkgdGhyb3dzIElPRXhjZXB0aW9uOworCisgIC8qKgorICAgKiBSZXR1cm4gYSBTY3JpcHRSdW5uZXIgdGhhdCBydW5zIHRoZSBuZXh0VmFsIHNjcmlwdC4gTXVzdCBub3QgcmV0dXJuCisgICAqIDxjb2RlPm51bGw8L2NvZGU+LCBidXQgbWF5IHJldHVybiBhIFNjcmlwdFJ1bm5lciB0aGF0IGRvZXMgbm90aGluZy4KKyAgICoKKyAgICogQHRocm93cyBJT0V4Y2VwdGlvbgorICAgKi8KKyAgcHVibGljIFNjcmlwdFJ1bm5lciBnZXROZXh0VmFsU2NyaXB0KCkgdGhyb3dzIElPRXhjZXB0aW9uOworfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9zY2hlbWEvSDIuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvc2NoZW1hL0gyLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZjQzNTMwZgotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvc2NoZW1hL0gyLmphdmEKQEAgLTAsMCArMSw1MiBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5zY2hlbWE7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLkdlcnJpdFNlcnZlckNvbmZpZzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLlNpdGVQYXRoczsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5Db25maWc7CisKK2ltcG9ydCBqYXZhLmlvLkZpbGU7CitpbXBvcnQgamF2YS5pby5JT0V4Y2VwdGlvbjsKKworY2xhc3MgSDIgZXh0ZW5kcyBCYXNlRGF0YVNvdXJjZVR5cGUgeworCisgIHByb3RlY3RlZCBmaW5hbCBDb25maWcgY2ZnOworICBwcml2YXRlIGZpbmFsIFNpdGVQYXRocyBzaXRlOworCisgIEBJbmplY3QKKyAgSDIoZmluYWwgU2l0ZVBhdGhzIHNpdGUsIEBHZXJyaXRTZXJ2ZXJDb25maWcgZmluYWwgQ29uZmlnIGNmZykgeworICAgIHN1cGVyKCJvcmcuaDIuRHJpdmVyIik7CisgICAgdGhpcy5jZmcgPSBjZmc7CisgICAgdGhpcy5zaXRlID0gc2l0ZTsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgU3RyaW5nIGdldFVybCgpIHsKKyAgICBTdHJpbmcgZGF0YWJhc2UgPSBjZmcuZ2V0U3RyaW5nKCJkYXRhYmFzZSIsIG51bGwsICJkYXRhYmFzZSIpOworICAgIGlmIChkYXRhYmFzZSA9PSBudWxsIHx8IGRhdGFiYXNlLmlzRW1wdHkoKSkgeworICAgICAgZGF0YWJhc2UgPSAiZGIvUmV2aWV3REIiOworICAgIH0KKyAgICBGaWxlIGRiID0gc2l0ZS5yZXNvbHZlKGRhdGFiYXNlKTsKKyAgICB0cnkgeworICAgICAgZGIgPSBkYi5nZXRDYW5vbmljYWxGaWxlKCk7CisgICAgfSBjYXRjaCAoSU9FeGNlcHRpb24gZSkgeworICAgICAgZGIgPSBkYi5nZXRBYnNvbHV0ZUZpbGUoKTsKKyAgICB9CisgICAgcmV0dXJuICJqZGJjOmgyOiIgKyBkYi50b1VSSSgpLnRvU3RyaW5nKCk7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvc2NoZW1hL0pEQkMuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvc2NoZW1hL0pEQkMuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4yYzIwNTFkCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9zY2hlbWEvSkRCQy5qYXZhCkBAIC0wLDAgKzEsMzcgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuc2NoZW1hOworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5Db25maWdVdGlsOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuR2Vycml0U2VydmVyQ29uZmlnOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLkNvbmZpZzsKKworY2xhc3MgSkRCQyBleHRlbmRzIEJhc2VEYXRhU291cmNlVHlwZSB7CisKKyAgcHJvdGVjdGVkIGZpbmFsIENvbmZpZyBjZmc7CisKKyAgQEluamVjdAorICBKREJDKEBHZXJyaXRTZXJ2ZXJDb25maWcgZmluYWwgQ29uZmlnIGNmZykgeworICAgIHN1cGVyKENvbmZpZ1V0aWwuZ2V0UmVxdWlyZWQoY2ZnLCAiZGF0YWJhc2UiLCAiZHJpdmVyIikpOworICAgIHRoaXMuY2ZnID0gY2ZnOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBTdHJpbmcgZ2V0VXJsKCkgeworICAgIHJldHVybiBDb25maWdVdGlsLmdldFJlcXVpcmVkKGNmZywgImRhdGFiYXNlIiwgInVybCIpOworICB9Cit9ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9zY2hlbWEvSmRiY1V0aWwuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvc2NoZW1hL0pkYmNVdGlsLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uOTBjYTQzZAotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvc2NoZW1hL0pkYmNVdGlsLmphdmEKQEAgLTAsMCArMSwzNSBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5zY2hlbWE7CisKK3B1YmxpYyBjbGFzcyBKZGJjVXRpbCB7CisKKyAgcHVibGljIHN0YXRpYyBTdHJpbmcgaG9zdG5hbWUoU3RyaW5nIGhvc3RuYW1lKSB7CisgICAgaWYgKGhvc3RuYW1lID09IG51bGwgfHwgaG9zdG5hbWUuaXNFbXB0eSgpKSB7CisgICAgICBob3N0bmFtZSA9ICJsb2NhbGhvc3QiOworCisgICAgfSBlbHNlIGlmIChob3N0bmFtZS5jb250YWlucygiOiIpICYmICFob3N0bmFtZS5zdGFydHNXaXRoKCJbIikpIHsKKyAgICAgIGhvc3RuYW1lID0gIlsiICsgaG9zdG5hbWUgKyAiXSI7CisgICAgfQorICAgIHJldHVybiBob3N0bmFtZTsKKyAgfQorCisgIHN0YXRpYyBTdHJpbmcgcG9ydChTdHJpbmcgcG9ydCkgeworICAgIGlmIChwb3J0ICE9IG51bGwgJiYgIXBvcnQuaXNFbXB0eSgpKSB7CisgICAgICByZXR1cm4gIjoiICsgcG9ydDsKKyAgICB9CisgICAgcmV0dXJuICIiOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3NjaGVtYS9NeVNxbC5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9zY2hlbWEvTXlTcWwuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5lZDdhYWRmCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9zY2hlbWEvTXlTcWwuamF2YQpAQCAtMCwwICsxLDU5IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnNjaGVtYTsKKworaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuc2NoZW1hLkpkYmNVdGlsLmhvc3RuYW1lOworaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuc2NoZW1hLkpkYmNVdGlsLnBvcnQ7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLkNvbmZpZ1NlY3Rpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5HZXJyaXRTZXJ2ZXJDb25maWc7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OworCitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuQ29uZmlnOworCitpbXBvcnQgamF2YS5pby5JT0V4Y2VwdGlvbjsKKworY2xhc3MgTXlTcWwgZXh0ZW5kcyBCYXNlRGF0YVNvdXJjZVR5cGUgeworCisgIHByaXZhdGUgQ29uZmlnIGNmZzsKKworICBASW5qZWN0CisgIHB1YmxpYyBNeVNxbChAR2Vycml0U2VydmVyQ29uZmlnIGZpbmFsIENvbmZpZyBjZmcpIHsKKyAgICBzdXBlcigiY29tLm15c3FsLmpkYmMuRHJpdmVyIik7CisgICAgdGhpcy5jZmcgPSBjZmc7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIFN0cmluZyBnZXRVcmwoKSB7CisgICAgZmluYWwgU3RyaW5nQnVpbGRlciBiID0gbmV3IFN0cmluZ0J1aWxkZXIoKTsKKyAgICBmaW5hbCBDb25maWdTZWN0aW9uIGRicyA9IG5ldyBDb25maWdTZWN0aW9uKGNmZywgImRhdGFiYXNlIik7CisgICAgYi5hcHBlbmQoImpkYmM6bXlzcWw6Ly8iKTsKKyAgICBiLmFwcGVuZChob3N0bmFtZShkYnMub3B0aW9uYWwoImhvc3RuYW1lIikpKTsKKyAgICBiLmFwcGVuZChwb3J0KGRicy5vcHRpb25hbCgicG9ydCIpKSk7CisgICAgYi5hcHBlbmQoIi8iKTsKKyAgICBiLmFwcGVuZChkYnMucmVxdWlyZWQoImRhdGFiYXNlIikpOworICAgIHJldHVybiBiLnRvU3RyaW5nKCk7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIGJvb2xlYW4gdXNlUG9vbCgpIHsKKyAgICByZXR1cm4gZmFsc2U7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIFNjcmlwdFJ1bm5lciBnZXROZXh0VmFsU2NyaXB0KCkgdGhyb3dzIElPRXhjZXB0aW9uIHsKKyAgICByZXR1cm4gZ2V0U2NyaXB0UnVubmVyKCJteXNxbF9uZXh0dmFsLnNxbCIpOworICB9Cit9ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9zY2hlbWEvUG9zdGdyZVNRTC5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9zY2hlbWEvUG9zdGdyZVNRTC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmM1OGQwYzIKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3NjaGVtYS9Qb3N0Z3JlU1FMLmphdmEKQEAgLTAsMCArMSw1NCBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5zY2hlbWE7CisKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnNjaGVtYS5KZGJjVXRpbC5ob3N0bmFtZTsKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnNjaGVtYS5KZGJjVXRpbC5wb3J0OworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5Db25maWdTZWN0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuR2Vycml0U2VydmVyQ29uZmlnOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLkNvbmZpZzsKKworaW1wb3J0IGphdmEuaW8uSU9FeGNlcHRpb247CisKK2NsYXNzIFBvc3RncmVTUUwgZXh0ZW5kcyBCYXNlRGF0YVNvdXJjZVR5cGUgeworCisgIHByaXZhdGUgQ29uZmlnIGNmZzsKKworICBASW5qZWN0CisgIHB1YmxpYyBQb3N0Z3JlU1FMKEBHZXJyaXRTZXJ2ZXJDb25maWcgZmluYWwgQ29uZmlnIGNmZykgeworICAgIHN1cGVyKCJvcmcucG9zdGdyZXNxbC5Ecml2ZXIiKTsKKyAgICB0aGlzLmNmZyA9IGNmZzsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgU3RyaW5nIGdldFVybCgpIHsKKyAgICBmaW5hbCBTdHJpbmdCdWlsZGVyIGIgPSBuZXcgU3RyaW5nQnVpbGRlcigpOworICAgIGZpbmFsIENvbmZpZ1NlY3Rpb24gZGJjID0gbmV3IENvbmZpZ1NlY3Rpb24oY2ZnLCAiZGF0YWJhc2UiKTsKKyAgICBiLmFwcGVuZCgiamRiYzpwb3N0Z3Jlc3FsOi8vIik7CisgICAgYi5hcHBlbmQoaG9zdG5hbWUoZGJjLm9wdGlvbmFsKCJob3N0bmFtZSIpKSk7CisgICAgYi5hcHBlbmQocG9ydChkYmMub3B0aW9uYWwoInBvcnQiKSkpOworICAgIGIuYXBwZW5kKCIvIik7CisgICAgYi5hcHBlbmQoZGJjLnJlcXVpcmVkKCJkYXRhYmFzZSIpKTsKKyAgICByZXR1cm4gYi50b1N0cmluZygpOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBTY3JpcHRSdW5uZXIgZ2V0SW5kZXhTY3JpcHQoKSB0aHJvd3MgSU9FeGNlcHRpb24geworICAgIHJldHVybiBnZXRTY3JpcHRSdW5uZXIoImluZGV4X3Bvc3RncmVzLnNxbCIpOworICB9Cit9ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9zY2hlbWEvU2NoZW1hQ3JlYXRvci5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9zY2hlbWEvU2NoZW1hQ3JlYXRvci5qYXZhCmluZGV4IGZkMzc5YjIuLjdlYmFjZWJhIDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3NjaGVtYS9TY2hlbWFDcmVhdG9yLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9zY2hlbWEvU2NoZW1hQ3JlYXRvci5qYXZhCkBAIC0zOCwxMCArMzgsNiBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuUHJvamVjdENvbmZpZzsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5qZGJjLkpkYmNFeGVjdXRvcjsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5qZGJjLkpkYmNTY2hlbWE7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2NoZW1hLnNxbC5EaWFsZWN0SDI7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2NoZW1hLnNxbC5EaWFsZWN0TXlTUUw7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2NoZW1hLnNxbC5EaWFsZWN0UG9zdGdyZVNRTDsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zY2hlbWEuc3FsLlNxbERpYWxlY3Q7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLk9ybUV4Y2VwdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CiAKQEAgLTY1LDExICs2MSw5IEBACiAgIHByaXZhdGUgZmluYWwgR2l0UmVwb3NpdG9yeU1hbmFnZXIgbWdyOwogICBwcml2YXRlIGZpbmFsIEFsbFByb2plY3RzTmFtZSBhbGxQcm9qZWN0c05hbWU7CiAgIHByaXZhdGUgZmluYWwgUGVyc29uSWRlbnQgc2VydmVyVXNlcjsKKyAgcHJpdmF0ZSBmaW5hbCBEYXRhU291cmNlVHlwZSBkYXRhU291cmNlVHlwZTsKIAogICBwcml2YXRlIGZpbmFsIGludCB2ZXJzaW9uTmJyOwotICBwcml2YXRlIGZpbmFsIFNjcmlwdFJ1bm5lciBpbmRleF9nZW5lcmljOwotICBwcml2YXRlIGZpbmFsIFNjcmlwdFJ1bm5lciBpbmRleF9wb3N0Z3JlczsKLSAgcHJpdmF0ZSBmaW5hbCBTY3JpcHRSdW5uZXIgbXlzcWxfbmV4dHZhbDsKIAogICBwcml2YXRlIEFjY291bnRHcm91cCBhZG1pbjsKICAgcHJpdmF0ZSBBY2NvdW50R3JvdXAgYW5vbnltb3VzOwpAQCAtODEsMjMgKzc1LDIzIEBACiAgICAgICBAQ3VycmVudCBTY2hlbWFWZXJzaW9uIHZlcnNpb24sCiAgICAgICBHaXRSZXBvc2l0b3J5TWFuYWdlciBtZ3IsCiAgICAgICBBbGxQcm9qZWN0c05hbWUgYWxsUHJvamVjdHNOYW1lLAotICAgICAgQEdlcnJpdFBlcnNvbklkZW50IFBlcnNvbklkZW50IGF1KSB7Ci0gICAgdGhpcyhzaXRlLnNpdGVfcGF0aCwgdmVyc2lvbiwgbWdyLCBhbGxQcm9qZWN0c05hbWUsIGF1KTsKKyAgICAgIEBHZXJyaXRQZXJzb25JZGVudCBQZXJzb25JZGVudCBhdSwKKyAgICAgIERhdGFTb3VyY2VUeXBlIGRzdCkgeworICAgIHRoaXMoc2l0ZS5zaXRlX3BhdGgsIHZlcnNpb24sIG1nciwgYWxsUHJvamVjdHNOYW1lLCBhdSwgZHN0KTsKICAgfQogCiAgIHB1YmxpYyBTY2hlbWFDcmVhdG9yKEBTaXRlUGF0aCBGaWxlIHNpdGUsCiAgICAgICBAQ3VycmVudCBTY2hlbWFWZXJzaW9uIHZlcnNpb24sCiAgICAgICBHaXRSZXBvc2l0b3J5TWFuYWdlciBnaXRNZ3IsCiAgICAgICBBbGxQcm9qZWN0c05hbWUgYXAsCi0gICAgICBAR2Vycml0UGVyc29uSWRlbnQgUGVyc29uSWRlbnQgYXUpIHsKKyAgICAgIEBHZXJyaXRQZXJzb25JZGVudCBQZXJzb25JZGVudCBhdSwKKyAgICAgIERhdGFTb3VyY2VUeXBlIGRzdCkgewogICAgIHNpdGVfcGF0aCA9IHNpdGU7CiAgICAgbWdyID0gZ2l0TWdyOwogICAgIGFsbFByb2plY3RzTmFtZSA9IGFwOwogICAgIHNlcnZlclVzZXIgPSBhdTsKKyAgICBkYXRhU291cmNlVHlwZSA9IGRzdDsKICAgICB2ZXJzaW9uTmJyID0gdmVyc2lvbi5nZXRWZXJzaW9uTmJyKCk7Ci0gICAgaW5kZXhfZ2VuZXJpYyA9IG5ldyBTY3JpcHRSdW5uZXIoImluZGV4X2dlbmVyaWMuc3FsIik7Ci0gICAgaW5kZXhfcG9zdGdyZXMgPSBuZXcgU2NyaXB0UnVubmVyKCJpbmRleF9wb3N0Z3Jlcy5zcWwiKTsKLSAgICBteXNxbF9uZXh0dmFsID0gbmV3IFNjcmlwdFJ1bm5lcigibXlzcWxfbmV4dHZhbC5zcWwiKTsKICAgfQogCiAgIHB1YmxpYyB2b2lkIGNyZWF0ZShmaW5hbCBSZXZpZXdEYiBkYikgdGhyb3dzIE9ybUV4Y2VwdGlvbiwgSU9FeGNlcHRpb24sCkBAIC0xMjMsMjAgKzExNyw4IEBACiAgICAgICBpbml0V2lsZENhcmRQcm9qZWN0KCk7CiAgICAgfQogCi0gICAgZmluYWwgU3FsRGlhbGVjdCBkID0gamRiYy5nZXREaWFsZWN0KCk7Ci0gICAgaWYgKGQgaW5zdGFuY2VvZiBEaWFsZWN0SDIpIHsKLSAgICAgIGluZGV4X2dlbmVyaWMucnVuKGRiKTsKLQotICAgIH0gZWxzZSBpZiAoZCBpbnN0YW5jZW9mIERpYWxlY3RNeVNRTCkgewotICAgICAgaW5kZXhfZ2VuZXJpYy5ydW4oZGIpOwotICAgICAgbXlzcWxfbmV4dHZhbC5ydW4oZGIpOwotCi0gICAgfSBlbHNlIGlmIChkIGluc3RhbmNlb2YgRGlhbGVjdFBvc3RncmVTUUwpIHsKLSAgICAgIGluZGV4X3Bvc3RncmVzLnJ1bihkYik7Ci0KLSAgICB9IGVsc2UgewotICAgICAgdGhyb3cgbmV3IE9ybUV4Y2VwdGlvbigiVW5zdXBwb3J0ZWQgZGF0YWJhc2UgIiArIGQuZ2V0Q2xhc3MoKS5nZXROYW1lKCkpOwotICAgIH0KKyAgICBkYXRhU291cmNlVHlwZS5nZXRJbmRleFNjcmlwdCgpLnJ1bihkYik7CisgICAgZGF0YVNvdXJjZVR5cGUuZ2V0TmV4dFZhbFNjcmlwdCgpLnJ1bihkYik7CiAgIH0KIAogICBwcml2YXRlIEFjY291bnRHcm91cCBuZXdHcm91cChSZXZpZXdEYiBjLCBTdHJpbmcgbmFtZSwgQWNjb3VudEdyb3VwLlVVSUQgdXVpZCkKZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvc2NoZW1hL1NjaGVtYVZlcnNpb24uamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvc2NoZW1hL1NjaGVtYVZlcnNpb24uamF2YQppbmRleCBmMTI3YTIxLi44OWU2ZWU2IDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3NjaGVtYS9TY2hlbWFWZXJzaW9uLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9zY2hlbWEvU2NoZW1hVmVyc2lvbi5qYXZhCkBAIC04Myw2ICs4MywxMSBAQAogICAgICAgdGhyb3dzIE9ybUV4Y2VwdGlvbiwgU1FMRXhjZXB0aW9uIHsKICAgICBmaW5hbCBKZGJjU2NoZW1hIHMgPSAoSmRiY1NjaGVtYSkgZGI7CiAKKyAgICBpZiAoY3Vyci52ZXJzaW9uTmJyID4gdmVyc2lvbk5icikgeworICAgICAgdGhyb3cgbmV3IE9ybUV4Y2VwdGlvbigiQ2Fubm90IGRvd25ncmFkZSBkYXRhYmFzZSBzY2hlbWEgZnJvbSB2ZXJzaW9uICIgKyBjdXJyLnZlcnNpb25OYnIKKyAgICAgICAgICArICIgdG8gIiArIHZlcnNpb25OYnIgKyAiLiIpOworICAgIH0KKwogICAgIHByaW9yLmdldCgpLmNoZWNrKHVpLCBjdXJyLCBkYiwgZmFsc2UpOwogCiAgICAgdWkubWVzc2FnZSgiVXBncmFkaW5nIGRhdGFiYXNlIHNjaGVtYSBmcm9tIHZlcnNpb24gIiArIGN1cnIudmVyc2lvbk5icgpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9zY2hlbWEvU2NoZW1hVmVyc2lvbkNoZWNrLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3NjaGVtYS9TY2hlbWFWZXJzaW9uQ2hlY2suamF2YQppbmRleCAxMzNiODU2Li5hYmU4MTNkIDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3NjaGVtYS9TY2hlbWFWZXJzaW9uQ2hlY2suamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3NjaGVtYS9TY2hlbWFWZXJzaW9uQ2hlY2suamF2YQpAQCAtMTgsNiArMTgsNyBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmxpZmVjeWNsZS5MaWZlY3ljbGVNb2R1bGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkN1cnJlbnRTY2hlbWFWZXJzaW9uOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLnNlcnZlci5SZXZpZXdEYjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLlNpdGVQYXRoczsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5TY2hlbWFGYWN0b3J5OwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKQEAgLTM3LDE0ICszOCwxNyBAQAogICB9CiAKICAgcHJpdmF0ZSBmaW5hbCBTY2hlbWFGYWN0b3J5PFJldmlld0RiPiBzY2hlbWE7CisgIHByaXZhdGUgZmluYWwgU2l0ZVBhdGhzIHNpdGU7CiAKICAgQEN1cnJlbnQKICAgcHJpdmF0ZSBmaW5hbCBQcm92aWRlcjxTY2hlbWFWZXJzaW9uPiB2ZXJzaW9uOwogCiAgIEBJbmplY3QKICAgcHVibGljIFNjaGVtYVZlcnNpb25DaGVjayhTY2hlbWFGYWN0b3J5PFJldmlld0RiPiBzY2hlbWFGYWN0b3J5LAorICAgICAgZmluYWwgU2l0ZVBhdGhzIHNpdGUsCiAgICAgICBAQ3VycmVudCBQcm92aWRlcjxTY2hlbWFWZXJzaW9uPiB2ZXJzaW9uKSB7CiAgICAgdGhpcy5zY2hlbWEgPSBzY2hlbWFGYWN0b3J5OworICAgIHRoaXMuc2l0ZSA9IHNpdGU7CiAgICAgdGhpcy52ZXJzaW9uID0gdmVyc2lvbjsKICAgfQogCkBAIC01MiwxNyArNTYsMjUgQEAKICAgICB0cnkgewogICAgICAgZmluYWwgUmV2aWV3RGIgZGIgPSBzY2hlbWEub3BlbigpOwogICAgICAgdHJ5IHsKLSAgICAgICAgZmluYWwgQ3VycmVudFNjaGVtYVZlcnNpb24gc1ZlciA9IGdldFNjaGVtYVZlcnNpb24oZGIpOwotICAgICAgICBmaW5hbCBpbnQgZVZlciA9IHZlcnNpb24uZ2V0KCkuZ2V0VmVyc2lvbk5icigpOworICAgICAgICBmaW5hbCBDdXJyZW50U2NoZW1hVmVyc2lvbiBjdXJyZW50VmVyID0gZ2V0U2NoZW1hVmVyc2lvbihkYik7CisgICAgICAgIGZpbmFsIGludCBleHBlY3RlZFZlciA9IHZlcnNpb24uZ2V0KCkuZ2V0VmVyc2lvbk5icigpOwogCi0gICAgICAgIGlmIChzVmVyID09IG51bGwpIHsKKyAgICAgICAgaWYgKGN1cnJlbnRWZXIgPT0gbnVsbCkgewogICAgICAgICAgIHRocm93IG5ldyBQcm92aXNpb25FeGNlcHRpb24oIlNjaGVtYSBub3QgeWV0IGluaXRpYWxpemVkLiIKLSAgICAgICAgICAgICAgKyAiICBSdW4gaW5pdCB0byBpbml0aWFsaXplIHRoZSBzY2hlbWEuIik7CisgICAgICAgICAgICAgICsgIiAgUnVuIGluaXQgdG8gaW5pdGlhbGl6ZSB0aGUgc2NoZW1hOlxuIgorICAgICAgICAgICAgICArICIkIGphdmEgLWphciBnZXJyaXQud2FyIGluaXQgLWQgIgorICAgICAgICAgICAgICArIHNpdGUuc2l0ZV9wYXRoLmdldEFic29sdXRlUGF0aCgpKTsKICAgICAgICAgfQotICAgICAgICBpZiAoc1Zlci52ZXJzaW9uTmJyICE9IGVWZXIpIHsKKyAgICAgICAgaWYgKGN1cnJlbnRWZXIudmVyc2lvbk5iciA8IGV4cGVjdGVkVmVyKSB7CiAgICAgICAgICAgdGhyb3cgbmV3IFByb3Zpc2lvbkV4Y2VwdGlvbigiVW5zdXBwb3J0ZWQgc2NoZW1hIHZlcnNpb24gIgotICAgICAgICAgICAgICArIHNWZXIudmVyc2lvbk5iciArICI7IGV4cGVjdGVkIHNjaGVtYSB2ZXJzaW9uICIgKyBlVmVyCi0gICAgICAgICAgICAgICsgIi4gIFJ1biBpbml0IHRvIHVwZ3JhZGUuIik7CisgICAgICAgICAgICAgICsgY3VycmVudFZlci52ZXJzaW9uTmJyICsgIjsgZXhwZWN0ZWQgc2NoZW1hIHZlcnNpb24gIiArIGV4cGVjdGVkVmVyCisgICAgICAgICAgICAgICsgIi4gIFJ1biBpbml0IHRvIHVwZ3JhZGU6XG4iCisgICAgICAgICAgICAgICsgIiQgamF2YSAtamFyIGdlcnJpdC53YXIgaW5pdCAtZCAiCisgICAgICAgICAgICAgICsgc2l0ZS5zaXRlX3BhdGguZ2V0QWJzb2x1dGVQYXRoKCkpOworICAgICAgICB9IGVsc2UgaWYgKGN1cnJlbnRWZXIudmVyc2lvbk5iciA+IGV4cGVjdGVkVmVyKSB7CisgICAgICAgICAgdGhyb3cgbmV3IFByb3Zpc2lvbkV4Y2VwdGlvbigiVW5zdXBwb3J0ZWQgc2NoZW1hIHZlcnNpb24gIgorICAgICAgICAgICAgICArIGN1cnJlbnRWZXIudmVyc2lvbk5iciArICI7IGV4cGVjdGVkIHNjaGVtYSB2ZXJzaW9uICIgKyBleHBlY3RlZFZlcgorICAgICAgICAgICAgICArICIuIERvd25ncmFkZSBpcyBub3Qgc3VwcG9ydGVkLiIpOwogICAgICAgICB9CiAgICAgICB9IGZpbmFsbHkgewogICAgICAgICBkYi5jbG9zZSgpOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9zY2hlbWEvU2NyaXB0UnVubmVyLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3NjaGVtYS9TY3JpcHRSdW5uZXIuamF2YQppbmRleCA4Y2YyZjI2Li5iNWFlYWQ4IDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3NjaGVtYS9TY3JpcHRSdW5uZXIuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3NjaGVtYS9TY3JpcHRSdW5uZXIuamF2YQpAQCAtMTksNyArMTksNiBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5Pcm1FeGNlcHRpb247CiAKIGltcG9ydCBqYXZhLmlvLkJ1ZmZlcmVkUmVhZGVyOwotaW1wb3J0IGphdmEuaW8uRmlsZU5vdEZvdW5kRXhjZXB0aW9uOwogaW1wb3J0IGphdmEuaW8uSU9FeGNlcHRpb247CiBpbXBvcnQgamF2YS5pby5JbnB1dFN0cmVhbTsKIGltcG9ydCBqYXZhLmlvLklucHV0U3RyZWFtUmVhZGVyOwpAQCAtMzQsMTAgKzMzLDE1IEBACiAgIHByaXZhdGUgZmluYWwgU3RyaW5nIG5hbWU7CiAgIHByaXZhdGUgZmluYWwgTGlzdDxTdHJpbmc+IGNvbW1hbmRzOwogCi0gIFNjcmlwdFJ1bm5lcihmaW5hbCBTdHJpbmcgbmFtZSkgeworICBzdGF0aWMgZmluYWwgU2NyaXB0UnVubmVyIE5PT1AgPSBuZXcgU2NyaXB0UnVubmVyKG51bGwsIG51bGwpIHsKKyAgICB2b2lkIHJ1bihmaW5hbCBSZXZpZXdEYiBkYikgeworICAgIH07CisgIH07CisKKyAgU2NyaXB0UnVubmVyKGZpbmFsIFN0cmluZyBzY3JpcHROYW1lLCBmaW5hbCBJbnB1dFN0cmVhbSBzY3JpcHQpIHsKKyAgICB0aGlzLm5hbWUgPSBzY3JpcHROYW1lOwogICAgIHRyeSB7Ci0gICAgICB0aGlzLm5hbWUgPSBuYW1lOwotICAgICAgdGhpcy5jb21tYW5kcyA9IHBhcnNlKG5hbWUpOworICAgICAgdGhpcy5jb21tYW5kcyA9IHNjcmlwdCAhPSBudWxsID8gcGFyc2Uoc2NyaXB0KSA6IG51bGw7CiAgICAgfSBjYXRjaCAoSU9FeGNlcHRpb24gZSkgewogICAgICAgdGhyb3cgbmV3IElsbGVnYWxTdGF0ZUV4Y2VwdGlvbigiQ2Fubm90IHBhcnNlICIgKyBuYW1lLCBlKTsKICAgICB9CkBAIC02MywxMiArNjcsNyBAQAogICAgIH0KICAgfQogCi0gIHByaXZhdGUgTGlzdDxTdHJpbmc+IHBhcnNlKGZpbmFsIFN0cmluZyBuYW1lKSB0aHJvd3MgSU9FeGNlcHRpb24gewotICAgIElucHV0U3RyZWFtIGluID0gUmV2aWV3RGIuY2xhc3MuZ2V0UmVzb3VyY2VBc1N0cmVhbShuYW1lKTsKLSAgICBpZiAoaW4gPT0gbnVsbCkgewotICAgICAgdGhyb3cgbmV3IEZpbGVOb3RGb3VuZEV4Y2VwdGlvbigiU1FMIHNjcmlwdCAiICsgbmFtZSArICIgbm90IGZvdW5kIik7Ci0gICAgfQotCisgIHByaXZhdGUgTGlzdDxTdHJpbmc+IHBhcnNlKGZpbmFsIElucHV0U3RyZWFtIGluKSB0aHJvd3MgSU9FeGNlcHRpb24gewogICAgIEJ1ZmZlcmVkUmVhZGVyIGJyID0gbmV3IEJ1ZmZlcmVkUmVhZGVyKG5ldyBJbnB1dFN0cmVhbVJlYWRlcihpbiwgIlVURi04IikpOwogICAgIHRyeSB7CiAgICAgICBTdHJpbmcgZGVsaW1pdGVyID0gIjsiOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci91dGlsL01hZ2ljQnJhbmNoLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3V0aWwvTWFnaWNCcmFuY2guamF2YQppbmRleCA1MTBkZWFhMDIuLjQ5MjhlMTIgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvdXRpbC9NYWdpY0JyYW5jaC5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvdXRpbC9NYWdpY0JyYW5jaC5qYXZhCkBAIC01NCw2ICs1NCwyMCBAQAogICAgIHJldHVybiBmYWxzZTsKICAgfQogCisgIC8qKiBSZXR1cm5zIHRoZSByZWYgbmFtZSBwcmVmaXggZm9yIGEgbWFnaWMgYnJhbmNoLCA8Y29kZT5udWxsPC9jb2RlPiBpZiB0aGUgYnJhbmNoIGlzIG5vdCBtYWdpYyAqLworICBwdWJsaWMgc3RhdGljIFN0cmluZyBnZXRNYWdpY1JlZk5hbWVQcmVmaXgoU3RyaW5nIHJlZk5hbWUpIHsKKyAgICBpZiAocmVmTmFtZS5zdGFydHNXaXRoKE5FV19EUkFGVF9DSEFOR0UpKSB7CisgICAgICByZXR1cm4gTkVXX0RSQUZUX0NIQU5HRTsKKyAgICB9CisgICAgaWYgKHJlZk5hbWUuc3RhcnRzV2l0aChORVdfUFVCTElTSF9DSEFOR0UpKSB7CisgICAgICByZXR1cm4gTkVXX1BVQkxJU0hfQ0hBTkdFOworICAgIH0KKyAgICBpZiAocmVmTmFtZS5zdGFydHNXaXRoKE5FV19DSEFOR0UpKSB7CisgICAgICByZXR1cm4gTkVXX0NIQU5HRTsKKyAgICB9CisgICAgcmV0dXJuIG51bGw7CisgIH0KKwogICAvKioKICAgICogQ2hlY2tzIGlmIGEgKG1hZ2ljIGJyYW5jaCkvYnJhbmNoX25hbWUgcmVmZXJlbmNlIGV4aXN0cyBpbiB0aGUKICAgICogZGVzdGluYXRpb24gcmVwb3NpdG9yeSBhbmQgb25seSByZXR1cm5zIENhcGFibGUuT0sgaWYgaXQgZG9lcyBub3QgbWF0Y2ggYW55LgpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2dlcnJpdC9QUkVEX3Byb2plY3RfZGVmYXVsdF9zdWJtaXRfdHlwZV8xLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvZ2Vycml0L1BSRURfcHJvamVjdF9kZWZhdWx0X3N1Ym1pdF90eXBlXzEuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4wZjE3M2M3Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2dlcnJpdC9QUkVEX3Byb2plY3RfZGVmYXVsdF9zdWJtaXRfdHlwZV8xLmphdmEKQEAgLTAsMCArMSw1OCBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGdlcnJpdDsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5Qcm9qZWN0LlN1Ym1pdFR5cGU7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucnVsZXMuU3RvcmVkVmFsdWVzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LkNoYW5nZUNvbnRyb2w7CisKK2ltcG9ydCBjb20uZ29vZ2xlY29kZS5wcm9sb2dfY2FmZS5sYW5nLk9wZXJhdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlY29kZS5wcm9sb2dfY2FmZS5sYW5nLlByZWRpY2F0ZTsKK2ltcG9ydCBjb20uZ29vZ2xlY29kZS5wcm9sb2dfY2FmZS5sYW5nLlByb2xvZzsKK2ltcG9ydCBjb20uZ29vZ2xlY29kZS5wcm9sb2dfY2FmZS5sYW5nLlByb2xvZ0V4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlY29kZS5wcm9sb2dfY2FmZS5sYW5nLlN5bWJvbFRlcm07CitpbXBvcnQgY29tLmdvb2dsZWNvZGUucHJvbG9nX2NhZmUubGFuZy5UZXJtOworCitwdWJsaWMgY2xhc3MgUFJFRF9wcm9qZWN0X2RlZmF1bHRfc3VibWl0X3R5cGVfMSBleHRlbmRzIFByZWRpY2F0ZS5QMSB7CisKKyAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgU3ltYm9sVGVybVtdIHRlcm07CisKKyAgc3RhdGljIHsKKyAgICBTdWJtaXRUeXBlW10gdmFsID0gU3VibWl0VHlwZS52YWx1ZXMoKTsKKyAgICB0ZXJtID0gbmV3IFN5bWJvbFRlcm1bdmFsLmxlbmd0aF07CisgICAgZm9yIChpbnQgaSA9IDA7IGkgPCB2YWwubGVuZ3RoOyBpKyspIHsKKyAgICAgIHRlcm1baV0gPSBTeW1ib2xUZXJtLmNyZWF0ZSh2YWxbaV0ubmFtZSgpKTsKKyAgICB9CisgIH0KKworICBwdWJsaWMgUFJFRF9wcm9qZWN0X2RlZmF1bHRfc3VibWl0X3R5cGVfMShUZXJtIGExLCBPcGVyYXRpb24gbikgeworICAgIGFyZzEgPSBhMTsKKyAgICBjb250ID0gbjsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgT3BlcmF0aW9uIGV4ZWMoUHJvbG9nIGVuZ2luZSkgdGhyb3dzIFByb2xvZ0V4Y2VwdGlvbiB7CisgICAgZW5naW5lLnNldEIwKCk7CisgICAgVGVybSBhMSA9IGFyZzEuZGVyZWZlcmVuY2UoKTsKKworICAgIENoYW5nZUNvbnRyb2wgY29udHJvbCA9IFN0b3JlZFZhbHVlcy5DSEFOR0VfQ09OVFJPTC5nZXQoZW5naW5lKTsKKyAgICBTdWJtaXRUeXBlIHN1Ym1pdFR5cGUgPSBjb250cm9sLmdldFByb2plY3QoKS5nZXRTdWJtaXRUeXBlKCk7CisKKyAgICBpZiAoIWExLnVuaWZ5KHRlcm1bc3VibWl0VHlwZS5vcmRpbmFsKCldLCBlbmdpbmUudHJhaWwpKSB7CisgICAgICByZXR1cm4gZW5naW5lLmZhaWwoKTsKKyAgICB9CisgICAgcmV0dXJuIGNvbnQ7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vcHJvbG9nL2dlcnJpdF9jb21tb24ucGwgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL3Byb2xvZy9nZXJyaXRfY29tbW9uLnBsCmluZGV4IGE3NWFjYzAuLjU5Mjg5YzAgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vcHJvbG9nL2dlcnJpdF9jb21tb24ucGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9wcm9sb2cvZ2Vycml0X2NvbW1vbi5wbApAQCAtMTQwLDEyICsxNDAsMTIgQEAKIDotIHB1YmxpYyBjYW5fc3VibWl0LzIuCiAlJQogY2FuX3N1Ym1pdChTdWJtaXRSdWxlLCBTKSA6LQotICBjYWxsX3N1Ym1pdF9ydWxlKFN1Ym1pdFJ1bGUsIFRtcCksCisgIGNhbGxfcnVsZShTdWJtaXRSdWxlLCBUbXApLAogICBUbXAgPS4uIFtzdWJtaXQgfCBMc10sCiAgICggaXNfYWxsX29rKExzKSAtPiBTID0gb2soVG1wKSwgISA7IFMgPSBub3RfcmVhZHkoVG1wKSApLgogCi1jYWxsX3N1Ym1pdF9ydWxlKFA6WCwgQXJnKSA6LSAhLCBGID0uLiBbWCwgQXJnXSwgUDpGLgotY2FsbF9zdWJtaXRfcnVsZShYLCBBcmcpIDotICEsIEYgPS4uIFtYLCBBcmddLCBGLgorY2FsbF9ydWxlKFA6WCwgQXJnKSA6LSAhLCBGID0uLiBbWCwgQXJnXSwgUDpGLgorY2FsbF9ydWxlKFgsIEFyZykgOi0gISwgRiA9Li4gW1gsIEFyZ10sIEYuCiAKIGlzX2FsbF9vayhbXSkuCiBpc19hbGxfb2soW2xhYmVsKF8sIG9rKF9fKSkgfCBMc10pIDotIGlzX2FsbF9vayhMcykuCkBAIC0xNTUsNiArMTU1LDIxIEBACiAKICUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUKICUlCislJSBsb2NhdGVfaGVscGVyCislJQorJSUgICBSZXR1cm5zIHVzZXI6RnVuYyBpZiBpdCBleGlzdHMgb3RoZXJ3aXNlIHJldHVybnMgZ2Vycml0OkRlZmF1bHQKKworbG9jYXRlX2hlbHBlcihGdW5jLCBEZWZhdWx0LCBBcml0eSwgdXNlcjpGdW5jKSA6LQorICAgICckY29tcGlsZWRfcHJlZGljYXRlJyh1c2VyLCBGdW5jLCBBcml0eSksICEuCitsb2NhdGVfaGVscGVyKEZ1bmMsIERlZmF1bHQsIEFyaXR5LCB1c2VyOkZ1bmMpIDotCisgICAgbGlzdE4oQXJpdHksIFApLCBDID0uLiBbRnVuYyB8IFBdLCBjbGF1c2UodXNlcjpDLCBfKSwgIS4KK2xvY2F0ZV9oZWxwZXIoRnVuYywgRGVmYXVsdCwgXywgZ2Vycml0OkRlZmF1bHQpLgorCitsaXN0TigwLCBbXSkuCitsaXN0TihOLCBbX3xUXSkgOi0gTiA+IDAsIE4xIGlzIE4gLSAxLCBsaXN0TihOMSwgVCkuCisKKyUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUKKyUlCiAlJSBsb2NhdGVfc3VibWl0X3J1bGUvMToKICUlCiAlJSAgIEZpbmRzIGEgc3VibWl0X3J1bGUgZGVwZW5kaW5nIG9uIHdoYXQgcnVsZXMgYXJlIGF2YWlsYWJsZS4KQEAgLTE2NCwxNyArMTc5LDMyIEBACiAlJQogCiBsb2NhdGVfc3VibWl0X3J1bGUoUnVsZU5hbWUpIDotCi0gICckY29tcGlsZWRfcHJlZGljYXRlJyh1c2VyLCBzdWJtaXRfcnVsZSwgMSksCi0gICEsCi0gIFJ1bGVOYW1lID0gdXNlcjpzdWJtaXRfcnVsZQotICAuCi1sb2NhdGVfc3VibWl0X3J1bGUoUnVsZU5hbWUpIDotCi0gIGNsYXVzZSh1c2VyOnN1Ym1pdF9ydWxlKF8pLCBfKSwKLSAgISwKLSAgUnVsZU5hbWUgPSB1c2VyOnN1Ym1pdF9ydWxlCi0gIC4KLWxvY2F0ZV9zdWJtaXRfcnVsZShSdWxlTmFtZSkgOi0KLSAgUnVsZU5hbWUgPSBnZXJyaXQ6ZGVmYXVsdF9zdWJtaXQuCisgIGxvY2F0ZV9oZWxwZXIoc3VibWl0X3J1bGUsIGRlZmF1bHRfc3VibWl0LCAxLCBSdWxlTmFtZSkuCisKKworJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJQorJSUKKyUlIGdldF9zdWJtaXRfdHlwZS8yOgorJSUKKyUlICAgRXhlY3V0ZXMgdGhlIFN1Ym1pdFR5cGVSdWxlIGFuZCByZXR1cm4gdGhlIGZpcnN0IHNvbHV0aW9uCislJQorOi0gcHVibGljIGdldF9zdWJtaXRfdHlwZS8yLgorJSUKK2dldF9zdWJtaXRfdHlwZShTdWJtaXRUeXBlUnVsZSwgQSkgOi0KKyAgY2FsbF9ydWxlKFN1Ym1pdFR5cGVSdWxlLCBBKSwgIS4KKworCislJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlCislJQorJSUgbG9jYXRlX3N1Ym1pdF90eXBlLzE6CislJQorJSUgICBGaW5kcyBhIHN1Ym1pdF90eXBlX3J1bGUgZGVwZW5kaW5nIG9uIHdoYXQgcnVsZXMgYXJlIGF2YWlsYWJsZS4KKyUlICAgSWYgbm9uZSBhcmUgYXZhaWxhYmxlLCB1c2UgcHJvamVjdF9kZWZhdWx0X3N1Ym1pdF90eXBlLzEuCislJQorOi0gcHVibGljIGxvY2F0ZV9zdWJtaXRfdHlwZS8xLgorJSUKK2xvY2F0ZV9zdWJtaXRfdHlwZShSdWxlTmFtZSkgOi0KKyAgbG9jYXRlX2hlbHBlcihzdWJtaXRfdHlwZSwgcHJvamVjdF9kZWZhdWx0X3N1Ym1pdF90eXBlLCAxLCBSdWxlTmFtZSkuCiAKIAogJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJQpAQCAtMzA2LDYgKzMzNiwxNyBAQAogY2FsbF9zdWJtaXRfZmlsdGVyKFA6WCwgUiwgUykgOi0gISwgRiA9Li4gW1gsIFIsIFNdLCBQOkYuCiBjYWxsX3N1Ym1pdF9maWx0ZXIoWCwgUiwgUykgOi0gRiA9Li4gW1gsIFIsIFNdLCBGLgogCislJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlCislJQorJSUgZmlsdGVyX3N1Ym1pdF90eXBlX3Jlc3VsdHMvMzoKKyUlCislJSAgIEV4ZWN1dGVzIHRoZSBzdWJtaXRfdHlwZV9maWx0ZXIgYWdhaW5zdCB0aGUgcmVzdWx0LAorJSUgICByZXR1cm5zIHRoZSBmaWx0ZXJlZCByZXN1bHQuCislJQorOi0gcHVibGljIGZpbHRlcl9zdWJtaXRfdHlwZV9yZXN1bHRzLzMuCislJQorZmlsdGVyX3N1Ym1pdF90eXBlX3Jlc3VsdHMoRmlsdGVyLCBJbiwgT3V0KSA6LSBjYWxsX3N1Ym1pdF9maWx0ZXIoRmlsdGVyLCBJbiwgT3V0KS4KKwogCiAlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlCiAlJQpAQCAtMzE2LDE1ICszNTcsMjYgQEAKIDotIHB1YmxpYyBsb2NhdGVfc3VibWl0X2ZpbHRlci8xLgogJSUKIGxvY2F0ZV9zdWJtaXRfZmlsdGVyKEZpbHRlck5hbWUpIDotCi0gICckY29tcGlsZWRfcHJlZGljYXRlJyh1c2VyLCBzdWJtaXRfZmlsdGVyLCAyKSwKLSAgISwKLSAgRmlsdGVyTmFtZSA9IHVzZXI6c3VibWl0X2ZpbHRlcgotICAuCi1sb2NhdGVfc3VibWl0X2ZpbHRlcihGaWx0ZXJOYW1lKSA6LQotICBjbGF1c2UodXNlcjpzdWJtaXRfZmlsdGVyKF8sXyksIF8pLAotICBGaWx0ZXJOYW1lID0gdXNlcjpzdWJtaXRfZmlsdGVyCi0gIC4KKyAgbG9jYXRlX2hlbHBlcihzdWJtaXRfZmlsdGVyLCBub29wX2ZpbHRlciwgMiwgRmlsdGVyTmFtZSkuCiAKKyUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUKKyUlCislJSBub29wX2ZpbHRlci8yOgorJSUKKzotIHB1YmxpYyBub29wX2ZpbHRlci8yLgorJSUKK25vb3BfZmlsdGVyKEluLCBJbikuCisKKyUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUKKyUlCislJSBsb2NhdGVfc3VibWl0X3R5cGVfZmlsdGVyLzE6CislJQorJSUgICBGaW5kcyBhIHN1Ym1pdF90eXBlX2ZpbHRlciBpZiBhdmFpbGFibGUuCislJQorOi0gcHVibGljIGxvY2F0ZV9zdWJtaXRfdHlwZV9maWx0ZXIvMS4KKyUlCitsb2NhdGVfc3VibWl0X3R5cGVfZmlsdGVyKEZpbHRlck5hbWUpIDotCisgIGxvY2F0ZV9oZWxwZXIoc3VibWl0X3R5cGVfZmlsdGVyLCBub29wX2ZpbHRlciwgMiwgRmlsdGVyTmFtZSkuCiAKICUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUKICUlCmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvbWFpbC9Db21tZW50LnZtIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL21haWwvQ29tbWVudC52bQppbmRleCA5YWY5OGE2Li5lNjQ2NzdkIDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvbWFpbC9Db21tZW50LnZtCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9tYWlsL0NvbW1lbnQudm0KQEAgLTMwLDkgKzMwLDkgQEAKICMjIC0tLS0tLS0tLS0tLS0tCiAjIyBUaGUgQ29tbWVudC52bSB0ZW1wbGF0ZSB3aWxsIGRldGVybWluZSB0aGUgY29udGVudHMgb2YgdGhlIGVtYWlsIHJlbGF0ZWQgdG8KICMjIGEgdXNlciBzdWJtaXR0aW5nIGNvbW1lbnRzIG9uIGNoYW5nZXMuICBJdCBpcyBhIENoYW5nZUVtYWlsOiBzZWUKLSMjIENoYW5nZVN1YmplY3Qudm0gYW5kIENoYW5nZUZvb3Rlci52bS4KKyMjIENoYW5nZVN1YmplY3Qudm0sIENoYW5nZUZvb3Rlci52bSBhbmQgQ29tbWVudEZvb3Rlci52bS4KICMjCi0jaWYgKCRlbWFpbC5jb3ZlckxldHRlciB8fCAkZW1haWwuaW5saW5lQ29tbWVudHMpCisjaWYgKCRlbWFpbC5jb3ZlckxldHRlciB8fCAkZW1haWwuaGFzSW5saW5lQ29tbWVudHMoKSkKICRmcm9tTmFtZSBoYXMgcG9zdGVkIGNvbW1lbnRzIG9uIHRoaXMgY2hhbmdlLgogCiBDaGFuZ2Ugc3ViamVjdDogJGNoYW5nZS5zdWJqZWN0CkBAIC00NSw5ICs0NSw5IEBACiAjZW5kCiAjIwogIyMgSXQgaXMgcG9zc2libGUgdG8gaW5jcmVhc2UgdGhlIHNwYW4gb2YgdGhlIHF1b3RlZCBsaW5lcyBieSB1c2luZyB0aGUgbGluZQotIyMgY291bnQgcGFyYW1ldGVyIHdoZW4gY2FsbGluZyAkZW1haWwuaW5saW5lQ29tbWVudHMgYXMgYSBmdW5jdGlvbi4KKyMjIGNvdW50IHBhcmFtZXRlciB3aGVuIGNhbGxpbmcgJGVtYWlsLmdldElubGluZUNvbW1lbnRzIGFzIGEgZnVuY3Rpb24uCiAjIwotIyMgRXhhbXBsZTogI2lmKCRlbWFpbC5pbmxpbmVDb21tZW50cykkZW1haWwuZ2V0SW5saW5lQ29tbWVudHMoNSkjZW5kCisjIyBFeGFtcGxlOiAjaWYoJGVtYWlsLmhhc0lubGluZUNvbW1lbnRzKCkpJGVtYWlsLmdldElubGluZUNvbW1lbnRzKDUpI2VuZAogIyMKLSNpZigkZW1haWwuaW5saW5lQ29tbWVudHMpJGVtYWlsLmlubGluZUNvbW1lbnRzI2VuZAorI2lmKCRlbWFpbC5oYXNJbmxpbmVDb21tZW50cygpKSRlbWFpbC5pbmxpbmVDb21tZW50cyNlbmQKICNlbmQKZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9tYWlsL0NvbW1lbnRGb290ZXIudm0gYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvbWFpbC9Db21tZW50Rm9vdGVyLnZtCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjBlYjc1MGMKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvbWFpbC9Db21tZW50Rm9vdGVyLnZtCkBAIC0wLDAgKzEsNDAgQEAKKyMjIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisjIworIyMgTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisjIyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisjIyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKyMjCisjIyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKyMjCisjIyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisjIyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorIyMgV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisjIyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisjIyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKyMjCisjIworIyMgVGVtcGxhdGUgVHlwZToKKyMjIC0tLS0tLS0tLS0tLS0KKyMjIFRoaXMgaXMgYSB2ZWxvY2l0eSBtYWlsIHRlbXBsYXRlLCBzZWU6IGh0dHA6Ly92ZWxvY2l0eS5hcGFjaGUub3JnIGFuZCB0aGUKKyMjIGdlcnJpdC1kb2NzOmNvbmZpZy1tYWlsLnR4dCBmb3IgbW9yZSBpbmZvIG9uIG1vZGlmeWluZyBnZXJyaXQgbWFpbCB0ZW1wbGF0ZXMuCisjIworIyMgVGVtcGxhdGUgRmlsZSBOYW1lcyBhbmQgZXh0ZW5zaW9uczoKKyMjIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KKyMjIEdlcnJpdCB3aWxsIHVzZSB0ZW1wbGF0ZXMgZW5kaW5nIGluICIudm0iIGJ1dCB3aWxsIGlnbm9yZSB0ZW1wbGF0ZXMgZW5kaW5nCisjIyBpbiAiLnZtLmV4YW1wbGUiLiAgSWYgYSAudm0gdGVtcGxhdGUgZG9lcyBub3QgZXhpc3QsIHRoZSBkZWZhdWx0IGludGVybmFsCisjIyBnZXJyaXQgdGVtcGxhdGUgd2hpY2ggaXMgdGhlIHNhbWUgYXMgdGhlIC52bS5leGFtcGxlIHdpbGwgYmUgdXNlZC4gIElmIHlvdQorIyMgd2FudCB0byBvdmVycmlkZSB0aGUgZGVmYXVsdCB0ZW1wbGF0ZSwgY29weSB0aGUgLnZtLmV4YW1wbGUgZmlsZSB0byBhIC52bQorIyMgZmlsZSBhbmQgZWRpdCBpdCBhcHByb3ByaWF0ZWx5LgorIyMKKyMjIFRoaXMgVGVtcGxhdGU6CisjIyAtLS0tLS0tLS0tLS0tLQorIyMgVGhlIENvbW1lbnRGb290ZXIudm0gdGVtcGxhdGUgd2lsbCBkZXRlcm1pbmUgdGhlIGNvbnRlbnRzIG9mIHRoZSBmb290ZXIKKyMjIHRleHQgdGhhdCB3aWxsIGJlIGFwcGVuZGVkIHRvIGVtYWlscyByZWxhdGVkIHRvIGEgdXNlciBzdWJtaXR0aW5nIGNvbW1lbnRzCisjIyBvbiBjaGFuZ2VzLgorIyMKKyMjIFNlZSBDaGFuZ2VTdWJqZWN0LnZtIGFuZCBDaGFuZ2VGb290ZXIudm0uCisjaWYoJGVtYWlsLmhhc0lubGluZUNvbW1lbnRzKCkpCitHZXJyaXQtSGFzSW5saW5lQ29tbWVudHM6IFllcworI2Vsc2UKK0dlcnJpdC1IYXNJbmxpbmVDb21tZW50czogTm8KKyNlbmQKZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci90b29scy9yb290L2hvb2tzL2NvbW1pdC1tc2cgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvdG9vbHMvcm9vdC9ob29rcy9jb21taXQtbXNnCmluZGV4IDIxMmZmYjEuLjA2OTI2ZGYgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci90b29scy9yb290L2hvb2tzL2NvbW1pdC1tc2cKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Rvb2xzL3Jvb3QvaG9va3MvY29tbWl0LW1zZwpAQCAtMTcsNiArMTcsOCBAQAogIyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KICMKIAordW5zZXQgR1JFUF9PUFRJT05TCisKIENIQU5HRV9JRF9BRlRFUj0iQnVnfElzc3VlIgogTVNHPSIkMSIKIApkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jb25maWcvQ29uZmlnVXRpbFRlc3QuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL3Rlc3QvamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY29uZmlnL0NvbmZpZ1V0aWxUZXN0LmphdmEKaW5kZXggMzcxOTdlYy4uNWQ3MjkxNiAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jb25maWcvQ29uZmlnVXRpbFRlc3QuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NvbmZpZy9Db25maWdVdGlsVGVzdC5qYXZhCkBAIC0yNiw5ICsyNiwxMSBAQAogCiBwdWJsaWMgY2xhc3MgQ29uZmlnVXRpbFRlc3QgZXh0ZW5kcyBUZXN0Q2FzZSB7CiAgIHB1YmxpYyB2b2lkIHRlc3RUaW1lVW5pdCgpIHsKKyAgICBhc3NlcnRFcXVhbHMobXMoMCwgTUlMTElTRUNPTkRTKSwgcGFyc2UoIjAiKSk7CiAgICAgYXNzZXJ0RXF1YWxzKG1zKDIsIE1JTExJU0VDT05EUyksIHBhcnNlKCIybXMiKSk7CiAgICAgYXNzZXJ0RXF1YWxzKG1zKDIwMCwgTUlMTElTRUNPTkRTKSwgcGFyc2UoIjIwMCBtaWxsaXNlY29uZHMiKSk7CiAKKyAgICBhc3NlcnRFcXVhbHMobXMoMCwgU0VDT05EUyksIHBhcnNlKCIwcyIpKTsKICAgICBhc3NlcnRFcXVhbHMobXMoMiwgU0VDT05EUyksIHBhcnNlKCIycyIpKTsKICAgICBhc3NlcnRFcXVhbHMobXMoMjMxLCBTRUNPTkRTKSwgcGFyc2UoIjIzMXNlYyIpKTsKICAgICBhc3NlcnRFcXVhbHMobXMoMSwgU0VDT05EUyksIHBhcnNlKCIxc2Vjb25kIikpOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9zY2hlbWEvU2NoZW1hVXBkYXRlclRlc3QuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL3Rlc3QvamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvc2NoZW1hL1NjaGVtYVVwZGF0ZXJUZXN0LmphdmEKaW5kZXggY2M4ZDQ3ZC4uYmRkMjI1OCAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9zY2hlbWEvU2NoZW1hVXBkYXRlclRlc3QuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3NjaGVtYS9TY2hlbWFVcGRhdGVyVGVzdC5qYXZhCkBAIC0yNyw2ICsyNyw3IEBACiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5HaXRSZXBvc2l0b3J5TWFuYWdlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LkxvY2FsRGlza1JlcG9zaXRvcnlNYW5hZ2VyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnRlc3R1dGlsLkluTWVtb3J5RGF0YWJhc2U7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQudGVzdHV0aWwuSW5NZW1vcnlIMlR5cGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLk9ybUV4Y2VwdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuU2NoZW1hRmFjdG9yeTsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuU3RhdGVtZW50RXhlY3V0b3I7CkBAIC05NCw2ICs5NSw4IEBACiAgICAgICAgIGJpbmQoU3RyaW5nLmNsYXNzKSAvLwogICAgICAgICAgIC5hbm5vdGF0ZWRXaXRoKEFub255bW91c0Nvd2FyZE5hbWUuY2xhc3MpIC8vCiAgICAgICAgICAgLnRvUHJvdmlkZXIoQW5vbnltb3VzQ293YXJkTmFtZVByb3ZpZGVyLmNsYXNzKTsKKworICAgICAgICBiaW5kKERhdGFTb3VyY2VUeXBlLmNsYXNzKS50byhJbk1lbW9yeUgyVHlwZS5jbGFzcyk7CiAgICAgICB9CiAgICAgfSkuZ2V0SW5zdGFuY2UoU2NoZW1hVXBkYXRlci5jbGFzcyk7CiAKZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL3Rlc3QvamF2YS9jb20vZ29vZ2xlL2dlcnJpdC90ZXN0dXRpbC9Jbk1lbW9yeURhdGFiYXNlLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvdGVzdHV0aWwvSW5NZW1vcnlEYXRhYmFzZS5qYXZhCmluZGV4IGIxZjk1NmYuLjU4ZjQ0MmYgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL3Rlc3QvamF2YS9jb20vZ29vZ2xlL2dlcnJpdC90ZXN0dXRpbC9Jbk1lbW9yeURhdGFiYXNlLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3Rlc3R1dGlsL0luTWVtb3J5RGF0YWJhc2UuamF2YQpAQCAtMTU3LDcgKzE1Nyw4IEBACiAgICAgICAgICAgICAgIHNjaGVtYVZlcnNpb24sCiAgICAgICAgICAgICAgIG51bGwsCiAgICAgICAgICAgICAgIG5ldyBBbGxQcm9qZWN0c05hbWUoIlRlc3QtUHJvamVjdHMiKSwKLSAgICAgICAgICAgICAgbmV3IFBlcnNvbklkZW50KCJuYW1lIiwgImVtYWlsQHNpdGUiKSkuY3JlYXRlKGMpOworICAgICAgICAgICAgICBuZXcgUGVyc29uSWRlbnQoIm5hbWUiLCAiZW1haWxAc2l0ZSIpLAorICAgICAgICAgICAgICBuZXcgSW5NZW1vcnlIMlR5cGUoKSkuY3JlYXRlKGMpOwogICAgICAgICB9IGNhdGNoIChJT0V4Y2VwdGlvbiBlKSB7CiAgICAgICAgICAgdGhyb3cgbmV3IE9ybUV4Y2VwdGlvbigiQ2Fubm90IGNyZWF0ZSBpbi1tZW1vcnkgZGF0YWJhc2UiLCBlKTsKICAgICAgICAgfSBjYXRjaCAoQ29uZmlnSW52YWxpZEV4Y2VwdGlvbiBlKSB7CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvdGVzdHV0aWwvSW5NZW1vcnlIMlR5cGUuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL3Rlc3QvamF2YS9jb20vZ29vZ2xlL2dlcnJpdC90ZXN0dXRpbC9Jbk1lbW9yeUgyVHlwZS5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjI1YTY1MzQKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvdGVzdHV0aWwvSW5NZW1vcnlIMlR5cGUuamF2YQpAQCAtMCwwICsxLDMwIEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQudGVzdHV0aWw7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuc2NoZW1hLkJhc2VEYXRhU291cmNlVHlwZTsKKworcHVibGljIGNsYXNzIEluTWVtb3J5SDJUeXBlIGV4dGVuZHMgQmFzZURhdGFTb3VyY2VUeXBlIHsKKworICBwcm90ZWN0ZWQgSW5NZW1vcnlIMlR5cGUoKSB7CisgICAgc3VwZXIobnVsbCk7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIFN0cmluZyBnZXRVcmwoKSB7CisgICAgLy8gbm90IHVzZWQKKyAgICB0aHJvdyBuZXcgVW5zdXBwb3J0ZWRPcGVyYXRpb25FeGNlcHRpb24oKTsKKyAgfQorfQpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL2dlcnJpdC1zc2hkL3BvbS54bWwgYi9nZXJyaXQtc3NoZC9wb20ueG1sCmluZGV4IDMxYjI0MjIuLjNmM2QxNjYgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zc2hkL3BvbS54bWwKKysrIGIvZ2Vycml0LXNzaGQvcG9tLnhtbApAQCAtMjIsNyArMjIsNyBAQAogICA8cGFyZW50PgogICAgIDxncm91cElkPmNvbS5nb29nbGUuZ2Vycml0PC9ncm91cElkPgogICAgIDxhcnRpZmFjdElkPmdlcnJpdC1wYXJlbnQ8L2FydGlmYWN0SWQ+Ci0gICAgPHZlcnNpb24+Mi41LVNOQVBTSE9UPC92ZXJzaW9uPgorICAgIDx2ZXJzaW9uPjIuNi1TTkFQU0hPVDwvdmVyc2lvbj4KICAgPC9wYXJlbnQ+CiAKICAgPGFydGlmYWN0SWQ+Z2Vycml0LXNzaGQ8L2FydGlmYWN0SWQ+CmRpZmYgLS1naXQgYS9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvQmFzZUNvbW1hbmQuamF2YSBiL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9CYXNlQ29tbWFuZC5qYXZhCmluZGV4IDllMDRmMDUuLjNhYmFkODcgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9CYXNlQ29tbWFuZC5qYXZhCisrKyBiL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9CYXNlQ29tbWFuZC5qYXZhCkBAIC02Miw3ICs2Miw2IEBACiAgIHN0YXRpYyBmaW5hbCBpbnQgU1RBVFVTX05PVF9GT1VORCA9IFBSSVZBVEVfU1RBVFVTIHwgMjsKICAgcHVibGljIHN0YXRpYyBmaW5hbCBpbnQgU1RBVFVTX05PVF9BRE1JTiA9IFBSSVZBVEVfU1RBVFVTIHwgMzsKIAotICBAU3VwcHJlc3NXYXJuaW5ncygidW51c2VkIikKICAgQE9wdGlvbihuYW1lID0gIi0tIiwgdXNhZ2UgPSAiZW5kIG9mIG9wdGlvbnMiLCBoYW5kbGVyID0gRW5kT2ZPcHRpb25zSGFuZGxlci5jbGFzcykKICAgcHJpdmF0ZSBib29sZWFuIGVuZE9mT3B0aW9uczsKIApkaWZmIC0tZ2l0IGEvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL1VwbG9hZC5qYXZhIGIvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL1VwbG9hZC5qYXZhCmluZGV4IDQ2ZWI3ODguLmZjMTI3ZWMgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9jb21tYW5kcy9VcGxvYWQuamF2YQorKysgYi9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvY29tbWFuZHMvVXBsb2FkLmphdmEKQEAgLTE1LDYgKzE1LDcgQEAKIHBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc3NoZC5jb21tYW5kczsKIAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLnNlcnZlci5SZXZpZXdEYjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LkNoYW5nZUNhY2hlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuVGFnQ2FjaGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5UcmFuc2ZlckNvbmZpZzsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LlZpc2libGVSZWZGaWx0ZXI7CkBAIC0zNyw2ICszOCw5IEBACiAgIEBJbmplY3QKICAgcHJpdmF0ZSBUYWdDYWNoZSB0YWdDYWNoZTsKIAorICBASW5qZWN0CisgIHByaXZhdGUgQ2hhbmdlQ2FjaGUgY2hhbmdlQ2FjaGU7CisKICAgQE92ZXJyaWRlCiAgIHByb3RlY3RlZCB2b2lkIHJ1bkltcGwoKSB0aHJvd3MgSU9FeGNlcHRpb24sIEZhaWx1cmUgewogICAgIGlmICghcHJvamVjdENvbnRyb2wuY2FuUnVuVXBsb2FkUGFjaygpKSB7CkBAIC00NSw3ICs0OSw3IEBACiAKICAgICBmaW5hbCBVcGxvYWRQYWNrIHVwID0gbmV3IFVwbG9hZFBhY2socmVwbyk7CiAgICAgaWYgKCFwcm9qZWN0Q29udHJvbC5hbGxSZWZzQXJlVmlzaWJsZSgpKSB7Ci0gICAgICB1cC5zZXRBZHZlcnRpc2VSZWZzSG9vayhuZXcgVmlzaWJsZVJlZkZpbHRlcih0YWdDYWNoZSwgcmVwbywKKyAgICAgIHVwLnNldEFkdmVydGlzZVJlZnNIb29rKG5ldyBWaXNpYmxlUmVmRmlsdGVyKHRhZ0NhY2hlLCBjaGFuZ2VDYWNoZSwgcmVwbywKICAgICAgICAgICBwcm9qZWN0Q29udHJvbCwgZGIuZ2V0KCksIHRydWUpKTsKICAgICB9CiAgICAgdXAuc2V0UGFja0NvbmZpZyhjb25maWcuZ2V0UGFja0NvbmZpZygpKTsKZGlmZiAtLWdpdCBhL2dlcnJpdC11dGlsLWNsaS9wb20ueG1sIGIvZ2Vycml0LXV0aWwtY2xpL3BvbS54bWwKaW5kZXggNDg4NmQwOS4uNWZlNThlYiAxMDA2NDQKLS0tIGEvZ2Vycml0LXV0aWwtY2xpL3BvbS54bWwKKysrIGIvZ2Vycml0LXV0aWwtY2xpL3BvbS54bWwKQEAgLTIyLDcgKzIyLDcgQEAKICAgPHBhcmVudD4KICAgICA8Z3JvdXBJZD5jb20uZ29vZ2xlLmdlcnJpdDwvZ3JvdXBJZD4KICAgICA8YXJ0aWZhY3RJZD5nZXJyaXQtcGFyZW50PC9hcnRpZmFjdElkPgotICAgIDx2ZXJzaW9uPjIuNS1TTkFQU0hPVDwvdmVyc2lvbj4KKyAgICA8dmVyc2lvbj4yLjYtU05BUFNIT1Q8L3ZlcnNpb24+CiAgIDwvcGFyZW50PgogCiAgIDxhcnRpZmFjdElkPmdlcnJpdC11dGlsLWNsaTwvYXJ0aWZhY3RJZD4KZGlmZiAtLWdpdCBhL2dlcnJpdC11dGlsLXNzbC9wb20ueG1sIGIvZ2Vycml0LXV0aWwtc3NsL3BvbS54bWwKaW5kZXggYmVlZGI4Zi4uNjlhZTNiNSAxMDA2NDQKLS0tIGEvZ2Vycml0LXV0aWwtc3NsL3BvbS54bWwKKysrIGIvZ2Vycml0LXV0aWwtc3NsL3BvbS54bWwKQEAgLTIyLDcgKzIyLDcgQEAKICAgPHBhcmVudD4KICAgICA8Z3JvdXBJZD5jb20uZ29vZ2xlLmdlcnJpdDwvZ3JvdXBJZD4KICAgICA8YXJ0aWZhY3RJZD5nZXJyaXQtcGFyZW50PC9hcnRpZmFjdElkPgotICAgIDx2ZXJzaW9uPjIuNS1TTkFQU0hPVDwvdmVyc2lvbj4KKyAgICA8dmVyc2lvbj4yLjYtU05BUFNIT1Q8L3ZlcnNpb24+CiAgIDwvcGFyZW50PgogCiAgIDxhcnRpZmFjdElkPmdlcnJpdC11dGlsLXNzbDwvYXJ0aWZhY3RJZD4KZGlmZiAtLWdpdCBhL2dlcnJpdC13YXIvcG9tLnhtbCBiL2dlcnJpdC13YXIvcG9tLnhtbAppbmRleCAxZjM3NTBlLi5lZDQ3M2M2IDEwMDY0NAotLS0gYS9nZXJyaXQtd2FyL3BvbS54bWwKKysrIGIvZ2Vycml0LXdhci9wb20ueG1sCkBAIC0yMiw3ICsyMiw3IEBACiAgIDxwYXJlbnQ+CiAgICAgPGdyb3VwSWQ+Y29tLmdvb2dsZS5nZXJyaXQ8L2dyb3VwSWQ+CiAgICAgPGFydGlmYWN0SWQ+Z2Vycml0LXBhcmVudDwvYXJ0aWZhY3RJZD4KLSAgICA8dmVyc2lvbj4yLjUtU05BUFNIT1Q8L3ZlcnNpb24+CisgICAgPHZlcnNpb24+Mi42LVNOQVBTSE9UPC92ZXJzaW9uPgogICA8L3BhcmVudD4KIAogICA8YXJ0aWZhY3RJZD5nZXJyaXQtd2FyPC9hcnRpZmFjdElkPgpAQCAtNTksMTQgKzU5LDEyIEBACiAgICAgPGRlcGVuZGVuY3k+CiAgICAgICA8Z3JvdXBJZD5ib3VuY3ljYXN0bGU8L2dyb3VwSWQ+CiAgICAgICA8YXJ0aWZhY3RJZD5iY3Byb3YtamRrMTU8L2FydGlmYWN0SWQ+Ci0gICAgICA8dmVyc2lvbj4xNDA8L3ZlcnNpb24+CiAgICAgICA8c2NvcGU+cHJvdmlkZWQ8L3Njb3BlPgogICAgIDwvZGVwZW5kZW5jeT4KIAogICAgIDxkZXBlbmRlbmN5PgogICAgICAgPGdyb3VwSWQ+Ym91bmN5Y2FzdGxlPC9ncm91cElkPgogICAgICAgPGFydGlmYWN0SWQ+YmNwZy1qZGsxNTwvYXJ0aWZhY3RJZD4KLSAgICAgIDx2ZXJzaW9uPjE0MDwvdmVyc2lvbj4KICAgICAgIDxzY29wZT5wcm92aWRlZDwvc2NvcGU+CiAgICAgPC9kZXBlbmRlbmN5PgogCkBAIC0xODQsNiArMTgyLDMzIEBACiAgICAgICAgICAgICAgIDxnb2FsPnJ1bjwvZ29hbD4KICAgICAgICAgICAgIDwvZ29hbHM+CiAgICAgICAgICAgPC9leGVjdXRpb24+CisgICAgICAgICAgPGV4ZWN1dGlvbj4KKyAgICAgICAgICAgIDxpZD5pbmNsdWRlLXJlbGVhc2Utbm90ZXM8L2lkPgorICAgICAgICAgICAgPHBoYXNlPnByb2Nlc3MtY2xhc3NlczwvcGhhc2U+CisgICAgICAgICAgICA8Y29uZmlndXJhdGlvbj4KKyAgICAgICAgICAgICAgPHRhcmdldCBpZj0iZ2Vycml0LmluY2x1ZGUtZG9jdW1lbnRhdGlvbiI+CisgICAgICAgICAgICAgICAgPHByb3BlcnR5IG5hbWU9InNyYyIgbG9jYXRpb249IiR7YmFzZWRpcn0vLi4vUmVsZWFzZU5vdGVzIiAvPgorICAgICAgICAgICAgICAgIDxwcm9wZXJ0eSBuYW1lPSJvdXQiIGxvY2F0aW9uPSIke3Byb2plY3QuYnVpbGQuZGlyZWN0b3J5fS8ke3Byb2plY3QuYnVpbGQuZmluYWxOYW1lfSIgLz4KKyAgICAgICAgICAgICAgICA8cHJvcGVydHkgbmFtZT0iZHN0IiBsb2NhdGlvbj0iJHtvdXR9L1JlbGVhc2VOb3RlcyIgLz4KKworICAgICAgICAgICAgICAgIDxleGVjIGRpcj0iJHtzcmN9IiBleGVjdXRhYmxlPSJtYWtlIj4KKyAgICAgICAgICAgICAgICAgIDxhcmcgdmFsdWU9IlZFUlNJT049JHtwcm9qZWN0LnZlcnNpb259IiAvPgorICAgICAgICAgICAgICAgICAgPGFyZyB2YWx1ZT0iY2xlYW4iIC8+CisgICAgICAgICAgICAgICAgICA8YXJnIHZhbHVlPSJhbGwiIC8+CisgICAgICAgICAgICAgICAgPC9leGVjPgorCisgICAgICAgICAgICAgICAgPG1rZGlyIGRpcj0iJHtkc3R9IiAvPgorICAgICAgICAgICAgICAgIDxjb3B5IG92ZXJ3cml0ZT0idHJ1ZSIgdG9kaXI9IiR7ZHN0fSI+CisgICAgICAgICAgICAgICAgICA8ZmlsZXNldCBkaXI9IiR7c3JjfSI+CisgICAgICAgICAgICAgICAgICAgIDxpbmNsdWRlIG5hbWU9IiouaHRtbCIgLz4KKyAgICAgICAgICAgICAgICAgIDwvZmlsZXNldD4KKyAgICAgICAgICAgICAgICA8L2NvcHk+CisgICAgICAgICAgICAgIDwvdGFyZ2V0PgorICAgICAgICAgICAgPC9jb25maWd1cmF0aW9uPgorICAgICAgICAgICAgPGdvYWxzPgorICAgICAgICAgICAgICA8Z29hbD5ydW48L2dvYWw+CisgICAgICAgICAgICA8L2dvYWxzPgorICAgICAgICAgIDwvZXhlY3V0aW9uPgogICAgICAgICA8L2V4ZWN1dGlvbnM+CiAgICAgICA8L3BsdWdpbj4KICAgICA8L3BsdWdpbnM+CmRpZmYgLS1naXQgYS9nZXJyaXQtd2FyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvV2ViQXBwSW5pdGlhbGl6ZXIuamF2YSBiL2dlcnJpdC13YXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9XZWJBcHBJbml0aWFsaXplci5qYXZhCmluZGV4IDFhNTU2YzIuLmIzNTJkNGYgMTAwNjQ0Ci0tLSBhL2dlcnJpdC13YXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9XZWJBcHBJbml0aWFsaXplci5qYXZhCisrKyBiL2dlcnJpdC13YXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9XZWJBcHBJbml0aWFsaXplci5qYXZhCkBAIC0yOCw2ICsyOCw3IEBACiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5BdXRoQ29uZmlnTW9kdWxlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuQ2Fub25pY2FsV2ViVXJsTW9kdWxlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuR2Vycml0R2xvYmFsTW9kdWxlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuR2Vycml0U2VydmVyQ29uZmlnOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuR2Vycml0U2VydmVyQ29uZmlnTW9kdWxlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuTWFzdGVyTm9kZVN0YXJ0dXA7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5TaXRlUGF0aDsKQEAgLTM5LDcgKzQwLDkgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIubWFpbC5TbXRwRW1haWxTZW5kZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnBsdWdpbnMuUGx1Z2luR3VpY2VFbnZpcm9ubWVudDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucGx1Z2lucy5QbHVnaW5Nb2R1bGU7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnNjaGVtYS5EYXRhU291cmNlTW9kdWxlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5zY2hlbWEuRGF0YVNvdXJjZVByb3ZpZGVyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5zY2hlbWEuRGF0YVNvdXJjZVR5cGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnNjaGVtYS5EYXRhYmFzZU1vZHVsZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuc2NoZW1hLlNjaGVtYU1vZHVsZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuc2NoZW1hLlNjaGVtYVZlcnNpb25DaGVjazsKQEAgLTU2LDYgKzU5LDcgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5zZXJ2bGV0Lkd1aWNlU2VydmxldENvbnRleHRMaXN0ZW5lcjsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5zcGkuTWVzc2FnZTsKIAoraW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLkNvbmZpZzsKIGltcG9ydCBvcmcuc2xmNGouTG9nZ2VyOwogaW1wb3J0IG9yZy5zbGY0ai5Mb2dnZXJGYWN0b3J5OwogCkBAIC0xNDQsMTAgKzE0OCwzNSBAQAogICBwcml2YXRlIEluamVjdG9yIGNyZWF0ZURiSW5qZWN0b3IoKSB7CiAgICAgZmluYWwgTGlzdDxNb2R1bGU+IG1vZHVsZXMgPSBuZXcgQXJyYXlMaXN0PE1vZHVsZT4oKTsKICAgICBpZiAoc2l0ZVBhdGggIT0gbnVsbCkgewotICAgICAgbW9kdWxlcy5hZGQobmV3IExpZmVjeWNsZU1vZHVsZSgpIHsKKyAgICAgIE1vZHVsZSBzaXRlUGF0aE1vZHVsZSA9IG5ldyBBYnN0cmFjdE1vZHVsZSgpIHsKICAgICAgICAgQE92ZXJyaWRlCiAgICAgICAgIHByb3RlY3RlZCB2b2lkIGNvbmZpZ3VyZSgpIHsKICAgICAgICAgICBiaW5kKEZpbGUuY2xhc3MpLmFubm90YXRlZFdpdGgoU2l0ZVBhdGguY2xhc3MpLnRvSW5zdGFuY2Uoc2l0ZVBhdGgpOworICAgICAgICB9CisgICAgICB9OworICAgICAgbW9kdWxlcy5hZGQoc2l0ZVBhdGhNb2R1bGUpOworCisgICAgICBNb2R1bGUgY29uZmlnTW9kdWxlID0gbmV3IEdlcnJpdFNlcnZlckNvbmZpZ01vZHVsZSgpOworICAgICAgbW9kdWxlcy5hZGQoY29uZmlnTW9kdWxlKTsKKworICAgICAgSW5qZWN0b3IgY2ZnSW5qZWN0b3IgPSBHdWljZS5jcmVhdGVJbmplY3RvcihzaXRlUGF0aE1vZHVsZSwgY29uZmlnTW9kdWxlKTsKKyAgICAgIENvbmZpZyBjZmcgPSBjZmdJbmplY3Rvci5nZXRJbnN0YW5jZShLZXkuZ2V0KENvbmZpZy5jbGFzcywKKyAgICAgICAgICBHZXJyaXRTZXJ2ZXJDb25maWcuY2xhc3MpKTsKKyAgICAgIFN0cmluZyBkYlR5cGUgPSBjZmcuZ2V0U3RyaW5nKCJkYXRhYmFzZSIsIG51bGwsICJ0eXBlIik7CisKKyAgICAgIGZpbmFsIERhdGFTb3VyY2VUeXBlIGRzdCA9IEd1aWNlLmNyZWF0ZUluamVjdG9yKG5ldyBEYXRhU291cmNlTW9kdWxlKCksCisgICAgICAgICAgY29uZmlnTW9kdWxlLCBzaXRlUGF0aE1vZHVsZSkuZ2V0SW5zdGFuY2UoCisgICAgICAgICAgICBLZXkuZ2V0KERhdGFTb3VyY2VUeXBlLmNsYXNzLCBOYW1lcy5uYW1lZChkYlR5cGUudG9Mb3dlckNhc2UoKSkpKTsKKyAgICAgIG1vZHVsZXMuYWRkKG5ldyBBYnN0cmFjdE1vZHVsZSgpIHsKKyAgICAgICAgQE92ZXJyaWRlCisgICAgICAgIHByb3RlY3RlZCB2b2lkIGNvbmZpZ3VyZSgpIHsKKyAgICAgICAgICBiaW5kKERhdGFTb3VyY2VUeXBlLmNsYXNzKS50b0luc3RhbmNlKGRzdCk7CisgICAgICAgIH0KKyAgICAgIH0pOworCisgICAgICBtb2R1bGVzLmFkZChuZXcgTGlmZWN5Y2xlTW9kdWxlKCkgeworICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgcHJvdGVjdGVkIHZvaWQgY29uZmlndXJlKCkgewogICAgICAgICAgIGJpbmQoRGF0YVNvdXJjZVByb3ZpZGVyLkNvbnRleHQuY2xhc3MpLnRvSW5zdGFuY2UoCiAgICAgICAgICAgICAgIERhdGFTb3VyY2VQcm92aWRlci5Db250ZXh0Lk1VTFRJX1VTRVIpOwogICAgICAgICAgIGJpbmQoS2V5LmdldChEYXRhU291cmNlLmNsYXNzLCBOYW1lcy5uYW1lZCgiUmV2aWV3RGIiKSkpLnRvUHJvdmlkZXIoCkBAIC0xNTUsNyArMTg0LDYgQEAKICAgICAgICAgICBsaXN0ZW5lcigpLnRvKERhdGFTb3VyY2VQcm92aWRlci5jbGFzcyk7CiAgICAgICAgIH0KICAgICAgIH0pOwotICAgICAgbW9kdWxlcy5hZGQobmV3IEdlcnJpdFNlcnZlckNvbmZpZ01vZHVsZSgpKTsKIAogICAgIH0gZWxzZSB7CiAgICAgICBtb2R1bGVzLmFkZChuZXcgTGlmZWN5Y2xlTW9kdWxlKCkgewpkaWZmIC0tZ2l0IGEvcG9tLnhtbCBiL3BvbS54bWwKaW5kZXggZDdiNTk4OC4uZGY1ZDdlYyAxMDA2NDQKLS0tIGEvcG9tLnhtbAorKysgYi9wb20ueG1sCkBAIC0yMiw3ICsyMiw3IEBACiAgIDxncm91cElkPmNvbS5nb29nbGUuZ2Vycml0PC9ncm91cElkPgogICA8YXJ0aWZhY3RJZD5nZXJyaXQtcGFyZW50PC9hcnRpZmFjdElkPgogICA8cGFja2FnaW5nPnBvbTwvcGFja2FnaW5nPgotICA8dmVyc2lvbj4yLjUtU05BUFNIT1Q8L3ZlcnNpb24+CisgIDx2ZXJzaW9uPjIuNi1TTkFQU0hPVDwvdmVyc2lvbj4KIAogICA8bmFtZT5HZXJyaXQgQ29kZSBSZXZpZXcgLSBQYXJlbnQ8L25hbWU+CiAgIDx1cmw+aHR0cDovL2NvZGUuZ29vZ2xlLmNvbS9wL2dlcnJpdC88L3VybD4KQEAgLTQ3LDEwICs0NywxMSBAQAogCiAgIDxwcm9wZXJ0aWVzPgogICAgIDxqZ2l0VmVyc2lvbj4yLjAuMC4yMDEyMDYxMzA5MDAtci4yMy1nYjNkYmYxOTwvamdpdFZlcnNpb24+Ci0gICAgPGd3dG9ybVZlcnNpb24+MS40PC9nd3Rvcm1WZXJzaW9uPgorICAgIDxnd3Rvcm1WZXJzaW9uPjEuNTwvZ3d0b3JtVmVyc2lvbj4KICAgICA8Z3d0anNvbnJwY1ZlcnNpb24+MS4zPC9nd3Rqc29ucnBjVmVyc2lvbj4KICAgICA8Z3d0ZXhwdWlWZXJzaW9uPjEuMi42PC9nd3RleHB1aVZlcnNpb24+CiAgICAgPGd3dFZlcnNpb24+Mi40LjA8L2d3dFZlcnNpb24+CisgICAgPGJvdW5jeUNhc3RsZVZlcnNpb24+MTQwPC9ib3VuY3lDYXN0bGVWZXJzaW9uPgogICAgIDxzbGY0alZlcnNpb24+MS42LjE8L3NsZjRqVmVyc2lvbj4KICAgICA8Z3VpY2VWZXJzaW9uPjMuMDwvZ3VpY2VWZXJzaW9uPgogICAgIDxqZXR0eVZlcnNpb24+Ny4yLjEudjIwMTAxMTExPC9qZXR0eVZlcnNpb24+CkBAIC05OCw3ICs5OSwxMCBAQAogICAgICAgPG1vZHVsZXM+CiAgICAgICAgIDxtb2R1bGU+Z2Vycml0LXBsdWdpbi1hcGk8L21vZHVsZT4KICAgICAgICAgPG1vZHVsZT5nZXJyaXQtcGx1Z2luLWFyY2hldHlwZTwvbW9kdWxlPgotICAgICAgPC9tb2R1bGVzPgorICAgICAgICA8bW9kdWxlPmdlcnJpdC1wbHVnaW4tZ3d0dWk8L21vZHVsZT4KKyAgICAgICAgPG1vZHVsZT5nZXJyaXQtcGx1Z2luLWpzLWFyY2hldHlwZTwvbW9kdWxlPgorICAgICAgICA8bW9kdWxlPmdlcnJpdC1wbHVnaW4tZ3d0LWFyY2hldHlwZTwvbW9kdWxlPgorICAgICA8L21vZHVsZXM+CiAgICAgPC9wcm9maWxlPgogICAgIDxwcm9maWxlPgogICAgICAgPGFjdGl2YXRpb24+CkBAIC00NzgsNyArNDgyLDcgQEAKICAgICAgIDxkZXBlbmRlbmN5PgogICAgICAgICA8Z3JvdXBJZD5jb20uZ29vZ2xlLmd1YXZhPC9ncm91cElkPgogICAgICAgICA8YXJ0aWZhY3RJZD5ndWF2YTwvYXJ0aWZhY3RJZD4KLSAgICAgICAgPHZlcnNpb24+MTIuMC4xPC92ZXJzaW9uPgorICAgICAgICA8dmVyc2lvbj4xMy4wLjE8L3ZlcnNpb24+CiAgICAgICA8L2RlcGVuZGVuY3k+CiAKICAgICAgIDxkZXBlbmRlbmN5PgpAQCAtNjgzLDcgKzY4NywxMyBAQAogICAgICAgPGRlcGVuZGVuY3k+CiAgICAgICAgIDxncm91cElkPmJvdW5jeWNhc3RsZTwvZ3JvdXBJZD4KICAgICAgICAgPGFydGlmYWN0SWQ+YmNwZy1qZGsxNTwvYXJ0aWZhY3RJZD4KLSAgICAgICAgPHZlcnNpb24+MTQwPC92ZXJzaW9uPgorICAgICAgICA8dmVyc2lvbj4ke2JvdW5jeUNhc3RsZVZlcnNpb259PC92ZXJzaW9uPgorICAgICAgPC9kZXBlbmRlbmN5PgorCisgICAgICA8ZGVwZW5kZW5jeT4KKyAgICAgICAgPGdyb3VwSWQ+Ym91bmN5Y2FzdGxlPC9ncm91cElkPgorICAgICAgICA8YXJ0aWZhY3RJZD5iY3Byb3YtamRrMTU8L2FydGlmYWN0SWQ+CisgICAgICAgIDx2ZXJzaW9uPiR7Ym91bmN5Q2FzdGxlVmVyc2lvbn08L3ZlcnNpb24+CiAgICAgICA8L2RlcGVuZGVuY3k+CiAKICAgICAgIDxkZXBlbmRlbmN5PgpAQCAtNzYyLDEzICs3NzIsMTMgQEAKICAgICAgIDxkZXBlbmRlbmN5PgogICAgICAgICA8Z3JvdXBJZD5jb20uaDJkYXRhYmFzZTwvZ3JvdXBJZD4KICAgICAgICAgPGFydGlmYWN0SWQ+aDI8L2FydGlmYWN0SWQ+Ci0gICAgICAgIDx2ZXJzaW9uPjEuMi4xNDc8L3ZlcnNpb24+CisgICAgICAgIDx2ZXJzaW9uPjEuMy4xNjg8L3ZlcnNpb24+CiAgICAgICA8L2RlcGVuZGVuY3k+CiAKICAgICAgIDxkZXBlbmRlbmN5PgogICAgICAgICA8Z3JvdXBJZD5wb3N0Z3Jlc3FsPC9ncm91cElkPgogICAgICAgICA8YXJ0aWZhY3RJZD5wb3N0Z3Jlc3FsPC9hcnRpZmFjdElkPgotICAgICAgICA8dmVyc2lvbj45LjAtODAxLmpkYmM0PC92ZXJzaW9uPgorICAgICAgICA8dmVyc2lvbj45LjEtOTAxLTEuamRiYzQ8L3ZlcnNpb24+CiAgICAgICA8L2RlcGVuZGVuY3k+CiAKICAgICAgIDxkZXBlbmRlbmN5PgpAQCAtODIxLDcgKzgzMSw3IEBACiAgICAgICA8L2RlcGVuZGVuY3k+CiAKICAgICAgIDxkZXBlbmRlbmN5PgotICAgICAgICA8Z3JvdXBJZD5jb20uZ29vZ2xlLmdlcnJpdDwvZ3JvdXBJZD4KKyAgICAgICAgPGdyb3VwSWQ+Y29tLmdvb2dsZWNvZGUuanVuaXZlcnNhbGNoYXJkZXQ8L2dyb3VwSWQ+CiAgICAgICAgIDxhcnRpZmFjdElkPmp1bml2ZXJzYWxjaGFyZGV0PC9hcnRpZmFjdElkPgogICAgICAgICA8dmVyc2lvbj4xLjAuMzwvdmVyc2lvbj4KICAgICAgIDwvZGVwZW5kZW5jeT4KQEAgLTg0Myw2ICs4NTMsMTcgQEAKICAgICAgICAgPGFydGlmYWN0SWQ+cGVnZG93bjwvYXJ0aWZhY3RJZD4KICAgICAgICAgPHZlcnNpb24+MS4xLjA8L3ZlcnNpb24+CiAgICAgICA8L2RlcGVuZGVuY3k+CisKKyAgICAgIDxkZXBlbmRlbmN5PgorICAgICAgICA8Z3JvdXBJZD5vcmcucGFyYm9pbGVkPC9ncm91cElkPgorICAgICAgICA8YXJ0aWZhY3RJZD5wYXJib2lsZWQtY29yZTwvYXJ0aWZhY3RJZD4KKyAgICAgICAgPHZlcnNpb24+MS4xPC92ZXJzaW9uPgorICAgICAgPC9kZXBlbmRlbmN5PgorICAgICAgPGRlcGVuZGVuY3k+CisgICAgICAgIDxncm91cElkPm9yZy5wYXJib2lsZWQ8L2dyb3VwSWQ+CisgICAgICAgIDxhcnRpZmFjdElkPnBhcmJvaWxlZC1qYXZhPC9hcnRpZmFjdElkPgorICAgICAgICA8dmVyc2lvbj4xLjE8L3ZlcnNpb24+CisgICAgICA8L2RlcGVuZGVuY3k+CiAgICAgPC9kZXBlbmRlbmNpZXM+CiAgIDwvZGVwZW5kZW5jeU1hbmFnZW1lbnQ+CiAKQEAgLTg2MywxMSArODg0LDYgQEAKICAgICA8L3JlcG9zaXRvcnk+CiAKICAgICA8cmVwb3NpdG9yeT4KLSAgICAgIDxpZD5vYmplY3R3ZWItcmVwb3NpdG9yeTwvaWQ+Ci0gICAgICA8dXJsPmh0dHA6Ly9tYXZlbi5vYmplY3R3ZWIub3JnL21hdmVuMi88L3VybD4KLSAgICA8L3JlcG9zaXRvcnk+Ci0KLSAgICA8cmVwb3NpdG9yeT4KICAgICAgIDxpZD5jbG9qYXJzLXJlcG88L2lkPgogICAgICAgPHVybD5odHRwOi8vY2xvamFycy5vcmcvcmVwbzwvdXJsPgogICAgIDwvcmVwb3NpdG9yeT4KQEAgLTg3Niw1ICs4OTIsMTAgQEAKICAgICAgIDxpZD5zY2FsYS10b29sczwvaWQ+CiAgICAgICA8dXJsPmh0dHA6Ly9zY2FsYS10b29scy5vcmcvcmVwby1yZWxlYXNlczwvdXJsPgogICAgIDwvcmVwb3NpdG9yeT4KKworICAgIDxyZXBvc2l0b3J5PgorICAgICAgPGlkPnBhcmJvaWxlZC1yZXBvPC9pZD4KKyAgICAgIDx1cmw+aHR0cDovL3JlcG8uc3ByYXkuY2MvPC91cmw+CisgICAgPC9yZXBvc2l0b3J5PgogICA8L3JlcG9zaXRvcmllcz4KIDwvcHJvamVjdD4K