ZGlmZiAtLWdpdCBhL2phdmFfZ2VuL3ByZS13cml0dGVuL3NyYy9tYWluL2phdmEvb3JnL29wZW5mbG93L3Byb3RvY29sL21hdGNoL01hdGNoLmphdmEgYi9qYXZhX2dlbi9wcmUtd3JpdHRlbi9zcmMvbWFpbi9qYXZhL29yZy9vcGVuZmxvdy9wcm90b2NvbC9tYXRjaC9NYXRjaC5qYXZhCmluZGV4IGQzNWY3MDkuLjhmMTc4NDUgMTAwNjQ0Ci0tLSBhL2phdmFfZ2VuL3ByZS13cml0dGVuL3NyYy9tYWluL2phdmEvb3JnL29wZW5mbG93L3Byb3RvY29sL21hdGNoL01hdGNoLmphdmEKKysrIGIvamF2YV9nZW4vcHJlLXdyaXR0ZW4vc3JjL21haW4vamF2YS9vcmcvb3BlbmZsb3cvcHJvdG9jb2wvbWF0Y2gvTWF0Y2guamF2YQpAQCAtNCw4OSArNCwxOTAgQEAKIGltcG9ydCBvcmcub3BlbmZsb3cudHlwZXMuTWFza2VkOwogaW1wb3J0IG9yZy5vcGVuZmxvdy50eXBlcy5PRlZhbHVlVHlwZTsKIAotcHVibGljIGludGVyZmFjZSBNYXRjaCBleHRlbmRzIE9GT2JqZWN0IHsKLQotICAgIC8qCi0gICAgICogUHJlY29uZGl0aW9ucwotICAgICAqIE9uIHByZWNvbmRpdGlvbnMgKGZyb20gdGhlIE9GMS4xIHNwZWMsIHBhZ2UgMjgsIHRoZSBPRjEuMCBzcGVjIGZhaWxlZCB0byBleHBsaWNpdGx5Ci0gICAgICogc3BlY2lmeSB0aGlzLCBidXQgaXQgaXMgdGhlIGJlaGF2aW9yIG9mIE9mMS4wIHN3aXRjaGVzKToKLSAgICAgKiBQcm90b2NvbC1zcGVjaWZpYyBmaWVsZHMgd2l0aGluIG9mcF9tYXRjaCB3aWxsIGJlIGlnbm9yZWQgd2l0aGluIGEgc2luZ2xlIHRhYmxlIHdoZW4KLSAgICAgKiB0aGUgY29ycmVzcG9uZGluZyBwcm90b2NvbCBpcyBub3Qgc3BlY2lmaWVkIGluIHRoZSBtYXRjaC4gVGhlIE1QTFMgbWF0Y2ggZmllbGRzIHdpbGwKLSAgICAgKiBiZSBpZ25vcmVkIHVubGVzcyB0aGUgRXRoZXJ0eXBlIGlzIHNwZWNpZmllZCBhcyBNUExTLiBMaWtld2lzZSwgdGhlIElQIGhlYWRlciBhbmQKLSAgICAgKiB0cmFuc3BvcnQgaGVhZGVyIGZpZWxkcyB3aWxsIGJlIGlnbm9yZWQgdW5sZXNzIHRoZSBFdGhlcnR5cGUgaXMgc3BlY2lmaWVkIGFzIGVpdGhlcgotICAgICAqIElQdjQgb3IgQVJQLiBUaGUgdHBfc3JjIGFuZCB0cF9kc3QgZmllbGRzIHdpbGwgYmUgaWdub3JlZCB1bmxlc3MgdGhlIG5ldHdvcmsgcHJvdG9jb2wKLSAgICAgKiBzcGVjaWZpZWQgaXMgYXMgVENQLCBVRFAgb3IgU0NUUC4gRmllbGRzIHRoYXQgYXJlIGlnbm9yZWQgZG9u77+9dCBuZWVkIHRvIGJlIHdpbGRjYXJkZWQKLSAgICAgKiBhbmQgc2hvdWxkIGJlIHNldCB0byAwLgotICAgICAqLworLyoqCisgKiBHZW5lcmljIGludGVyZmFjZSBmb3IgdmVyc2lvbi1hZ25vc3RpYyBpbW11dGFibGUgTWF0Y2ggc3RydWN0dXJlLgorICogVGhlIE1hdGNoIHN0cnVjdHVyZSBpcyBkZWZpbmVkIGluIHRoZSBPcGVuRmxvdyBwcm90b2NvbCwgYW5kIGl0IGNvbnRhaW5zIGluZm9ybWF0aW9uIG9uCisgKiB0aGUgZmllbGRzIHRvIGJlIG1hdGNoZWQgaW4gYSBzcGVjaWZpYyBmbG93IHJlY29yZC4KKyAqIFRoaXMgaW50ZXJmYWNlIGRvZXMgbm90IGFzc3VtZSBhbnl0aGluZyBvbiB0aGUgZmllbGRzIGluIHRoZSBNYXRjaCBzdHJ1Y3R1cmUuIElmIGluCisgKiBzb21lIHZlcnNpb24sIHRoZSBtYXRjaCBzdHJ1Y3R1cmUgY2Fubm90IGhhbmRsZSBhIGNlcnRhaW4gZmllbGQsIGl0IG1heSByZXR1cm4gPGNvZGU+ZmFsc2U8L2NvZGU+CisgKiBmb3IgPGNvZGU+c3VwcG9ydHMoLi4uKTwvY29kZT4gY2FsbHMsIGFuZCB0aHJvdyA8Y29kZT5VbnN1cHBvcnRlZE9wZXJhdGlvbkV4Y2VwdGlvbjwvY29kZT4gZnJvbSBhbGwKKyAqIG90aGVyIG1ldGhvZHMgaW4gc3VjaCBjYXNlcy4KKyAqIDxicj48YnI+CisgKiBPbiB3aWxkY2FyZHMgYW5kIG1hc2tzOjxicj4KKyAqIFRoaXMgaW50ZXJmYWNlIGRlZmluZXMgdGhlIGZvbGxvd2luZyBtYXNraW5nIG5vdGF0aW9ucyBmb3IgZmllbGRzOgorICogPHVsPgorICogPGxpPjxiPkV4YWN0PC9iPjogZmllbGQgaXMgbWF0Y2hlZCBleGFjdGx5IGFnYWluc3QgYSBzaW5nbGUsIGZpeGVkIHZhbHVlIChubyBtYXNrLCBvciBtYXNrIGlzIGFsbCBvbmVzKS4KKyAqIDxsaT48Yj5XaWxkY2FyZGVkPC9iPjogZmllbGQgaXMgbm90IGJlaW5nIG1hdGNoZWQuIEl0IGlzIGZ1bGx5IG1hc2tlZCAobWFzaz0wKSBhbmQgYW55IHZhbHVlIG9mIGl0CisgKiB3aWxsIG1hdGNoIHRoZSBmbG93IHJlY29yZCBoYXZpbmcgdGhpcyBtYXRjaC4KKyAqIDxsaT48Yj5QYXJ0aWFsbHkgbWFza2VkPC9iPjogZmllbGQgaXMgbWF0Y2hlZCB1c2luZyBhIHNwZWNpZmllZCBtYXNrIHdoaWNoIGlzIG5laXRoZXIgMCBub3IgYWxsIG9uZXMuIE1hc2sgY2FuCisgKiBiZSBlaXRoZXIgYXJiaXRyYXJ5IG9yIHJlcXVpcmUgc29tZSBzcGVjaWZpYyBzdHJ1Y3R1cmUuCisgKiA8L3VsPgorICogSW1wbGVtZW50aW5nIGNsYXNzZXMgbWF5IG9yIG1heSBub3Qgc3VwcG9ydCBhbGwgdHlwZXMgb2YgdGhlc2UgbWFza2luZyB0eXBlcy4gVGhleSBtYXkgYWxzbyBzdXBwb3J0CisgKiB0aGVtIGluIHBhcnQuIEZvciBleGFtcGxlLCBPRjEuMCBzdXBwb3J0cyBleGFjdCBtYXRjaCBhbmQgKGZ1bGwpIHdpbGRjYXJkaW5nIGZvciBhbGwgZmllbGRzLCBidXQgaXQKKyAqIGRvZXMgb25seSBzdXBwb3J0cyBwYXJ0aWFsIG1hc2tpbmcgZm9yIElQIHNvdXJjZS9kZXN0aW5hdGlvbiBmaWVsZHMsIGFuZCB0aGlzIHBhcnRpYWwgbWFza2luZyBtdXN0IGJlCisgKiBpbiB0aGUgQ0lEUiBwcmVmaXggZm9ybWF0LiBUaHVzLCBPRjEuMCBpbXBsZW1lbnRhdGlvbiBtYXkgdGhyb3cgPGNvZGU+VW5zdXBwb3J0ZWRPcGVyYXRpb25FeGNlcHRpb248L2NvZGU+IGlmIGdpdmVuCisgKiBpbiA8Y29kZT5zZXRNYWtzZWQ8L2NvZGU+IGFuIElQIG1hc2sgb2YsIGZvciBleGFtcGxlLCAyNTUuMC4yNTUuMCwgb3IgaWYgPGNvZGU+c2V0TWFza2VkPC9jb2RlPiBpcyBjYWxsZWQgZm9yIGFueSBmaWVsZAorICogd2hpY2ggaXMgbm90IElQIHNvdXJjZS9kZXN0aW5hdGlvbiBhZGRyZXNzLgorICogPGJyPjxicj4KKyAqIE9uIHByZXJlcXVpc2l0ZXM6PGJyPgorICogRnJvbSB0aGUgT0YxLjEgc3BlYywgcGFnZSAyOCwgdGhlIE9GMS4wIHNwZWMgZmFpbGVkIHRvIGV4cGxpY2l0bHkgc3BlY2lmeSB0aGlzLCBidXQgaXQKKyAqIGlzIHRoZSBiZWhhdmlvciBvZiBPRjEuMCBzd2l0Y2hlczoKKyAqICJQcm90b2NvbC1zcGVjaWZpYyBmaWVsZHMgd2l0aGluIG9mcF9tYXRjaCB3aWxsIGJlIGlnbm9yZWQgd2l0aGluIGEgc2luZ2xlIHRhYmxlIHdoZW4gCisgKiB0aGUgY29ycmVzcG9uZGluZyBwcm90b2NvbCBpcyBub3Qgc3BlY2lmaWVkIGluIHRoZSBtYXRjaC4gVGhlIE1QTFMgbWF0Y2ggZmllbGRzIHdpbGwgCisgKiBiZSBpZ25vcmVkIHVubGVzcyB0aGUgRXRoZXJ0eXBlIGlzIHNwZWNpZmllZCBhcyBNUExTLiBMaWtld2lzZSwgdGhlIElQIGhlYWRlciBhbmQgCisgKiB0cmFuc3BvcnQgaGVhZGVyIGZpZWxkcyB3aWxsIGJlIGlnbm9yZWQgdW5sZXNzIHRoZSBFdGhlcnR5cGUgaXMgc3BlY2lmaWVkIGFzIGVpdGhlciAKKyAqIElQdjQgb3IgQVJQLiBUaGUgdHBfc3JjIGFuZCB0cF9kc3QgZmllbGRzIHdpbGwgYmUgaWdub3JlZCB1bmxlc3MgdGhlIG5ldHdvcmsgcHJvdG9jb2wgCisgKiBzcGVjaWZpZWQgaXMgYXMgVENQLCBVRFAgb3IgU0NUUC4gRmllbGRzIHRoYXQgYXJlIGlnbm9yZWQgZG9u1XQgbmVlZCB0byBiZSB3aWxkY2FyZGVkIAorICogYW5kIHNob3VsZCBiZSBzZXQgdG8gMC4iCisgKiA8YnI+PGJyPgorICogVGhpcyBpbnRlcmZhY2UgdXNlcyBnZW5lcmljcyB0byBhc3N1cmUgdHlwZSBzYWZldHkgaW4gdXNlcnMgY29kZS4gSG93ZXZlciwgaW1wbGVtZW50aW5nIGNsYXNzZXMgbWF5IGhhdmUgdG8gc3VwcHJlc3MgCisgKiAndW5jaGVja2VkIGNhc3QnIHdhcm5pbmdzIHdoaWxlIG1ha2luZyBzdXJlIHRoZXkgY29ycmVjdGx5IGNhc3QgYmFzZSBvbiB0aGVpciBpbXBsZW1lbnRhdGlvbiBkZXRhaWxzLgorICogCisgKiBAYXV0aG9yIFlvdGFtIEhhcmNob2wgKHlvdGFtLmhhcmNob2xAYmlnc3dpdGNoLmNvbSkKKyAqLworcHVibGljIGludGVyZmFjZSBNYXRjaCBleHRlbmRzIE9GT2JqZWN0IHsgICAgCiAKICAgICAvKioKLSAgICAgKiBSZXR1cm5zIHRoZSB2YWx1ZSBmb3IgdGhlIGdpdmVuIGZpZWxkIGZyb20gdGhpcyBtYXRjaC4KLSAgICAgKgorICAgICAqIFJldHVybnMgYSB2YWx1ZSBmb3IgdGhlIGdpdmVuIGZpZWxkIGlmOgorICAgICAqIDx1bD4KKyAgICAgKiA8bGk+RmllbGQgaXMgc3VwcG9ydGVkCisgICAgICogPGxpPkZpZWxkIGlzIG5vdCBmdWxseSB3aWxkY2FyZGVkCisgICAgICogPGxpPlByZXJlcXVpc2l0ZXMgYXJlIG9rCisgICAgICogPC91bD4KKyAgICAgKiBJZiBvbmUgb2YgdGhlIGFib3ZlIGNvbmRpdGlvbnMgZG9lcyBub3QgaG9sZCwgcmV0dXJucyBudWxsLiBWYWx1ZSBpcyByZXR1cm5lZCBtYXNrZWQgaWYgcGFydGlhbGx5IHdpbGRjYXJkZWQuCisgICAgICogCiAgICAgICogQHBhcmFtIGZpZWxkIE1hdGNoIGZpZWxkIHRvIHJldHJpZXZlCi0gICAgICogQHJldHVybiBWYWx1ZSBvZiBtYXRjaCBmaWVsZAorICAgICAqIEByZXR1cm4gVmFsdWUgb2YgbWF0Y2ggZmllbGQgKG1heSBiZSBtYXNrZWQpLCBvciA8Y29kZT5udWxsPC9jb2RlPiBpZiBmaWVsZCBpcyBvbmUgb2YgdGhlIGNvbmRpdGlvbnMgYWJvdmUgZG9lcyBub3QgaG9sZC4KKyAgICAgKiBAdGhyb3dzIFVuc3VwcG9ydGVkT3BlcmF0aW9uRXhjZXB0aW9uIElmIGZpZWxkIGlzIG5vdCBzdXBwb3J0ZWQuCiAgICAgICovCiAgICAgcHVibGljIDxGIGV4dGVuZHMgT0ZWYWx1ZVR5cGU8Rj4+IEYgZ2V0KE1hdGNoRmllbGQ8Rj4gZmllbGQpIHRocm93cyBVbnN1cHBvcnRlZE9wZXJhdGlvbkV4Y2VwdGlvbjsKIAogICAgIC8qKgotICAgICAqIFJldHVybnMgdGhlIG1hc2tlZCB2YWx1ZSBmb3IgdGhlIGdpdmVuIGZpZWxkIGZyb20gdGhpcyBtYXRjaC4KLSAgICAgKiBQcmVjb25kaXRpb246IGZpZWxkIGlzIHBhcnRpYWxseSB3aWxkY2FyZGVkLgotICAgICAqCi0gICAgICogQHBhcmFtIGZpZWxkIE1hdGNoIGZpZWxkIHRvIHJldHJpZXZlCi0gICAgICogQHJldHVybiBNYXNrZWQgdmFsdWUgb2YgbWF0Y2ggZmllbGQgb3IgbnVsbCBpZiBubyBtYXNrCisgICAgICogUmV0dXJucyB0aGUgbWFza2VkIHZhbHVlIGZvciB0aGUgZ2l2ZW4gZmllbGQgZnJvbSB0aGlzIG1hdGNoLCBhbG9uZyB3aXRoIHRoZSBtYXNrIGl0c2VsZi4KKyAgICAgKiBQcmVyZXF1aXNpdGU6IGZpZWxkIGlzIHBhcnRpYWxseSBtYXNrZWQuCisgICAgICogSWYgcHJlcmVxdWlzaXRlIGlzIG5vdCBtZXQsIGEgPGNvZGU+bnVsbDwvY29kZT4gaXMgcmV0dXJuZWQuCisgICAgICogCisgICAgICogQHBhcmFtIGZpZWxkIE1hdGNoIGZpZWxkIHRvIHJldHJpZXZlLgorICAgICAqIEByZXR1cm4gTWFza2VkIHZhbHVlIG9mIG1hdGNoIGZpZWxkIG9yIG51bGwgaWYgbm8gbWFzayBpcyBzZXQuCisgICAgICogQHRocm93cyBVbnN1cHBvcnRlZE9wZXJhdGlvbkV4Y2VwdGlvbiBJZiBmaWVsZCBpcyBub3Qgc3VwcG9ydGVkLgogICAgICAqLwogICAgIHB1YmxpYyA8RiBleHRlbmRzIE9GVmFsdWVUeXBlPEY+PiBNYXNrZWQ8Rj4gZ2V0TWFza2VkKE1hdGNoRmllbGQ8Rj4gZmllbGQpIHRocm93cyBVbnN1cHBvcnRlZE9wZXJhdGlvbkV4Y2VwdGlvbjsKIAogICAgIC8qKgotICAgICAqIFJldHVybnMgdHJ1ZSBpZiB0aGlzIG1hdGNoIG9iamVjdCBzdXBwb3J0cyB0aGUgZ2l2ZW4gbWF0Y2ggZmllbGQuCi0gICAgICoKKyAgICAgKiBSZXR1cm5zIHRydWUgaWYgYW5kIG9ubHkgaWYgdGhpcyBtYXRjaCBvYmplY3Qgc3VwcG9ydHMgdGhlIGdpdmVuIG1hdGNoIGZpZWxkLgorICAgICAqIAogICAgICAqIEBwYXJhbSBmaWVsZCBNYXRjaCBmaWVsZAotICAgICAqIEByZXR1cm4KKyAgICAgKiBAcmV0dXJuIHRydWUgaWYgZmllbGQgaXMgc3VwcG9ydGVkLCBmYWxzZSBvdGhlcndpc2UuCiAgICAgICovCiAgICAgcHVibGljIGJvb2xlYW4gc3VwcG9ydHMoTWF0Y2hGaWVsZDw/PiBmaWVsZCk7CiAKICAgICAvKioKLSAgICAgKiB0cnVlIGlmZiBmaWVsZCBzdXBwb3J0cyBhIGJpdG1hc2sgbWFzayB0aGF0IHdpbGRjYXJkcyBwYXJ0IG9mIHRoZSBmaWVsZAorICAgICAqIFJldHVybnMgdHJ1ZSBpZiBhbmQgb25seSBpZiB0aGlzIG1hdGNoIG9iamVjdCBzdXBwb3J0cyBwYXJ0aWFsbHkgYml0bWFza2luZyBvZiB0aGUgZ2l2ZW4gZmllbGQuCiAgICAgICogKG5vdGU6IG5vdCBhbGwgcG9zc2libGUgdmFsdWVzIG9mIHRoaXMgYml0bWFzayBoYXZlIHRvIGJlIGFjY2VwdGFibGUpCi0gICAgICoKLSAgICAgKiBAcGFyYW0gZmllbGQgTWF0Y2ggZmllbGQKLSAgICAgKiBAcmV0dXJuCisgICAgICogCisgICAgICogQHBhcmFtIGZpZWxkIE1hdGNoIGZpZWxkLgorICAgICAqIEByZXR1cm4gdHJ1ZSBpZiBmaWVsZCBjYW4gYmUgcGFydGlhbGx5IG1hc2tlZCwgZmFsc2Ugb3RoZXJ3aXNlLgorICAgICAqIEB0aHJvd3MgVW5zdXBwb3J0ZWRPcGVyYXRpb25FeGNlcHRpb24gSWYgZmllbGQgaXMgbm90IHN1cHBvcnRlZC4KICAgICAgKi8KLSAgICBwdWJsaWMgYm9vbGVhbiBzdXBwb3J0c01hc2tlZChNYXRjaEZpZWxkPD8+IGZpZWxkKTsKKyAgICBwdWJsaWMgYm9vbGVhbiBzdXBwb3J0c01hc2tlZChNYXRjaEZpZWxkPD8+IGZpZWxkKSB0aHJvd3MgVW5zdXBwb3J0ZWRPcGVyYXRpb25FeGNlcHRpb247CiAKICAgICAvKioKLSAgICAgKiBUcnVlIGlmZiB0aGlzIGZpZWxkIGlzIGN1cnJlbnRseSBmdWxseSBzcGVjaWZpZWQgaW4gdGhlIG1hdGNoLCBpLmUuLCB0aGUKLSAgICAgKiBtYXRjaCB3aWxsIG9ubHkgc2VsZWN0IHBhY2tldHMgdGhhdCBtYXRjaCB0aGUgZXhhY3QgdmFsdWUgb2YgZ2V0RmllbGQoZmllbGQpLgotICAgICAqCi0gICAgICogQHBhcmFtIGZpZWxkIE1hdGNoIGZpZWxkCi0gICAgICogQHJldHVybgorICAgICAqIFJldHVybnMgdHJ1ZSBpZiBhbmQgb25seSBpZiB0aGlzIGZpZWxkIGlzIGN1cnJlbnRseSBzcGVjaWZpZWQgaW4gdGhlIG1hdGNoIHdpdGggYW4gZXhhY3QgdmFsdWUgYW5kCisgICAgICogbm8gbWFzay4gSS5lLiwgdGhlIHNwZWNpZmllZCBtYXRjaCB3aWxsIG9ubHkgc2VsZWN0IHBhY2tldHMgdGhhdCBtYXRjaCB0aGUgZXhhY3QgdmFsdWUgb2YgZ2V0VmFsdWUoZmllbGQpLgorICAgICAqIAorICAgICAqIEBwYXJhbSBmaWVsZCBNYXRjaCBmaWVsZC4KKyAgICAgKiBAcmV0dXJuIHRydWUgaWYgZmllbGQgaGFzIGEgc3BlY2lmaWMgZXhhY3QgdmFsdWUsIGZhbHNlIGlmIG5vdC4KKyAgICAgKiBAdGhyb3dzIFVuc3VwcG9ydGVkT3BlcmF0aW9uRXhjZXB0aW9uIElmIGZpZWxkIGlzIG5vdCBzdXBwb3J0ZWQuCiAgICAgICovCi0gICAgcHVibGljIGJvb2xlYW4gaXNFeGFjdChNYXRjaEZpZWxkPD8+IGZpZWxkKTsKKyAgICBwdWJsaWMgYm9vbGVhbiBpc0V4YWN0KE1hdGNoRmllbGQ8Pz4gZmllbGQpIHRocm93cyBVbnN1cHBvcnRlZE9wZXJhdGlvbkV4Y2VwdGlvbjsKIAogICAgIC8qKgotICAgICAqIFRydWUgaWYgdGhpcyBmaWVsZCBpcyBjdXJyZW50bHkgbG9naWNhbGx5IHVuc3BlY2lmaWVkIGluIHRoZSBtYXRjaCwgaS5lLCB0aGUKLSAgICAgKiB2YWx1ZSByZXR1cm5lZCBieSBnZXRWYWx1ZShmKSBoYXMgbm8gaW1wYWN0IG9uIHdoZXRoZXIgYSBwYWNrZXQgd2lsbCBiZSBzZWxlY3RlZAorICAgICAqIFRydWUgaWYgYW5kIG9ubHkgaWYgdGhpcyBmaWVsZCBpcyBjdXJyZW50bHkgbG9naWNhbGx5IHVuc3BlY2lmaWVkIGluIHRoZSBtYXRjaCwgaS5lLCB0aGUgCisgICAgICogdmFsdWUgcmV0dXJuZWQgYnkgZ2V0VmFsdWUoZikgaGFzIG5vIGltcGFjdCBvbiB3aGV0aGVyIGEgcGFja2V0IHdpbGwgYmUgc2VsZWN0ZWQgCiAgICAgICogYnkgdGhlIG1hdGNoIG9yIG5vdC4KLSAgICAgKgotICAgICAqIEBwYXJhbSBmaWVsZAotICAgICAqIEByZXR1cm4KKyAgICAgKiAKKyAgICAgKiBAcGFyYW0gZmllbGQgTWF0Y2ggZmllbGQuCisgICAgICogQHJldHVybiB0cnVlIGlmIGZpZWxkIGlzIGZ1bGx5IHdpbGRjYXJkZWQsIGZhbHNlIGlmIG5vdC4KKyAgICAgKiBAdGhyb3dzIFVuc3VwcG9ydGVkT3BlcmF0aW9uRXhjZXB0aW9uIElmIGZpZWxkIGlzIG5vdCBzdXBwb3J0ZWQuCiAgICAgICovCi0gICAgcHVibGljIGJvb2xlYW4gaXNGdWxseVdpbGRjYXJkZWQoTWF0Y2hGaWVsZDw/PiBmaWVsZCk7CisgICAgcHVibGljIGJvb2xlYW4gaXNGdWxseVdpbGRjYXJkZWQoTWF0Y2hGaWVsZDw/PiBmaWVsZCkgdGhyb3dzIFVuc3VwcG9ydGVkT3BlcmF0aW9uRXhjZXB0aW9uOwogCiAgICAgLyoqCi0gICAgICogVHJ1ZSBpZiB0aGlzIGZpZWxkIGlzIGN1cnJlbnRseSBwYXJ0aWFsbHkgc3BlY2lmaWVkIGluIHRoZSBtYXRjaCwgaS5lLCB0aGUKLSAgICAgKiBtYXRjaCB3aWxsIHNlbGVjdCBwYWNrZXRzIHRoYXQgbWF0Y2ggKHAudmFsdWUgJiBnZXRNYXNrKGZpZWxkKSkgPT0gZ2V0VmFsdWUoZmllbGQpLgotICAgICAqCi0gICAgICogQHBhcmFtIGZpZWxkCi0gICAgICogQHJldHVybgorICAgICAqIFRydWUgaWYgYW5kIG9ubHkgaWYgdGhpcyBmaWVsZCBpcyBjdXJyZW50bHkgcGFydGlhbGx5IHNwZWNpZmllZCBpbiB0aGUgbWF0Y2gsIGkuZSwgdGhlIAorICAgICAqIG1hdGNoIHdpbGwgb25seSBzZWxlY3QgcGFja2V0cyB0aGF0IG1hdGNoIChwLnZhbHVlICYgZ2V0TWFzayhmaWVsZCkpID09IGdldFZhbHVlKGZpZWxkKSwKKyAgICAgKiBhbmQgZ2V0TWFzayhmaWVsZCkgIT0gMC4KKyAgICAgKiAKKyAgICAgKiBAcGFyYW0gZmllbGQgTWF0Y2ggZmllbGQuCisgICAgICogQHJldHVybiB0cnVlIGlmIGZpZWxkIGlzIHBhcnRpYWxseSBtYXNrZWQsIGZhbHNlIGlmIG5vdC4KKyAgICAgKiBAdGhyb3dzIFVuc3VwcG9ydGVkT3BlcmF0aW9uRXhjZXB0aW9uIElmIGZpZWxkIGlzIG5vdCBzdXBwb3J0ZWQuCiAgICAgICovCi0gICAgcHVibGljIGJvb2xlYW4gaXNQYXJ0aWFsbHlNYXNrZWQoTWF0Y2hGaWVsZDw/PiBmaWVsZCk7Ci0KKyAgICBwdWJsaWMgYm9vbGVhbiBpc1BhcnRpYWxseU1hc2tlZChNYXRjaEZpZWxkPD8+IGZpZWxkKSB0aHJvd3MgVW5zdXBwb3J0ZWRPcGVyYXRpb25FeGNlcHRpb247CisgICAgCiAgICAgLyoqCiAgICAgICogUmV0dXJucyBhIGJ1aWxkZXIgdG8gYnVpbGQgbmV3IGluc3RhbmNlcyBvZiB0aGlzIHR5cGUgb2YgbWF0Y2ggb2JqZWN0LgogICAgICAqIEByZXR1cm4gTWF0Y2ggYnVpbGRlcgogICAgICAqLwotICAgIHB1YmxpYyBNYXRjaEJ1aWxkZXIgY3JlYXRlQnVpbGRlcigpOworICAgIHB1YmxpYyBCdWlsZGVyIGNyZWF0ZUJ1aWxkZXIoKTsKIAotICAgIGludGVyZmFjZSBCdWlsZGVyIGV4dGVuZHMgTWF0Y2hCdWlsZGVyIHsKKyAgICAvKioKKyAgICAgKiBCdWlsZGVyIGludGVyZmFjZSBmb3IgTWF0Y2ggb2JqZWN0cy4KKyAgICAgKiBCdWlsZGVyIGlzIHVzZWQgdG8gY3JlYXRlIG5ldyBNYXRjaCBvYmplY3RzIGFuZCBpdCBjcmVhdGVzIHRoZSBtYXRjaCBhY2NvcmRpbmcgdG8gdGhlIHZlcnNpb24gaXQKKyAgICAgKiBjb3JyZXNwb25kcyB0by4gVGhlIGJ1aWxkZXIgdXNlcyB0aGUgc2FtZSBub3RhdGlvbiBvZiB3aWxkY2FyZHMgYW5kIG1hc2tzLCBhbmQgY2FuIGFsc28gdGhyb3cKKyAgICAgKiA8Y29kZT5VbnN1cHBvcnRlZE9wZXJhdGlvbkV4Y2VwdGlvbjwvY29kZT4gaWYgaXQgaXMgYXNrZWQgdG8gY3JlYXRlIHNvbWUgbWF0Y2hpbmcgdGhhdCBpcyBub3Qgc3VwcG9ydGVkIGluCisgICAgICogdGhlIHZlcnNpb24gaXQgcmVwcmVzZW50cy4KKyAgICAgKiAKKyAgICAgKiBXaGlsZSB1c2VkLCBNYXRjaEJ1aWxkZXIgbWF5IG5vdCBiZSBjb25zaXN0ZW50IGluIHRlcm1zIG9mIGZpZWxkIHByZXJlcXVpc2l0ZXMuIEhvd2V2ZXIsIHVzZXIgbXVzdAorICAgICAqIHNvbHZlIHRoZXNlIGJlZm9yZSB1c2luZyB0aGUgZ2VuZXJhdGVkIE1hdGNoIG9iamVjdCBhcyB0aGVzZSBwcmVyZXF1aXNpdGVzIHNob3VsZCBiZSBlbmZvcmNlZCBpbiB0aGUKKyAgICAgKiBnZXR0ZXJzLiAKKyAgICAgKiAKKyAgICAgKiBAYXV0aG9yIFlvdGFtIEhhcmNob2wgKHlvdGFtLmhhcmNob2xAYmlnc3dpdGNoLmNvbSkKKyAgICAgKi8KKyAgICBpbnRlcmZhY2UgQnVpbGRlciBleHRlbmRzIE1hdGNoIHsKKyAgICAgICAgLyoqCisgICAgICAgICAqIFNldHMgYSBzcGVjaWZpYyBleGFjdCB2YWx1ZSBmb3IgYSBmaWVsZC4KKyAgICAgICAgICogCisgICAgICAgICAqIEBwYXJhbSBmaWVsZCBNYXRjaCBmaWVsZCB0byBzZXQuCisgICAgICAgICAqIEBwYXJhbSB2YWx1ZSBWYWx1ZSBvZiBtYXRjaCBmaWVsZC4KKyAgICAgICAgICogQHJldHVybiB0aGUgQnVpbGRlciBpbnN0YW5jZSB1c2VkLgorICAgICAgICAgKiBAdGhyb3dzIFVuc3VwcG9ydGVkT3BlcmF0aW9uRXhjZXB0aW9uIElmIGZpZWxkIGlzIG5vdCBzdXBwb3J0ZWQuCisgICAgICAgICAqLworICAgICAgICBwdWJsaWMgPEYgZXh0ZW5kcyBPRlZhbHVlVHlwZTxGPj4gQnVpbGRlciBzZXRFeGFjdChNYXRjaEZpZWxkPEY+IGZpZWxkLCBGIHZhbHVlKSB0aHJvd3MgVW5zdXBwb3J0ZWRPcGVyYXRpb25FeGNlcHRpb247CisKKyAgICAgICAgLyoqCisgICAgICAgICAqIFNldHMgYSBtYXNrZWQgdmFsdWUgZm9yIGEgZmllbGQuCisgICAgICAgICAqIAorICAgICAgICAgKiBAcGFyYW0gZmllbGQgTWF0Y2ggZmllbGQgdG8gc2V0LgorICAgICAgICAgKiBAcGFyYW0gdmFsdWUgVmFsdWUgb2YgZmllbGQuCisgICAgICAgICAqIEBwYXJhbSBtYXNrIE1hc2sgdmFsdWUuCisgICAgICAgICAqIEByZXR1cm4gdGhlIEJ1aWxkZXIgaW5zdGFuY2UgdXNlZC4KKyAgICAgICAgICogQHRocm93cyBVbnN1cHBvcnRlZE9wZXJhdGlvbkV4Y2VwdGlvbiBJZiBmaWVsZCBpcyBub3Qgc3VwcG9ydGVkLCBpZiBmaWVsZCBpcyBzdXBwb3J0ZWQgYnV0IGRvZXMgbm90IHN1cHBvcnQgbWFza2luZywgb3IgaWYgbWFzayBzdHJ1Y3R1cmUgaXMgbm90IHN1cHBvcnRlZC4KKyAgICAgICAgICovCisgICAgICAgIHB1YmxpYyA8RiBleHRlbmRzIE9GVmFsdWVUeXBlPEY+PiBCdWlsZGVyIHNldE1hc2tlZChNYXRjaEZpZWxkPEY+IGZpZWxkLCBGIHZhbHVlLCBGIG1hc2spIHRocm93cyBVbnN1cHBvcnRlZE9wZXJhdGlvbkV4Y2VwdGlvbjsKKworICAgICAgICAvKioKKyAgICAgICAgICogU2V0cyBhIG1hc2tlZCB2YWx1ZSBmb3IgYSBmaWVsZC4KKyAgICAgICAgICogCisgICAgICAgICAqIEBwYXJhbSBmaWVsZCBNYXRjaCBmaWVsZCB0byBzZXQuCisgICAgICAgICAqIEBwYXJhbSB2YWx1ZVdpdGhNYXNrIENvbXBvdW5kIE1hc2tlZCBvYmplY3QgY29udGFpbnMgdGhlIHZhbHVlIGFuZCB0aGUgbWFzay4KKyAgICAgICAgICogQHJldHVybiB0aGUgQnVpbGRlciBpbnN0YW5jZSB1c2VkLgorICAgICAgICAgKiBAdGhyb3dzIFVuc3VwcG9ydGVkT3BlcmF0aW9uRXhjZXB0aW9uIElmIGZpZWxkIGlzIG5vdCBzdXBwb3J0ZWQsIGlmIGZpZWxkIGlzIHN1cHBvcnRlZCBidXQgZG9lcyBub3Qgc3VwcG9ydCBtYXNraW5nLCBvciBpZiBtYXNrIHN0cnVjdHVyZSBpcyBub3Qgc3VwcG9ydGVkLgorICAgICAgICAgKi8KKyAgICAgICAgcHVibGljIDxGIGV4dGVuZHMgT0ZWYWx1ZVR5cGU8Rj4+IEJ1aWxkZXIgc2V0TWFza2VkKE1hdGNoRmllbGQ8Rj4gZmllbGQsIE1hc2tlZDxGPiB2YWx1ZVdpdGhNYXNrKSB0aHJvd3MgVW5zdXBwb3J0ZWRPcGVyYXRpb25FeGNlcHRpb247CisKKyAgICAgICAgLyoqCisgICAgICAgICAqIFVuc2V0cyBhbnkgdmFsdWUgZ2l2ZW4gZm9yIHRoZSBmaWVsZCBhbmQgd2lsZGNhcmRzIGl0IHNvIHRoYXQgaXQgbWF0Y2hlcyBhbnkgdmFsdWUuCisgICAgICAgICAqIAorICAgICAgICAgKiBAcGFyYW0gZmllbGQgTWF0Y2ggZmllbGQgdG8gdW5zZXQuCisgICAgICAgICAqIEByZXR1cm4gdGhlIEJ1aWxkZXIgaW5zdGFuY2UgdXNlZC4KKyAgICAgICAgICogQHRocm93cyBVbnN1cHBvcnRlZE9wZXJhdGlvbkV4Y2VwdGlvbiBJZiBmaWVsZCBpcyBub3Qgc3VwcG9ydGVkLgorICAgICAgICAgKi8KKyAgICAgICAgcHVibGljIDxGIGV4dGVuZHMgT0ZWYWx1ZVR5cGU8Rj4+IEJ1aWxkZXIgd2lsZGNhcmQoTWF0Y2hGaWVsZDxGPiBmaWVsZCkgdGhyb3dzIFVuc3VwcG9ydGVkT3BlcmF0aW9uRXhjZXB0aW9uOworCisgICAgICAgIC8qKgorICAgICAgICAgKiBSZXR1cm5zIHRoZSBtYXRjaCBjcmVhdGVkIGJ5IHRoaXMgYnVpbGRlci4KKyAgICAgICAgICogCisgICAgICAgICAqIEByZXR1cm4gYSBNYXRjaCBvYmplY3QuCisgICAgICAgICAqLworICAgICAgICBwdWJsaWMgTWF0Y2ggZ2V0TWF0Y2goKTsKICAgICB9Ci19Cit9ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvamF2YV9nZW4vcHJlLXdyaXR0ZW4vc3JjL21haW4vamF2YS9vcmcvb3BlbmZsb3cvcHJvdG9jb2wvbWF0Y2gvTWF0Y2hCdWlsZGVyLmphdmEgYi9qYXZhX2dlbi9wcmUtd3JpdHRlbi9zcmMvbWFpbi9qYXZhL29yZy9vcGVuZmxvdy9wcm90b2NvbC9tYXRjaC9NYXRjaEJ1aWxkZXIuamF2YQpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggYmU3YjhiMC4uMDAwMDAwMAotLS0gYS9qYXZhX2dlbi9wcmUtd3JpdHRlbi9zcmMvbWFpbi9qYXZhL29yZy9vcGVuZmxvdy9wcm90b2NvbC9tYXRjaC9NYXRjaEJ1aWxkZXIuamF2YQorKysgL2Rldi9udWxsCkBAIC0xLDc5ICswLDAgQEAKLXBhY2thZ2Ugb3JnLm9wZW5mbG93LnByb3RvY29sLm1hdGNoOwotCi1pbXBvcnQgb3JnLm9wZW5mbG93LnR5cGVzLk1hc2tlZDsKLWltcG9ydCBvcmcub3BlbmZsb3cudHlwZXMuT0ZWYWx1ZVR5cGU7Ci0KLXB1YmxpYyBpbnRlcmZhY2UgTWF0Y2hCdWlsZGVyIHsKLSAgICAvKioKLSAgICAgKiBSZXR1cm5zIHRoZSB2YWx1ZSBmb3IgdGhlIGdpdmVuIGZpZWxkIGZyb20gdGhpcyBtYXRjaC4KLSAgICAgKgotICAgICAqIEBwYXJhbSBmaWVsZCBNYXRjaCBmaWVsZCB0byByZXRyaWV2ZQotICAgICAqIEByZXR1cm4gVmFsdWUgb2YgbWF0Y2ggZmllbGQKLSAgICAgKi8KLSAgICBwdWJsaWMgPEYgZXh0ZW5kcyBPRlZhbHVlVHlwZTxGPj4gRiBnZXQoTWF0Y2hGaWVsZDxGPiBmaWVsZCkgdGhyb3dzIFVuc3VwcG9ydGVkT3BlcmF0aW9uRXhjZXB0aW9uOwotCi0gICAgLyoqCi0gICAgICogUmV0dXJucyB0aGUgbWFza2VkIHZhbHVlIGZvciB0aGUgZ2l2ZW4gZmllbGQgZnJvbSB0aGlzIG1hdGNoLgotICAgICAqIFByZWNvbmRpdGlvbjogZmllbGQgaXMgcGFydGlhbGx5IHdpbGRjYXJkZWQuCi0gICAgICoKLSAgICAgKiBAcGFyYW0gZmllbGQgTWF0Y2ggZmllbGQgdG8gcmV0cmlldmUKLSAgICAgKiBAcmV0dXJuIE1hc2tlZCB2YWx1ZSBvZiBtYXRjaCBmaWVsZCBvciBudWxsIGlmIG5vIG1hc2sKLSAgICAgKi8KLSAgICBwdWJsaWMgPEYgZXh0ZW5kcyBPRlZhbHVlVHlwZTxGPj4gTWFza2VkPEY+IGdldE1hc2tlZChNYXRjaEZpZWxkPEY+IGZpZWxkKSB0aHJvd3MgVW5zdXBwb3J0ZWRPcGVyYXRpb25FeGNlcHRpb247Ci0KLSAgICAvKioKLSAgICAgKiBSZXR1cm5zIHRydWUgaWYgdGhpcyBtYXRjaCBvYmplY3Qgc3VwcG9ydHMgdGhlIGdpdmVuIG1hdGNoIGZpZWxkLgotICAgICAqCi0gICAgICogQHBhcmFtIGZpZWxkIE1hdGNoIGZpZWxkCi0gICAgICogQHJldHVybgotICAgICAqLwotICAgIHB1YmxpYyBib29sZWFuIHN1cHBvcnRzKE1hdGNoRmllbGQ8Pz4gZmllbGQpOwotCi0gICAgLyoqCi0gICAgICogdHJ1ZSBpZmYgZmllbGQgc3VwcG9ydHMgYSBiaXRtYXNrIG1hc2sgdGhhdCB3aWxkY2FyZHMgcGFydCBvZiB0aGUgZmllbGQKLSAgICAgKiAobm90ZTogbm90IGFsbCBwb3NzaWJsZSB2YWx1ZXMgb2YgdGhpcyBiaXRtYXNrIGhhdmUgdG8gYmUgYWNjZXB0YWJsZSkKLSAgICAgKgotICAgICAqIEBwYXJhbSBmaWVsZCBNYXRjaCBmaWVsZAotICAgICAqIEByZXR1cm4KLSAgICAgKi8KLSAgICBwdWJsaWMgYm9vbGVhbiBzdXBwb3J0c01hc2tlZChNYXRjaEZpZWxkPD8+IGZpZWxkKTsKLQotICAgIC8qKgotICAgICAqIFRydWUgaWZmIHRoaXMgZmllbGQgaXMgY3VycmVudGx5IGZ1bGx5IHNwZWNpZmllZCBpbiB0aGUgbWF0Y2gsIGkuZS4sIHRoZQotICAgICAqIG1hdGNoIHdpbGwgb25seSBzZWxlY3QgcGFja2V0cyB0aGF0IG1hdGNoIHRoZSBleGFjdCB2YWx1ZSBvZiBnZXRGaWVsZChmaWVsZCkuCi0gICAgICoKLSAgICAgKiBAcGFyYW0gZmllbGQgTWF0Y2ggZmllbGQKLSAgICAgKiBAcmV0dXJuCi0gICAgICovCi0gICAgcHVibGljIGJvb2xlYW4gaXNFeGFjdChNYXRjaEZpZWxkPD8+IGZpZWxkKTsKLQotICAgIC8qKgotICAgICAqIFRydWUgaWYgdGhpcyBmaWVsZCBpcyBjdXJyZW50bHkgbG9naWNhbGx5IHVuc3BlY2lmaWVkIGluIHRoZSBtYXRjaCwgaS5lLCB0aGUKLSAgICAgKiB2YWx1ZSByZXR1cm5lZCBieSBnZXRWYWx1ZShmKSBoYXMgbm8gaW1wYWN0IG9uIHdoZXRoZXIgYSBwYWNrZXQgd2lsbCBiZSBzZWxlY3RlZAotICAgICAqIGJ5IHRoZSBtYXRjaCBvciBub3QuCi0gICAgICoKLSAgICAgKiBAcGFyYW0gZmllbGQKLSAgICAgKiBAcmV0dXJuCi0gICAgICovCi0gICAgcHVibGljIGJvb2xlYW4gaXNGdWxseVdpbGRjYXJkZWQoTWF0Y2hGaWVsZDw/PiBmaWVsZCk7Ci0KLSAgICAvKioKLSAgICAgKiBUcnVlIGlmIHRoaXMgZmllbGQgaXMgY3VycmVudGx5IHBhcnRpYWxseSBzcGVjaWZpZWQgaW4gdGhlIG1hdGNoLCBpLmUsIHRoZQotICAgICAqIG1hdGNoIHdpbGwgc2VsZWN0IHBhY2tldHMgdGhhdCBtYXRjaCAocC52YWx1ZSAmIGdldE1hc2soZmllbGQpKSA9PSBnZXRWYWx1ZShmaWVsZCkuCi0gICAgICoKLSAgICAgKiBAcGFyYW0gZmllbGQKLSAgICAgKiBAcmV0dXJuCi0gICAgICovCi0gICAgcHVibGljIGJvb2xlYW4gaXNQYXJ0aWFsbHlNYXNrZWQoTWF0Y2hGaWVsZDw/PiBmaWVsZCk7Ci0KLQotICAgIHB1YmxpYyA8RiBleHRlbmRzIE9GVmFsdWVUeXBlPEY+PiBNYXRjaEJ1aWxkZXIgc2V0RXhhY3QoTWF0Y2hGaWVsZDxGPiBmaWVsZCwgRiB2YWx1ZSk7Ci0KLSAgICBwdWJsaWMgPEYgZXh0ZW5kcyBPRlZhbHVlVHlwZTxGPj4gTWF0Y2hCdWlsZGVyIHNldE1hc2tlZChNYXRjaEZpZWxkPEY+IGZpZWxkLCBGIHZhbHVlLCBGIG1hc2spOwotCi0gICAgcHVibGljIDxGIGV4dGVuZHMgT0ZWYWx1ZVR5cGU8Rj4+IE1hdGNoQnVpbGRlciBzZXRNYXNrZWQoTWF0Y2hGaWVsZDxGPiBmaWVsZCwgTWFza2VkPEY+IHZhbHVlV2l0aE1hc2spOwotCi0gICAgcHVibGljIDxGIGV4dGVuZHMgT0ZWYWx1ZVR5cGU8Rj4+IE1hdGNoQnVpbGRlciB3aWxkY2FyZChNYXRjaEZpZWxkPEY+IGZpZWxkKTsKLQotICAgIHB1YmxpYyBNYXRjaCBnZXRNYXRjaCgpOwotfQpkaWZmIC0tZ2l0IGEvamF2YV9nZW4vcHJlLXdyaXR0ZW4vc3JjL21haW4vamF2YS9vcmcvb3BlbmZsb3cvcHJvdG9jb2wvbWF0Y2gvTWF0Y2hGaWVsZC5qYXZhIGIvamF2YV9nZW4vcHJlLXdyaXR0ZW4vc3JjL21haW4vamF2YS9vcmcvb3BlbmZsb3cvcHJvdG9jb2wvbWF0Y2gvTWF0Y2hGaWVsZC5qYXZhCmluZGV4IDRkNDkzNWMuLjU5MTM2NTggMTAwNjQ0Ci0tLSBhL2phdmFfZ2VuL3ByZS13cml0dGVuL3NyYy9tYWluL2phdmEvb3JnL29wZW5mbG93L3Byb3RvY29sL21hdGNoL01hdGNoRmllbGQuamF2YQorKysgYi9qYXZhX2dlbi9wcmUtd3JpdHRlbi9zcmMvbWFpbi9qYXZhL29yZy9vcGVuZmxvdy9wcm90b2NvbC9tYXRjaC9NYXRjaEZpZWxkLmphdmEKQEAgLTExLDMwICsxMSwzOCBAQAogaW1wb3J0IG9yZy5vcGVuZmxvdy50eXBlcy5JcEVjbjsKIGltcG9ydCBvcmcub3BlbmZsb3cudHlwZXMuSXBQcm90b2NvbDsKIGltcG9ydCBvcmcub3BlbmZsb3cudHlwZXMuTWFjQWRkcmVzczsKK2ltcG9ydCBvcmcub3BlbmZsb3cudHlwZXMuT0ZNZXRhZGF0YTsKIGltcG9ydCBvcmcub3BlbmZsb3cudHlwZXMuT0ZQb3J0OwogaW1wb3J0IG9yZy5vcGVuZmxvdy50eXBlcy5PRlZhbHVlVHlwZTsKIGltcG9ydCBvcmcub3BlbmZsb3cudHlwZXMuVHJhbnNwb3J0UG9ydDsKIGltcG9ydCBvcmcub3BlbmZsb3cudHlwZXMuVmxhblBjcDsKIGltcG9ydCBvcmcub3BlbmZsb3cudHlwZXMuVmxhblZpZDsKIAorQFN1cHByZXNzV2FybmluZ3MoInVuY2hlY2tlZCIpCiBwdWJsaWMgY2xhc3MgTWF0Y2hGaWVsZDxGIGV4dGVuZHMgT0ZWYWx1ZVR5cGU8Rj4+IHsKICAgICBwcml2YXRlIGZpbmFsIFN0cmluZyBuYW1lOwogICAgIHB1YmxpYyBmaW5hbCBNYXRjaEZpZWxkcyBpZDsKKyAgICBwcml2YXRlIGZpbmFsIFByZXJlcXVpc2l0ZTw/PltdIHByZXJlcXVpc2l0ZXM7CiAKLSAgICBwcml2YXRlIE1hdGNoRmllbGQoZmluYWwgU3RyaW5nIG5hbWUsIGZpbmFsIE1hdGNoRmllbGRzIGlkKSB7CisgICAgcHJpdmF0ZSBNYXRjaEZpZWxkKGZpbmFsIFN0cmluZyBuYW1lLCBmaW5hbCBNYXRjaEZpZWxkcyBpZCwgUHJlcmVxdWlzaXRlPD8+Li4uIHByZXJlcXVpc2l0ZXMpIHsKICAgICAgICAgdGhpcy5uYW1lID0gbmFtZTsKICAgICAgICAgdGhpcy5pZCA9IGlkOworICAgICAgICB0aGlzLnByZXJlcXVpc2l0ZXMgPSBwcmVyZXF1aXNpdGVzOwogICAgIH0KIAogICAgIHB1YmxpYyBmaW5hbCBzdGF0aWMgTWF0Y2hGaWVsZDxPRlBvcnQ+IElOX1BPUlQgPQogICAgICAgICAgICAgbmV3IE1hdGNoRmllbGQ8T0ZQb3J0PigiaW5fcG9ydCIsIE1hdGNoRmllbGRzLklOX1BPUlQpOworICAgIAogICAgIHB1YmxpYyBmaW5hbCBzdGF0aWMgTWF0Y2hGaWVsZDxPRlBvcnQ+IElOX1BIWV9QT1JUID0KLSAgICAgICAgICAgIG5ldyBNYXRjaEZpZWxkPE9GUG9ydD4oImluX3BoeV9wb3J0IiwgTWF0Y2hGaWVsZHMuUEhZU0lDQUxfUE9SVCk7Ci0gICAgcHVibGljIGZpbmFsIHN0YXRpYyBNYXRjaEZpZWxkPE9GUG9ydD4gTUVUQURBVEEgPQotICAgICAgICAgICAgbmV3IE1hdGNoRmllbGQ8T0ZQb3J0PigibWV0YWRhdGEiLCBNYXRjaEZpZWxkcy5NRVRBREFUQSk7CisgICAgICAgICAgICBuZXcgTWF0Y2hGaWVsZDxPRlBvcnQ+KCJpbl9waHlfcG9ydCIsIE1hdGNoRmllbGRzLlBIWVNJQ0FMX1BPUlQsCisgICAgICAgICAgICAgICAgICAgIG5ldyBQcmVyZXF1aXNpdGU8T0ZQb3J0PihNYXRjaEZpZWxkLklOX1BPUlQpKTsKKyAgICAKKyAgICBwdWJsaWMgZmluYWwgc3RhdGljIE1hdGNoRmllbGQ8T0ZNZXRhZGF0YT4gTUVUQURBVEEgPQorICAgICAgICAgICAgbmV3IE1hdGNoRmllbGQ8T0ZNZXRhZGF0YT4oIm1ldGFkYXRhIiwgTWF0Y2hGaWVsZHMuTUVUQURBVEEpOwogCiAgICAgcHVibGljIGZpbmFsIHN0YXRpYyBNYXRjaEZpZWxkPE1hY0FkZHJlc3M+IEVUSF9EU1QgPQogICAgICAgICAgICAgbmV3IE1hdGNoRmllbGQ8TWFjQWRkcmVzcz4oImV0aF9kc3QiLCBNYXRjaEZpZWxkcy5FVEhfRFNUKTsKKyAgICAKICAgICBwdWJsaWMgZmluYWwgc3RhdGljIE1hdGNoRmllbGQ8TWFjQWRkcmVzcz4gRVRIX1NSQyA9CiAgICAgICAgICAgICBuZXcgTWF0Y2hGaWVsZDxNYWNBZGRyZXNzPigiZXRoX3NyYyIsIE1hdGNoRmllbGRzLkVUSF9TUkMpOwogCkBAIC00Myw2MyArNTEsMTA2IEBACiAgICAgCiAgICAgcHVibGljIGZpbmFsIHN0YXRpYyBNYXRjaEZpZWxkPFZsYW5WaWQ+IFZMQU5fVklEID0KICAgICAgICAgICAgIG5ldyBNYXRjaEZpZWxkPFZsYW5WaWQ+KCJ2bGFuX3ZpZCIsIE1hdGNoRmllbGRzLlZMQU5fVklEKTsKLSAgICBwdWJsaWMgZmluYWwgc3RhdGljIE1hdGNoRmllbGQ8VmxhblBjcD4gVkxBTl9QQ1AgPQotICAgICAgICAgICAgbmV3IE1hdGNoRmllbGQ8VmxhblBjcD4oInZsYW5fcGNwIiwgTWF0Y2hGaWVsZHMuVkxBTl9QQ1ApOwogICAgIAorICAgIHB1YmxpYyBmaW5hbCBzdGF0aWMgTWF0Y2hGaWVsZDxWbGFuUGNwPiBWTEFOX1BDUCA9CisgICAgICAgICAgICBuZXcgTWF0Y2hGaWVsZDxWbGFuUGNwPigidmxhbl9wY3AiLCBNYXRjaEZpZWxkcy5WTEFOX1BDUCwKKyAgICAgICAgICAgICAgICAgICAgbmV3IFByZXJlcXVpc2l0ZTxWbGFuVmlkPihNYXRjaEZpZWxkLlZMQU5fVklEKSk7CiAgICAgCiAgICAgcHVibGljIGZpbmFsIHN0YXRpYyBNYXRjaEZpZWxkPElwRHNjcD4gSVBfRFNDUCA9Ci0gICAgICAgICAgICBuZXcgTWF0Y2hGaWVsZDxJcERzY3A+KCJpcF9kc2NwIiwgTWF0Y2hGaWVsZHMuSVBfRFNDUCk7CisgICAgICAgICAgICBuZXcgTWF0Y2hGaWVsZDxJcERzY3A+KCJpcF9kc2NwIiwgTWF0Y2hGaWVsZHMuSVBfRFNDUCwKKyAgICAgICAgICAgICAgICAgICAgbmV3IFByZXJlcXVpc2l0ZTxFdGhUeXBlPihNYXRjaEZpZWxkLkVUSF9UWVBFLCBFdGhUeXBlLkVUSF9UWVBFX0lQdjQsIEV0aFR5cGUuRVRIX1RZUEVfSVB2NikpOworICAgIAogICAgIHB1YmxpYyBmaW5hbCBzdGF0aWMgTWF0Y2hGaWVsZDxJcEVjbj4gSVBfRUNOID0KLSAgICAgICAgICAgIG5ldyBNYXRjaEZpZWxkPElwRWNuPigiaXBfZHNjcCIsIE1hdGNoRmllbGRzLklQX0VDTik7CisgICAgICAgICAgICBuZXcgTWF0Y2hGaWVsZDxJcEVjbj4oImlwX2RzY3AiLCBNYXRjaEZpZWxkcy5JUF9FQ04sCisgICAgICAgICAgICAgICAgICAgIG5ldyBQcmVyZXF1aXNpdGU8RXRoVHlwZT4oTWF0Y2hGaWVsZC5FVEhfVFlQRSwgRXRoVHlwZS5FVEhfVFlQRV9JUHY0LCBFdGhUeXBlLkVUSF9UWVBFX0lQdjYpKTsKKyAgICAKICAgICBwdWJsaWMgZmluYWwgc3RhdGljIE1hdGNoRmllbGQ8SXBQcm90b2NvbD4gSVBfUFJPVE8gPQotICAgICAgICAgICAgbmV3IE1hdGNoRmllbGQ8SXBQcm90b2NvbD4oImlwX3Byb3RvIiwgTWF0Y2hGaWVsZHMuSVBfUFJPVE8pOworICAgICAgICAgICAgbmV3IE1hdGNoRmllbGQ8SXBQcm90b2NvbD4oImlwX3Byb3RvIiwgTWF0Y2hGaWVsZHMuSVBfUFJPVE8sCisgICAgICAgICAgICAgICAgICAgIG5ldyBQcmVyZXF1aXNpdGU8RXRoVHlwZT4oTWF0Y2hGaWVsZC5FVEhfVFlQRSwgRXRoVHlwZS5FVEhfVFlQRV9JUHY0LCBFdGhUeXBlLkVUSF9UWVBFX0lQdjYpKTsKIAogICAgIHB1YmxpYyBmaW5hbCBzdGF0aWMgTWF0Y2hGaWVsZDxJUHY0PiBJUFY0X1NSQyA9Ci0gICAgICAgICAgICBuZXcgTWF0Y2hGaWVsZDxJUHY0PigiaXB2NF9zcmMiLCBNYXRjaEZpZWxkcy5JUFY0X1NSQyk7CisgICAgICAgICAgICBuZXcgTWF0Y2hGaWVsZDxJUHY0PigiaXB2NF9zcmMiLCBNYXRjaEZpZWxkcy5JUFY0X1NSQywKKyAgICAgICAgICAgICAgICAgICAgbmV3IFByZXJlcXVpc2l0ZTxFdGhUeXBlPihNYXRjaEZpZWxkLkVUSF9UWVBFLCBFdGhUeXBlLkVUSF9UWVBFX0lQdjQpKTsKKyAgICAKICAgICBwdWJsaWMgZmluYWwgc3RhdGljIE1hdGNoRmllbGQ8SVB2ND4gSVBWNF9EU1QgPQotICAgICAgICAgICAgbmV3IE1hdGNoRmllbGQ8SVB2ND4oImlwdjRfZHN0IiwgTWF0Y2hGaWVsZHMuSVBWNF9EU1QpOworICAgICAgICAgICAgbmV3IE1hdGNoRmllbGQ8SVB2ND4oImlwdjRfZHN0IiwgTWF0Y2hGaWVsZHMuSVBWNF9EU1QsCisgICAgICAgICAgICAgICAgICAgIG5ldyBQcmVyZXF1aXNpdGU8RXRoVHlwZT4oTWF0Y2hGaWVsZC5FVEhfVFlQRSwgRXRoVHlwZS5FVEhfVFlQRV9JUHY0KSk7CiAKICAgICBwdWJsaWMgZmluYWwgc3RhdGljIE1hdGNoRmllbGQ8VHJhbnNwb3J0UG9ydD4gVENQX1NSQyA9IG5ldyBNYXRjaEZpZWxkPFRyYW5zcG9ydFBvcnQ+KAotICAgICAgICAgICAgInRjcF9zcmMiLCBNYXRjaEZpZWxkcy5UQ1BfU1JDKTsKKyAgICAgICAgICAgICJ0Y3Bfc3JjIiwgTWF0Y2hGaWVsZHMuVENQX1NSQywKKyAgICAgICAgICAgIG5ldyBQcmVyZXF1aXNpdGU8SXBQcm90b2NvbD4oTWF0Y2hGaWVsZC5JUF9QUk9UTywgSXBQcm90b2NvbC5JUF9QUk9UT19UQ1ApKTsKKyAgICAKICAgICBwdWJsaWMgZmluYWwgc3RhdGljIE1hdGNoRmllbGQ8VHJhbnNwb3J0UG9ydD4gVENQX0RTVCA9IG5ldyBNYXRjaEZpZWxkPFRyYW5zcG9ydFBvcnQ+KAotICAgICAgICAgICAgInRjcF9kc3QiLCBNYXRjaEZpZWxkcy5UQ1BfRFNUKTsKKyAgICAgICAgICAgICJ0Y3BfZHN0IiwgTWF0Y2hGaWVsZHMuVENQX0RTVCwKKyAgICAgICAgICAgIG5ldyBQcmVyZXF1aXNpdGU8SXBQcm90b2NvbD4oTWF0Y2hGaWVsZC5JUF9QUk9UTywgSXBQcm90b2NvbC5JUF9QUk9UT19UQ1ApKTsKIAogICAgIHB1YmxpYyBmaW5hbCBzdGF0aWMgTWF0Y2hGaWVsZDxUcmFuc3BvcnRQb3J0PiBVRFBfU1JDID0gbmV3IE1hdGNoRmllbGQ8VHJhbnNwb3J0UG9ydD4oCi0gICAgICAgICAgICAidWRwX3NyYyIsIE1hdGNoRmllbGRzLlVEUF9TUkMpOworICAgICAgICAgICAgInVkcF9zcmMiLCBNYXRjaEZpZWxkcy5VRFBfU1JDLAorICAgICAgICAgICAgbmV3IFByZXJlcXVpc2l0ZTxJcFByb3RvY29sPihNYXRjaEZpZWxkLklQX1BST1RPLCBJcFByb3RvY29sLklQX1BST1RPX1VEUCkpOworICAgIAogICAgIHB1YmxpYyBmaW5hbCBzdGF0aWMgTWF0Y2hGaWVsZDxUcmFuc3BvcnRQb3J0PiBVRFBfRFNUID0gbmV3IE1hdGNoRmllbGQ8VHJhbnNwb3J0UG9ydD4oCi0gICAgICAgICAgICAidWRwX2RzdCIsIE1hdGNoRmllbGRzLlVEUF9EU1QpOworICAgICAgICAgICAgInVkcF9kc3QiLCBNYXRjaEZpZWxkcy5VRFBfRFNULAorICAgICAgICAgICAgbmV3IFByZXJlcXVpc2l0ZTxJcFByb3RvY29sPihNYXRjaEZpZWxkLklQX1BST1RPLCBJcFByb3RvY29sLklQX1BST1RPX1VEUCkpOwogCiAgICAgcHVibGljIGZpbmFsIHN0YXRpYyBNYXRjaEZpZWxkPFRyYW5zcG9ydFBvcnQ+IFNDVFBfU1JDID0gbmV3IE1hdGNoRmllbGQ8VHJhbnNwb3J0UG9ydD4oCi0gICAgICAgICAgICAic2N0cF9zcmMiLCBNYXRjaEZpZWxkcy5TQ1RQX1NSQyk7CisgICAgICAgICAgICAic2N0cF9zcmMiLCBNYXRjaEZpZWxkcy5TQ1RQX1NSQywKKyAgICAgICAgICAgIG5ldyBQcmVyZXF1aXNpdGU8SXBQcm90b2NvbD4oTWF0Y2hGaWVsZC5JUF9QUk9UTywgSXBQcm90b2NvbC5JUF9QUk9UT19TQ1RQKSk7CisgICAgCiAgICAgcHVibGljIGZpbmFsIHN0YXRpYyBNYXRjaEZpZWxkPFRyYW5zcG9ydFBvcnQ+IFNDVFBfRFNUID0gbmV3IE1hdGNoRmllbGQ8VHJhbnNwb3J0UG9ydD4oCi0gICAgICAgICAgICAic2N0cF9kc3QiLCBNYXRjaEZpZWxkcy5TQ1RQX0RTVCk7CisgICAgICAgICAgICAic2N0cF9kc3QiLCBNYXRjaEZpZWxkcy5TQ1RQX0RTVCwKKyAgICAgICAgICAgIG5ldyBQcmVyZXF1aXNpdGU8SXBQcm90b2NvbD4oTWF0Y2hGaWVsZC5JUF9QUk9UTywgSXBQcm90b2NvbC5JUF9QUk9UT19TQ1RQKSk7CiAKICAgICBwdWJsaWMgZmluYWwgc3RhdGljIE1hdGNoRmllbGQ8SUNNUHY0VHlwZT4gSUNNUFY0X1RZUEUgPSBuZXcgTWF0Y2hGaWVsZDxJQ01QdjRUeXBlPigKLSAgICAgICAgICAgICJpY21wdjRfc3JjIiwgTWF0Y2hGaWVsZHMuSUNNUFY0X1RZUEUpOworICAgICAgICAgICAgImljbXB2NF9zcmMiLCBNYXRjaEZpZWxkcy5JQ01QVjRfVFlQRSwKKyAgICAgICAgICAgIG5ldyBQcmVyZXF1aXNpdGU8SXBQcm90b2NvbD4oTWF0Y2hGaWVsZC5JUF9QUk9UTywgSXBQcm90b2NvbC5JUF9QUk9UT19JQ01QKSk7CisgICAgCiAgICAgcHVibGljIGZpbmFsIHN0YXRpYyBNYXRjaEZpZWxkPElDTVB2NENvZGU+IElDTVBWNF9DT0RFID0gbmV3IE1hdGNoRmllbGQ8SUNNUHY0Q29kZT4oCi0gICAgICAgICAgICAiaWNtcHY0X2RzdCIsIE1hdGNoRmllbGRzLklDTVBWNF9DT0RFKTsKKyAgICAgICAgICAgICJpY21wdjRfZHN0IiwgTWF0Y2hGaWVsZHMuSUNNUFY0X0NPREUsCisgICAgICAgICAgICBuZXcgUHJlcmVxdWlzaXRlPElwUHJvdG9jb2w+KE1hdGNoRmllbGQuSVBfUFJPVE8sIElwUHJvdG9jb2wuSVBfUFJPVE9fSUNNUCkpOwogCiAgICAgcHVibGljIGZpbmFsIHN0YXRpYyBNYXRjaEZpZWxkPEFycE9wY29kZT4gQVJQX09QID0gbmV3IE1hdGNoRmllbGQ8QXJwT3Bjb2RlPigKLSAgICAgICAgICAgICJhcnBfb3AiLCBNYXRjaEZpZWxkcy5BUlBfT1ApOworICAgICAgICAgICAgImFycF9vcCIsIE1hdGNoRmllbGRzLkFSUF9PUCwKKyAgICAgICAgICAgIG5ldyBQcmVyZXF1aXNpdGU8RXRoVHlwZT4oTWF0Y2hGaWVsZC5FVEhfVFlQRSwgRXRoVHlwZS5FVEhfVFlQRV9BUlApKTsKKyAgICAKICAgICBwdWJsaWMgZmluYWwgc3RhdGljIE1hdGNoRmllbGQ8SVB2ND4gQVJQX1NQQSA9Ci0gICAgICAgICAgICBuZXcgTWF0Y2hGaWVsZDxJUHY0PigiYXJwX3NwYSIsIE1hdGNoRmllbGRzLkFSUF9TUEEpOworICAgICAgICAgICAgbmV3IE1hdGNoRmllbGQ8SVB2ND4oImFycF9zcGEiLCBNYXRjaEZpZWxkcy5BUlBfU1BBLAorICAgICAgICAgICAgICAgICAgICBuZXcgUHJlcmVxdWlzaXRlPEV0aFR5cGU+KE1hdGNoRmllbGQuRVRIX1RZUEUsIEV0aFR5cGUuRVRIX1RZUEVfQVJQKSk7CisgICAgCiAgICAgcHVibGljIGZpbmFsIHN0YXRpYyBNYXRjaEZpZWxkPElQdjQ+IEFSUF9UUEEgPQotICAgICAgICAgICAgbmV3IE1hdGNoRmllbGQ8SVB2ND4oImFycF90cGEiLCBNYXRjaEZpZWxkcy5BUlBfVFBBKTsKKyAgICAgICAgICAgIG5ldyBNYXRjaEZpZWxkPElQdjQ+KCJhcnBfdHBhIiwgTWF0Y2hGaWVsZHMuQVJQX1RQQSwKKyAgICAgICAgICAgICAgICAgICAgbmV3IFByZXJlcXVpc2l0ZTxFdGhUeXBlPihNYXRjaEZpZWxkLkVUSF9UWVBFLCBFdGhUeXBlLkVUSF9UWVBFX0FSUCkpOworICAgIAogICAgIHB1YmxpYyBmaW5hbCBzdGF0aWMgTWF0Y2hGaWVsZDxNYWNBZGRyZXNzPiBBUlBfU0hBID0KLSAgICAgICAgICAgIG5ldyBNYXRjaEZpZWxkPE1hY0FkZHJlc3M+KCJhcnBfc2hhIiwgTWF0Y2hGaWVsZHMuQVJQX1NIQSk7CisgICAgICAgICAgICBuZXcgTWF0Y2hGaWVsZDxNYWNBZGRyZXNzPigiYXJwX3NoYSIsIE1hdGNoRmllbGRzLkFSUF9TSEEsCisgICAgICAgICAgICAgICAgICAgIG5ldyBQcmVyZXF1aXNpdGU8RXRoVHlwZT4oTWF0Y2hGaWVsZC5FVEhfVFlQRSwgRXRoVHlwZS5FVEhfVFlQRV9BUlApKTsKKyAgICAKICAgICBwdWJsaWMgZmluYWwgc3RhdGljIE1hdGNoRmllbGQ8TWFjQWRkcmVzcz4gQVJQX1RIQSA9Ci0gICAgICAgICAgICBuZXcgTWF0Y2hGaWVsZDxNYWNBZGRyZXNzPigiYXJwX3RoYSIsIE1hdGNoRmllbGRzLkFSUF9USEEpOworICAgICAgICAgICAgbmV3IE1hdGNoRmllbGQ8TWFjQWRkcmVzcz4oImFycF90aGEiLCBNYXRjaEZpZWxkcy5BUlBfVEhBLAorICAgICAgICAgICAgICAgICAgICBuZXcgUHJlcmVxdWlzaXRlPEV0aFR5cGU+KE1hdGNoRmllbGQuRVRIX1RZUEUsIEV0aFR5cGUuRVRIX1RZUEVfQVJQKSk7CiAKICAgICBwdWJsaWMgZmluYWwgc3RhdGljIE1hdGNoRmllbGQ8SVB2Nj4gSVBWNl9TUkMgPQotICAgICAgICAgICAgbmV3IE1hdGNoRmllbGQ8SVB2Nj4oImlwdjZfc3JjIiwgTWF0Y2hGaWVsZHMuSVBWNl9TUkMpOworICAgICAgICAgICAgbmV3IE1hdGNoRmllbGQ8SVB2Nj4oImlwdjZfc3JjIiwgTWF0Y2hGaWVsZHMuSVBWNl9TUkMsCisgICAgICAgICAgICAgICAgICAgIG5ldyBQcmVyZXF1aXNpdGU8RXRoVHlwZT4oTWF0Y2hGaWVsZC5FVEhfVFlQRSwgRXRoVHlwZS5FVEhfVFlQRV9JUHY2KSk7CisgICAgCiAgICAgcHVibGljIGZpbmFsIHN0YXRpYyBNYXRjaEZpZWxkPElQdjY+IElQVjZfRFNUID0KLSAgICAgICAgICAgIG5ldyBNYXRjaEZpZWxkPElQdjY+KCJpcHY2X2RzdCIsIE1hdGNoRmllbGRzLklQVjZfRFNUKTsKKyAgICAgICAgICAgIG5ldyBNYXRjaEZpZWxkPElQdjY+KCJpcHY2X2RzdCIsIE1hdGNoRmllbGRzLklQVjZfRFNULAorICAgICAgICAgICAgICAgICAgICBuZXcgUHJlcmVxdWlzaXRlPEV0aFR5cGU+KE1hdGNoRmllbGQuRVRIX1RZUEUsIEV0aFR5cGUuRVRIX1RZUEVfSVB2NikpOwogCiAgICAgcHVibGljIGZpbmFsIHN0YXRpYyBNYXRjaEZpZWxkPElQdjZGbG93TGFiZWw+IElQVjZfRkxBQkVMID0KLSAgICAgICAgICAgIG5ldyBNYXRjaEZpZWxkPElQdjZGbG93TGFiZWw+KCJpcHY2X2ZsYWJlbCIsIE1hdGNoRmllbGRzLklQVjZfRkxPV0xBQkVMKTsKKyAgICAgICAgICAgIG5ldyBNYXRjaEZpZWxkPElQdjZGbG93TGFiZWw+KCJpcHY2X2ZsYWJlbCIsIE1hdGNoRmllbGRzLklQVjZfRkxPV0xBQkVMLAorICAgICAgICAgICAgICAgICAgICBuZXcgUHJlcmVxdWlzaXRlPEV0aFR5cGU+KE1hdGNoRmllbGQuRVRIX1RZUEUsIEV0aFR5cGUuRVRIX1RZUEVfSVB2NikpOwogCiAgICAgcHVibGljIFN0cmluZyBnZXROYW1lKCkgewogICAgICAgICByZXR1cm4gbmFtZTsKICAgICB9CisgICAgCisgICAgcHVibGljIGJvb2xlYW4gYXJlUHJlcmVxdWlzaXRlc09LKE1hdGNoIG1hdGNoKSB7CisgICAgICAgIGZvciAoUHJlcmVxdWlzaXRlPD8+IHAgOiB0aGlzLnByZXJlcXVpc2l0ZXMpIHsKKyAgICAgICAgICAgIGlmICghcC5pc1N0YWlzZmllZChtYXRjaCkpIHsKKyAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfQogCiB9CmRpZmYgLS1naXQgYS9qYXZhX2dlbi9wcmUtd3JpdHRlbi9zcmMvbWFpbi9qYXZhL29yZy9vcGVuZmxvdy9wcm90b2NvbC9tYXRjaC9NYXRjaEZpZWxkcy5qYXZhIGIvamF2YV9nZW4vcHJlLXdyaXR0ZW4vc3JjL21haW4vamF2YS9vcmcvb3BlbmZsb3cvcHJvdG9jb2wvbWF0Y2gvTWF0Y2hGaWVsZHMuamF2YQppbmRleCAyMTA0M2YyLi4zMDlmOTFmIDEwMDY0NAotLS0gYS9qYXZhX2dlbi9wcmUtd3JpdHRlbi9zcmMvbWFpbi9qYXZhL29yZy9vcGVuZmxvdy9wcm90b2NvbC9tYXRjaC9NYXRjaEZpZWxkcy5qYXZhCisrKyBiL2phdmFfZ2VuL3ByZS13cml0dGVuL3NyYy9tYWluL2phdmEvb3JnL29wZW5mbG93L3Byb3RvY29sL21hdGNoL01hdGNoRmllbGRzLmphdmEKQEAgLTEsNSArMSw2IEBACiBwYWNrYWdlIG9yZy5vcGVuZmxvdy5wcm90b2NvbC5tYXRjaDsKIAorLy8gTVVTVCBCRSBPUkRFUkVEIEJZIFRIRSBPUkRFUiBPRiBPRiBTUEVDISEhCiBwdWJsaWMgZW51bSBNYXRjaEZpZWxkcyB7CiAgICAgSU5fUE9SVCwKICAgICBQSFlTSUNBTF9QT1JULApkaWZmIC0tZ2l0IGEvamF2YV9nZW4vcHJlLXdyaXR0ZW4vc3JjL21haW4vamF2YS9vcmcvb3BlbmZsb3cvcHJvdG9jb2wvbWF0Y2gvUHJlcmVxdWlzaXRlLmphdmEgYi9qYXZhX2dlbi9wcmUtd3JpdHRlbi9zcmMvbWFpbi9qYXZhL29yZy9vcGVuZmxvdy9wcm90b2NvbC9tYXRjaC9QcmVyZXF1aXNpdGUuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5mNTE4OTI1Ci0tLSAvZGV2L251bGwKKysrIGIvamF2YV9nZW4vcHJlLXdyaXR0ZW4vc3JjL21haW4vamF2YS9vcmcvb3BlbmZsb3cvcHJvdG9jb2wvbWF0Y2gvUHJlcmVxdWlzaXRlLmphdmEKQEAgLTAsMCArMSw0NCBAQAorcGFja2FnZSBvcmcub3BlbmZsb3cucHJvdG9jb2wubWF0Y2g7CisKK2ltcG9ydCBqYXZhLnV0aWwuSGFzaFNldDsKK2ltcG9ydCBqYXZhLnV0aWwuU2V0OworCitpbXBvcnQgb3JnLm9wZW5mbG93LnR5cGVzLk9GVmFsdWVUeXBlOworCitwdWJsaWMgY2xhc3MgUHJlcmVxdWlzaXRlPFQgZXh0ZW5kcyBPRlZhbHVlVHlwZTxUPj4geworICAgIHByaXZhdGUgTWF0Y2hGaWVsZDxUPiBmaWVsZDsKKyAgICBwcml2YXRlIFNldDxPRlZhbHVlVHlwZTxUPj4gdmFsdWVzOworICAgIHByaXZhdGUgYm9vbGVhbiBhbnk7CisgICAgCisgICAgcHVibGljIFByZXJlcXVpc2l0ZShNYXRjaEZpZWxkPFQ+IGZpZWxkLCBPRlZhbHVlVHlwZTxUPi4uLiB2YWx1ZXMpIHsKKyAgICAgICAgdGhpcy52YWx1ZXMgPSBuZXcgSGFzaFNldDxPRlZhbHVlVHlwZTxUPj4oKTsKKyAgICAgICAgdGhpcy5maWVsZCA9IGZpZWxkOworICAgICAgICBpZiAodmFsdWVzID09IG51bGwgfHwgdmFsdWVzLmxlbmd0aCA9PSAwKSB7CisgICAgICAgICAgICB0aGlzLmFueSA9IHRydWU7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICB0aGlzLmFueSA9IGZhbHNlOworICAgICAgICAgICAgZm9yIChPRlZhbHVlVHlwZTxUPiB2YWx1ZSA6IHZhbHVlcykgeworICAgICAgICAgICAgICAgIHRoaXMudmFsdWVzLmFkZCh2YWx1ZSk7CisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAgICB9CisgICAgCisgICAgLyoqCisgICAgICogUmV0dXJucyB0cnVlIGlmIHRoaXMgcHJlcmVxdWlzaXRlIGlzIHNhdGlzZmllZCBieSB0aGUgZ2l2ZW4gbWF0Y2ggb2JqZWN0LgorICAgICAqIAorICAgICAqIEBwYXJhbSBtYXRjaCBNYXRjaCBvYmplY3QKKyAgICAgKiBAcmV0dXJuIHRydWUgaWZmIHByZXJlcXVpc2l0ZSBpcyBzYXRpc2ZpZWQuCisgICAgICovCisgICAgcHVibGljIGJvb2xlYW4gaXNTdGFpc2ZpZWQoTWF0Y2ggbWF0Y2gpIHsKKyAgICAgICAgT0ZWYWx1ZVR5cGU8VD4gcmVzID0gbWF0Y2guZ2V0KHRoaXMuZmllbGQpOworICAgICAgICBpZiAocmVzID09IG51bGwpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIGlmICh0aGlzLmFueSkKKyAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICBpZiAodGhpcy52YWx1ZXMuY29udGFpbnMocmVzKSkgeworICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIH0KKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KKworfQpkaWZmIC0tZ2l0IGEvamF2YV9nZW4vcHJlLXdyaXR0ZW4vc3JjL21haW4vamF2YS9vcmcvb3BlbmZsb3cvdHlwZXMvSVB2NFdpdGhNYXNrLmphdmEgYi9qYXZhX2dlbi9wcmUtd3JpdHRlbi9zcmMvbWFpbi9qYXZhL29yZy9vcGVuZmxvdy90eXBlcy9JUHY0V2l0aE1hc2suamF2YQppbmRleCBjMjRjNGZkLi4wYTFhNmQzIDEwMDY0NAotLS0gYS9qYXZhX2dlbi9wcmUtd3JpdHRlbi9zcmMvbWFpbi9qYXZhL29yZy9vcGVuZmxvdy90eXBlcy9JUHY0V2l0aE1hc2suamF2YQorKysgYi9qYXZhX2dlbi9wcmUtd3JpdHRlbi9zcmMvbWFpbi9qYXZhL29yZy9vcGVuZmxvdy90eXBlcy9JUHY0V2l0aE1hc2suamF2YQpAQCAtMzYsNyArMzYsNyBAQAogICAgICAgICByZXR1cm4gcmVzLnRvU3RyaW5nKCk7CiAgICAgfQogICAgIAotICAgIHB1YmxpYyBzdGF0aWMgT0ZWYWx1ZVR5cGU8Pz4gb2ZQb3NzaWJseU1hc2tlZChmaW5hbCBTdHJpbmcgc3RyaW5nKSB7CisgICAgcHVibGljIHN0YXRpYyBJUHY0V2l0aE1hc2sgb2YoZmluYWwgU3RyaW5nIHN0cmluZykgewogICAgICAgICBpbnQgc2xhc2hQb3M7CiAgICAgICAgIFN0cmluZyBpcCA9IHN0cmluZzsKICAgICAgICAgaW50IG1hc2tCaXRzID0gMDsKQEAgLTcyLDcgKzcyLDcgQEAKICAgICAgICAgICAgIHJldHVybiBJUHY0V2l0aE1hc2sub2YoaXB2NCwgbWFza0FkZHJlc3MpOwogICAgICAgICB9IGVsc2UgaWYgKG1hc2tCaXRzID09IDApIHsKICAgICAgICAgICAgIC8vIE5vIG1hc2sKLSAgICAgICAgICAgIHJldHVybiBpcHY0OworICAgICAgICAgICAgcmV0dXJuIElQdjRXaXRoTWFzay5vZihpcHY0LCBJUHY0Lm9mKDB4RkZGRkZGRkYpKTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIC8vIFdpdGggbWFzawogICAgICAgICAgICAgaW50IG1hc2sgPSAoLTEpIDw8ICgzMiAtIG1hc2tCaXRzKTsKZGlmZiAtLWdpdCBhL2phdmFfZ2VuL3ByZS13cml0dGVuL3NyYy9tYWluL2phdmEvb3JnL29wZW5mbG93L3R5cGVzL0lQdjZXaXRoTWFzay5qYXZhIGIvamF2YV9nZW4vcHJlLXdyaXR0ZW4vc3JjL21haW4vamF2YS9vcmcvb3BlbmZsb3cvdHlwZXMvSVB2NldpdGhNYXNrLmphdmEKaW5kZXggNzIzMTllMy4uNDUzNTA3YSAxMDA2NDQKLS0tIGEvamF2YV9nZW4vcHJlLXdyaXR0ZW4vc3JjL21haW4vamF2YS9vcmcvb3BlbmZsb3cvdHlwZXMvSVB2NldpdGhNYXNrLmphdmEKKysrIGIvamF2YV9nZW4vcHJlLXdyaXR0ZW4vc3JjL21haW4vamF2YS9vcmcvb3BlbmZsb3cvdHlwZXMvSVB2NldpdGhNYXNrLmphdmEKQEAgLTMxLDcgKzMxLDcgQEAKICAgICAgICAgcmV0dXJuIHJlcy50b1N0cmluZygpOwogICAgIH0KICAgICAKLSAgICBwdWJsaWMgc3RhdGljIE9GVmFsdWVUeXBlPD8+IG9mUG9zc2libHlNYXNrZWQoZmluYWwgU3RyaW5nIHN0cmluZykgeworICAgIHB1YmxpYyBzdGF0aWMgSVB2NldpdGhNYXNrIG9mKGZpbmFsIFN0cmluZyBzdHJpbmcpIHsKICAgICAgICAgaW50IHNsYXNoUG9zOwogICAgICAgICBTdHJpbmcgaXAgPSBzdHJpbmc7CiAgICAgICAgIGludCBtYXNrQml0cyA9IDA7CkBAIC02Nyw3ICs2Nyw3IEBACiAgICAgICAgICAgICByZXR1cm4gSVB2NldpdGhNYXNrLm9mKGlwdjYsIG1hc2tBZGRyZXNzKTsKICAgICAgICAgfSBlbHNlIGlmIChtYXNrQml0cyA9PSAwKSB7CiAgICAgICAgICAgICAvLyBObyBtYXNrCi0gICAgICAgICAgICByZXR1cm4gaXB2NjsKKyAgICAgICAgICAgIHJldHVybiBJUHY2V2l0aE1hc2sub2YoaXB2NiwgSVB2Ni5vZigweEZGRkZGRkZGRkZGRkZGRkZsLCAweEZGRkZGRkZGRkZGRkZGRkZsKSk7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAvLyBXaXRoIG1hc2sKICAgICAgICAgICAgIEJpZ0ludGVnZXIgbWFzayA9IEJpZ0ludGVnZXIuT05FLm5lZ2F0ZSgpLnNoaWZ0TGVmdCgxMjggLSBtYXNrQml0cyk7CmRpZmYgLS1naXQgYS9qYXZhX2dlbi9wcmUtd3JpdHRlbi9zcmMvbWFpbi9qYXZhL29yZy9vcGVuZmxvdy90eXBlcy9PRk1ldGFkYXRhLmphdmEgYi9qYXZhX2dlbi9wcmUtd3JpdHRlbi9zcmMvbWFpbi9qYXZhL29yZy9vcGVuZmxvdy90eXBlcy9PRk1ldGFkYXRhLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uODNkMDJkYQotLS0gL2Rldi9udWxsCisrKyBiL2phdmFfZ2VuL3ByZS13cml0dGVuL3NyYy9tYWluL2phdmEvb3JnL29wZW5mbG93L3R5cGVzL09GTWV0YWRhdGEuamF2YQpAQCAtMCwwICsxLDM0IEBACitwYWNrYWdlIG9yZy5vcGVuZmxvdy50eXBlczsKKworaW1wb3J0IG9yZy5qYm9zcy5uZXR0eS5idWZmZXIuQ2hhbm5lbEJ1ZmZlcjsKKworcHVibGljIGNsYXNzIE9GTWV0YWRhdGEgZXh0ZW5kcyBVNjQgaW1wbGVtZW50cyBPRlZhbHVlVHlwZTxPRk1ldGFkYXRhPiB7CisgICAgCisgICAgcHJpdmF0ZSBzdGF0aWMgaW50IExFTkdUSCA9IDg7CisKKyAgICBwcm90ZWN0ZWQgT0ZNZXRhZGF0YShsb25nIHJhdykgeworICAgICAgICBzdXBlcihyYXcpOworICAgIH0KKworICAgIHB1YmxpYyBzdGF0aWMgT0ZNZXRhZGF0YSBvZihsb25nIHJhdykgeworICAgICAgICByZXR1cm4gbmV3IE9GTWV0YWRhdGEocmF3KTsKKyAgICB9CisgICAgCisgICAgcHVibGljIHN0YXRpYyBPRk1ldGFkYXRhIHJlYWQ4Qnl0ZXMoQ2hhbm5lbEJ1ZmZlciBjYikgeworICAgICAgICByZXR1cm4gT0ZNZXRhZGF0YS5vZihjYi5yZWFkTG9uZygpKTsKKyAgICB9CisgICAgCisgICAgcHVibGljIHZvaWQgd3JpdGU4Qnl0ZXMoQ2hhbm5lbEJ1ZmZlciBjYikgeworICAgICAgICBjYi53cml0ZUxvbmcoc3VwZXIuZ2V0VmFsdWUoKSk7CisgICAgfQorCisgICAgQE92ZXJyaWRlCisgICAgcHVibGljIGludCBnZXRMZW5ndGgoKSB7CisgICAgICAgIHJldHVybiBMRU5HVEg7CisgICAgfQorCisgICAgQE92ZXJyaWRlCisgICAgcHVibGljIE9GTWV0YWRhdGEgYXBwbHlNYXNrKE9GTWV0YWRhdGEgbWFzaykgeworICAgICAgICByZXR1cm4gT0ZNZXRhZGF0YS5vZih0aGlzLmdldFZhbHVlKCkgJiBtYXNrLmdldFZhbHVlKCkpOworICAgIH0KK30KZGlmZiAtLWdpdCBhL2phdmFfZ2VuL3ByZS13cml0dGVuL3NyYy9tYWluL2phdmEvb3JnL29wZW5mbG93L3R5cGVzL1U2NC5qYXZhIGIvamF2YV9nZW4vcHJlLXdyaXR0ZW4vc3JjL21haW4vamF2YS9vcmcvb3BlbmZsb3cvdHlwZXMvVTY0LmphdmEKaW5kZXggNzUwMzk4Zi4uNzg3MTQ0NSAxMDA2NDQKLS0tIGEvamF2YV9nZW4vcHJlLXdyaXR0ZW4vc3JjL21haW4vamF2YS9vcmcvb3BlbmZsb3cvdHlwZXMvVTY0LmphdmEKKysrIGIvamF2YV9nZW4vcHJlLXdyaXR0ZW4vc3JjL21haW4vamF2YS9vcmcvb3BlbmZsb3cvdHlwZXMvVTY0LmphdmEKQEAgLTI0LDcgKzI0LDcgQEAKIAogICAgIHByaXZhdGUgZmluYWwgbG9uZyByYXc7CiAKLSAgICBwcml2YXRlIFU2NChmaW5hbCBsb25nIHJhdykgeworICAgIHByb3RlY3RlZCBVNjQoZmluYWwgbG9uZyByYXcpIHsKICAgICAgICAgdGhpcy5yYXcgPSByYXc7CiAgICAgfQogCmRpZmYgLS1naXQgYS9qYXZhX2dlbi9wcmUtd3JpdHRlbi9zcmMvbWFpbi9qYXZhL29yZy9vcGVuZmxvdy90eXBlcy9WbGFuVmlkLmphdmEgYi9qYXZhX2dlbi9wcmUtd3JpdHRlbi9zcmMvbWFpbi9qYXZhL29yZy9vcGVuZmxvdy90eXBlcy9WbGFuVmlkLmphdmEKaW5kZXggY2EyYzNjMi4uZTM2YTVkZCAxMDA2NDQKLS0tIGEvamF2YV9nZW4vcHJlLXdyaXR0ZW4vc3JjL21haW4vamF2YS9vcmcvb3BlbmZsb3cvdHlwZXMvVmxhblZpZC5qYXZhCisrKyBiL2phdmFfZ2VuL3ByZS13cml0dGVuL3NyYy9tYWluL2phdmEvb3JnL29wZW5mbG93L3R5cGVzL1ZsYW5WaWQuamF2YQpAQCAtNzAsNyArNzAsNyBAQAogICAgICAgICBjLndyaXRlU2hvcnQodGhpcy52aWQpOwogICAgIH0KIAotICAgIHB1YmxpYyBWbGFuVmlkIHJlYWQyQnl0ZXMoQ2hhbm5lbEJ1ZmZlciBjKSB0aHJvd3MgT0ZQYXJzZUVycm9yIHsKKyAgICBwdWJsaWMgc3RhdGljIFZsYW5WaWQgcmVhZDJCeXRlcyhDaGFubmVsQnVmZmVyIGMpIHRocm93cyBPRlBhcnNlRXJyb3IgewogICAgICAgICByZXR1cm4gVmxhblZpZC5vZihjLnJlYWRTaG9ydCgpKTsKICAgICB9CiAKZGlmZiAtLWdpdCBhL2phdmFfZ2VuL3ByZS13cml0dGVuL3NyYy90ZXN0L2phdmEvb3JnL29wZW5mbG93L3R5cGVzL0lQdjRUZXN0LmphdmEgYi9qYXZhX2dlbi9wcmUtd3JpdHRlbi9zcmMvdGVzdC9qYXZhL29yZy9vcGVuZmxvdy90eXBlcy9JUHY0VGVzdC5qYXZhCmluZGV4IGQzNDQwMjEuLmE1YWMxYmUgMTAwNjQ0Ci0tLSBhL2phdmFfZ2VuL3ByZS13cml0dGVuL3NyYy90ZXN0L2phdmEvb3JnL29wZW5mbG93L3R5cGVzL0lQdjRUZXN0LmphdmEKKysrIGIvamF2YV9nZW4vcHJlLXdyaXR0ZW4vc3JjL3Rlc3QvamF2YS9vcmcvb3BlbmZsb3cvdHlwZXMvSVB2NFRlc3QuamF2YQpAQCAtMTA4LDI5ICsxMDgsMjMgQEAKICAgICAgICAgfQogICAgIH0KICAgICAKLSAgICBAU3VwcHJlc3NXYXJuaW5ncygidW5jaGVja2VkIikKICAgICBAVGVzdAotICAgIHB1YmxpYyB2b2lkIHRlc3RPZlBvc3NpYmx5TWFza2VkKCkgdGhyb3dzIE9GUGFyc2VFcnJvciwgT0ZTaG9ydFJlYWQgeworICAgIHB1YmxpYyB2b2lkIHRlc3RPZk1hc2tlZCgpIHRocm93cyBPRlBhcnNlRXJyb3IsIE9GU2hvcnRSZWFkIHsKICAgICAgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBpcHNXaXRoTWFzay5sZW5ndGg7IGkrKykgewotICAgICAgICAgICAgT0ZWYWx1ZVR5cGUgdmFsdWUgPSBJUHY0V2l0aE1hc2sub2ZQb3NzaWJseU1hc2tlZChpcHNXaXRoTWFza1tpXSk7Ci0gICAgICAgICAgICBpZiAodmFsdWUgaW5zdGFuY2VvZiBJUHY0ICYmICFoYXNNYXNrW2ldKSB7Ci0gICAgICAgICAgICAgICAgLy8gVHlwZXMgT0ssIGNoZWNrIHZhbHVlcwotICAgICAgICAgICAgICAgIElQdjQgaXAgPSAoSVB2NCl2YWx1ZTsKKyAgICAgICAgICAgIElQdjRXaXRoTWFzayB2YWx1ZSA9IElQdjRXaXRoTWFzay5vZihpcHNXaXRoTWFza1tpXSk7CisgICAgICAgICAgICBpZiAoIWhhc01hc2tbaV0pIHsKKyAgICAgICAgICAgICAgICBJUHY0IGlwID0gdmFsdWUuZ2V0VmFsdWUoKTsKICAgICAgICAgICAgICAgICBhc3NlcnRBcnJheUVxdWFscyhpcHNXaXRoTWFza1ZhbHVlc1tpXVswXSwgaXAuZ2V0Qnl0ZXMoKSk7Ci0gICAgICAgICAgICB9IGVsc2UgaWYgKHZhbHVlIGluc3RhbmNlb2YgTWFza2VkICYmIGhhc01hc2tbaV0pIHsKLSAgICAgICAgICAgICAgICBNYXNrZWQ8SVB2ND4gaXAgPSBudWxsOwotICAgICAgICAgICAgICAgIHRyeSB7Ci0gICAgICAgICAgICAgICAgICAgIGlwID0gKE1hc2tlZDxJUHY0Pil2YWx1ZTsKLSAgICAgICAgICAgICAgICB9IGNhdGNoIChDbGFzc0Nhc3RFeGNlcHRpb24gZSkgewotICAgICAgICAgICAgICAgICAgICBmYWlsKCJJbnZhbGlkIE1hc2tlZDxUPiB0eXBlLiIpOworICAgICAgICAgICAgfSBlbHNlIGlmIChoYXNNYXNrW2ldKSB7CisgICAgICAgICAgICAgICAgYnl0ZVtdIGlwQnl0ZXMgPSBuZXcgYnl0ZVs0XTsKKyAgICAgICAgICAgICAgICBTeXN0ZW0uYXJyYXljb3B5KGlwc1dpdGhNYXNrVmFsdWVzW2ldWzBdLCAwLCBpcEJ5dGVzLCAwLCA0KTsKKyAgICAgICAgICAgICAgICBhc3NlcnRFcXVhbHMoaXBCeXRlcy5sZW5ndGgsIHZhbHVlLmdldFZhbHVlKCkuZ2V0Qnl0ZXMoKS5sZW5ndGgpOworICAgICAgICAgICAgICAgIGZvciAoaW50IGogPSAwOyBqIDwgaXBCeXRlcy5sZW5ndGg7IGorKykgeworICAgICAgICAgICAgICAgICAgICBpcEJ5dGVzW2pdICY9IGlwc1dpdGhNYXNrVmFsdWVzW2ldWzFdW2pdOwogICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICAvLyBUeXBlcyBPSywgY2hlY2sgdmFsdWVzCi0gICAgICAgICAgICAgICAgYXNzZXJ0QXJyYXlFcXVhbHMoaXBzV2l0aE1hc2tWYWx1ZXNbaV1bMF0sIGlwLmdldFZhbHVlKCkuZ2V0Qnl0ZXMoKSk7Ci0gICAgICAgICAgICAgICAgYXNzZXJ0QXJyYXlFcXVhbHMoaXBzV2l0aE1hc2tWYWx1ZXNbaV1bMV0sIGlwLmdldE1hc2soKS5nZXRCeXRlcygpKTsKLSAgICAgICAgICAgIH0gZWxzZSBpZiAodmFsdWUgaW5zdGFuY2VvZiBJUHY0KSB7Ci0gICAgICAgICAgICAgICAgZmFpbCgiRXhwZWN0ZWQgbWFza2VkIElQdjQsIGdvdCB1bm1hc2tlZCBJUHY0LiIpOwotICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAgICBmYWlsKCJFeHBlY3RlZCB1bm1hc2tlZCBJUHY0LCBnb3QgbWFza2VkIElQdjQuIik7CisgICAgICAgICAgICAgICAgCisgICAgICAgICAgICAgICAgYXNzZXJ0QXJyYXlFcXVhbHMoaXBCeXRlcywgdmFsdWUuZ2V0VmFsdWUoKS5nZXRCeXRlcygpKTsKKyAgICAgICAgICAgICAgICBhc3NlcnRBcnJheUVxdWFscyhpcHNXaXRoTWFza1ZhbHVlc1tpXVsxXSwgdmFsdWUuZ2V0TWFzaygpLmdldEJ5dGVzKCkpOwogICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgfQpkaWZmIC0tZ2l0IGEvamF2YV9nZW4vcHJlLXdyaXR0ZW4vc3JjL3Rlc3QvamF2YS9vcmcvb3BlbmZsb3cvdHlwZXMvSVB2NlRlc3QuamF2YSBiL2phdmFfZ2VuL3ByZS13cml0dGVuL3NyYy90ZXN0L2phdmEvb3JnL29wZW5mbG93L3R5cGVzL0lQdjZUZXN0LmphdmEKaW5kZXggZjJmNmZlOC4uNzFhYjI4ZSAxMDA2NDQKLS0tIGEvamF2YV9nZW4vcHJlLXdyaXR0ZW4vc3JjL3Rlc3QvamF2YS9vcmcvb3BlbmZsb3cvdHlwZXMvSVB2NlRlc3QuamF2YQorKysgYi9qYXZhX2dlbi9wcmUtd3JpdHRlbi9zcmMvdGVzdC9qYXZhL29yZy9vcGVuZmxvdy90eXBlcy9JUHY2VGVzdC5qYXZhCkBAIC01OCwzMSArNTgsMjUgQEAKICAgICBAVGVzdAogICAgIHB1YmxpYyB2b2lkIHRlc3RNYXNrZWQoKSB0aHJvd3MgVW5rbm93bkhvc3RFeGNlcHRpb24gewogICAgICAgICBmb3IoaW50IGk9MDsgaSA8IGlwc1dpdGhNYXNrLmxlbmd0aDsgaSsrICkgewotICAgICAgICAgICAgT0ZWYWx1ZVR5cGUgdmFsdWUgPSBJUHY2V2l0aE1hc2sub2ZQb3NzaWJseU1hc2tlZChpcHNXaXRoTWFza1tpXSk7Ci0gICAgICAgICAgICBpZiAodmFsdWUgaW5zdGFuY2VvZiBJUHY2ICYmICFoYXNNYXNrW2ldKSB7Ci0gICAgICAgICAgICAgICAgLy8gVHlwZXMgT0ssIGNoZWNrIHZhbHVlcwotICAgICAgICAgICAgICAgIElQdjYgaXAgPSAoSVB2Nil2YWx1ZTsKKyAgICAgICAgICAgIElQdjZXaXRoTWFzayB2YWx1ZSA9IElQdjZXaXRoTWFzay5vZihpcHNXaXRoTWFza1tpXSk7CisgICAgICAgICAgICBpZiAoIWhhc01hc2tbaV0pIHsKKyAgICAgICAgICAgICAgICBJUHY2IGlwID0gdmFsdWUuZ2V0VmFsdWUoKTsKICAgICAgICAgICAgICAgICBJbmV0QWRkcmVzcyBpbmV0QWRkcmVzcyA9IEluZXRBZGRyZXNzLmdldEJ5TmFtZShpcHNXaXRoTWFza1tpXSk7CiAKICAgICAgICAgICAgICAgICBhc3NlcnRBcnJheUVxdWFscyhpcC5nZXRCeXRlcygpLCBpbmV0QWRkcmVzcy5nZXRBZGRyZXNzKCkpOwogICAgICAgICAgICAgICAgIGFzc2VydEVxdWFscyhpcHNXaXRoTWFza1tpXSwgaXAudG9TdHJpbmcoKSk7CiAgICAgICAgICAgICB9IGVsc2UgaWYgKHZhbHVlIGluc3RhbmNlb2YgSVB2NldpdGhNYXNrICYmIGhhc01hc2tbaV0pIHsKLSAgICAgICAgICAgICAgICBJUHY2V2l0aE1hc2sgaXAgPSBudWxsOwotICAgICAgICAgICAgICAgIHRyeSB7Ci0gICAgICAgICAgICAgICAgICAgIGlwID0gKElQdjZXaXRoTWFzayl2YWx1ZTsKLSAgICAgICAgICAgICAgICB9IGNhdGNoIChDbGFzc0Nhc3RFeGNlcHRpb24gZSkgewotICAgICAgICAgICAgICAgICAgICBmYWlsKCJJbnZhbGlkIE1hc2tlZDxUPiB0eXBlLiIpOwotICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICAvLyBUeXBlcyBPSywgY2hlY2sgdmFsdWVzCiAgICAgICAgICAgICAgICAgSW5ldEFkZHJlc3MgaW5ldEFkZHJlc3MgPSBJbmV0QWRkcmVzcy5nZXRCeU5hbWUoaXBzV2l0aE1hc2tbaV0uc3Vic3RyaW5nKDAsIGlwc1dpdGhNYXNrW2ldLmluZGV4T2YoJy8nKSkpOwogCi0gICAgICAgICAgICAgICAgYXNzZXJ0QXJyYXlFcXVhbHMoaXAudmFsdWUuZ2V0Qnl0ZXMoKSwgaW5ldEFkZHJlc3MuZ2V0QWRkcmVzcygpKTsKLSAgICAgICAgICAgICAgICBhc3NlcnRFcXVhbHMoaXBzV2l0aE1hc2tbaV0uc3Vic3RyaW5nKDAsIGlwc1dpdGhNYXNrW2ldLmluZGV4T2YoJy8nKSksIGlwLnZhbHVlLnRvU3RyaW5nKCkpOwotICAgICAgICAgICAgICAgIGFzc2VydEFycmF5RXF1YWxzKG1hc2tzW2ldLCBpcC5tYXNrLmdldEJ5dGVzKCkpOwotICAgICAgICAgICAgfSBlbHNlIGlmICh2YWx1ZSBpbnN0YW5jZW9mIElQdjYpIHsKLSAgICAgICAgICAgICAgICBmYWlsKCJFeHBlY3RlZCBtYXNrZWQgSVB2NiwgZ290IHVubWFza2VkIElQdjYuIik7Ci0gICAgICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgICAgIGZhaWwoIkV4cGVjdGVkIHVubWFza2VkIElQdjYsIGdvdCBtYXNrZWQgSVB2Ni4iKTsKKyAgICAgICAgICAgICAgICBieXRlW10gYWRkcmVzcyA9IGluZXRBZGRyZXNzLmdldEFkZHJlc3MoKTsKKyAgICAgICAgICAgICAgICBhc3NlcnRFcXVhbHMoYWRkcmVzcy5sZW5ndGgsIHZhbHVlLmdldFZhbHVlKCkuZ2V0Qnl0ZXMoKS5sZW5ndGgpOworICAgICAgICAgICAgICAgIAorICAgICAgICAgICAgICAgIGZvciAoaW50IGogPSAwOyBqIDwgYWRkcmVzcy5sZW5ndGg7IGorKykgeworICAgICAgICAgICAgICAgICAgICBhZGRyZXNzW2pdICY9IG1hc2tzW2ldW2pdOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICAKKyAgICAgICAgICAgICAgICBhc3NlcnRBcnJheUVxdWFscyh2YWx1ZS5nZXRWYWx1ZSgpLmdldEJ5dGVzKCksIGFkZHJlc3MpOworICAgICAgICAgICAgICAgIGFzc2VydEFycmF5RXF1YWxzKG1hc2tzW2ldLCB2YWx1ZS5nZXRNYXNrKCkuZ2V0Qnl0ZXMoKSk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9Cg==