ZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2UueHRlbmQuYmFja2VuZC5jb21waWxlci9zcmMvb3JnL2VjbGlwc2UveHRlbmQvYmFja2VuZC9jb21waWxlci90ZW1wbGF0ZXMvamF2YTUvSmF2YTVFeHByZXNzaW9uQ29tcGlsZXIueHB0IGIvcGx1Z2lucy9vcmcuZWNsaXBzZS54dGVuZC5iYWNrZW5kLmNvbXBpbGVyL3NyYy9vcmcvZWNsaXBzZS94dGVuZC9iYWNrZW5kL2NvbXBpbGVyL3RlbXBsYXRlcy9qYXZhNS9KYXZhNUV4cHJlc3Npb25Db21waWxlci54cHQKaW5kZXggMGRmOWNhYi4uMDI0YzEyOCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS54dGVuZC5iYWNrZW5kLmNvbXBpbGVyL3NyYy9vcmcvZWNsaXBzZS94dGVuZC9iYWNrZW5kL2NvbXBpbGVyL3RlbXBsYXRlcy9qYXZhNS9KYXZhNUV4cHJlc3Npb25Db21waWxlci54cHQKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS54dGVuZC5iYWNrZW5kLmNvbXBpbGVyL3NyYy9vcmcvZWNsaXBzZS94dGVuZC9iYWNrZW5kL2NvbXBpbGVyL3RlbXBsYXRlcy9qYXZhNS9KYXZhNUV4cHJlc3Npb25Db21waWxlci54cHQKQEAgLTM1Niw2ICszNTYsMTEgQEAKIAogq0RFRklORSBjb21waWxlRXhwcmVzc2lvbihTdHJpbmcgcmVzdWx0VmFyTmFtZSwgU3RyaW5nIHJlc3VsdFR5cGUsIGJvb2xlYW4gZGVjbGFyZVJlc3VsdFZhciwgUGFyc2VkUmVzb3VyY2UgcmVzb3VyY2UpIEZPUiBTd2l0Y2hFeHByZXNzaW9uuwogCatMRVQgZ2V0TmV4dFZhcklkeCgpIEFTIHZhcklkeLsKKwkJq0lGIHN3aXRjaEV4cHIgIT0gbnVsbC27CisgICAgICAgIAmrRVhQQU5EIGNvbXBpbGVFeHByZXNzaW9uIChnZXRWYXJOYW1lIChzd2l0Y2hFeHByLCAic3dpdGNoVmFsIiwgIl8iICt2YXJJZHgpLCAiT2JqZWN0IiwgdHJ1ZSwgcmVzb3VyY2UpIEZPUiBzd2l0Y2hFeHByuworICAgICAgICCrRUxTRS27CisgICAgICAgIAlPYmplY3Qgq2dldFZhck5hbWUgKHN3aXRjaEV4cHIsICJzd2l0Y2hWYWwiLCAiXyIgK3ZhcklkeCm7ID0gQm9vbGVhbi5UUlVFOworICAgICAgICCrRU5ESUYtuwogCQlMaXN0PFBhaXI8RnVuY3Rpb24sIEZ1bmN0aW9uPj4gq2dldFZhck5hbWUocmVzdWx0VmFyTmFtZSArICJDYXNlcyIsICJjYXNlcyIsICJfIit2YXJJZHgpuyA9IG5ldyBBcnJheUxpc3Q8UGFpcjxGdW5jdGlvbiwgRnVuY3Rpb24+PiAoKTsKIAkJq0ZPUkVBQ0ggY2FzZXMgQVMgYyBJVEVSQVRPUiBpdC27CiAJCUZ1bmN0aW9uIKtyZXN1bHRWYXJOYW1lu19Db25kX6tpdC5jb3VudGVyMbsgPSBuZXcgQWJzdHJhY3RDbG9zdXJlKF9jdHguZ2V0TG9jYWxWYXJDb250ZXh0KCksIF9jdHguZ2V0RnVuY3Rpb25EZWZDb250ZXh0KCksIG5ldyBBcnJheUxpc3Q8U3RyaW5nPiAoKSwgbmV3IEFycmF5TGlzdDxCYWNrZW5kVHlwZT4oKSkgewpAQCAtMzgxLDcgKzM4Niw3IEBACiAJCWZvciAoUGFpcjxGdW5jdGlvbiwgRnVuY3Rpb24+IGN1ckNhc2UgOiCrZ2V0VmFyTmFtZShyZXN1bHRWYXJOYW1lICsgIkNhc2VzIiwgImNhc2VzIiwgIl8iK3ZhcklkeCm7KSB7CiAgICAgICAgICAgICBmaW5hbCBPYmplY3QgY3VyVmFsID0gY3VyQ2FzZS5nZXRGaXJzdCgpLmludm9rZShfY3R4LCBuZXcgT2JqZWN0WzBdKTsKICAgICAgICAgICAgIAotICAgICAgICAgICAgaWYgKEhlbHBlcnMubnVsbFNhZmVFcXVhbHMgKF9jdHgsIKtzd2l0Y2hFeHByLmdldFZhck5hbWUgKCJzd2l0Y2hFeHByIiwgIl8iICt2YXJJZHgpuywgY3VyVmFsKSkgeworICAgICAgICAgICAgaWYgKEhlbHBlcnMubnVsbFNhZmVFcXVhbHMgKF9jdHgsIKtnZXRWYXJOYW1lIChzd2l0Y2hFeHByLCAic3dpdGNoVmFsIiwgIl8iICt2YXJJZHgpuywgY3VyVmFsKSkgewogICAgICAgICAgICAgCatyZXN1bHRWYXJOYW1luyA9IKtyZXN1bHRUeXBlLmdldFJlc3VsdFR5cGUoKS5jYXN0KCm7Y3VyQ2FzZS5nZXRTZWNvbmQoKS5pbnZva2UoX2N0eCwgbmV3IE9iamVjdFswXSk7CiAgICAgICAgICAgICAJYnJlYWs7CiAgICAgICAgICAgICB9Cg==