Return-Path: Delivered-To: apmail-jakarta-commons-dev-archive@apache.org Received: (qmail 10882 invoked from network); 7 Aug 2002 17:15:55 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 7 Aug 2002 17:15:55 -0000 Received: (qmail 12690 invoked by uid 97); 7 Aug 2002 17:16:15 -0000 Delivered-To: qmlist-jakarta-archive-commons-dev@jakarta.apache.org Received: (qmail 12658 invoked by uid 97); 7 Aug 2002 17:16:14 -0000 Mailing-List: contact commons-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Jakarta Commons Developers List" Reply-To: "Jakarta Commons Developers List" Delivered-To: mailing list commons-dev@jakarta.apache.org Received: (qmail 12646 invoked by uid 98); 7 Aug 2002 17:16:13 -0000 X-Antivirus: nagoya (v4198 created Apr 24 2002) X-Authentication-Warning: costinm.sfo.covalent.net: costin owned process doing -bs Date: Wed, 7 Aug 2002 10:12:28 -0700 (PDT) From: costinm@covalent.net X-X-Sender: costin@costinm.sfo.covalent.net To: Jakarta Commons Developers List Subject: [Modeler] Caching method names and keep attributes separated Message-ID: MIME-Version: 1.0 Content-Type: MULTIPART/MIXED; BOUNDARY="697600-802087594-1028740348=:1468" X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N --697600-802087594-1028740348=:1468 Content-Type: TEXT/PLAIN; charset=US-ASCII If you use the jmxtools and the html browser, each attribute accessor ( get/set ) is also exposed as an operation. This is done as a workaround for the implementation of getAttribute/setAttribute which calls invoke() and expect an operation to be available. I fixed that, and also added a cache for the Method object ( which typically is expensive to get ). The only problem is that it uses getDeclaringClass() to know if it has to use the 'resource' or the mbean wrapper as a target. I think modeler needs some major changes to clean up and make it more flexible. ( the code is mostly cut&paste from the DynamicMBean which I'm trying to merge ). Costin --697600-802087594-1028740348=:1468 Content-Type: TEXT/PLAIN; charset=US-ASCII; name="modeler.diff" Content-Transfer-Encoding: BASE64 Content-ID: Content-Description: Content-Disposition: attachment; filename="modeler.diff" PyBzcmMvamF2YS9vcmcvYXBhY2hlL2NvbW1vbnMvbW9kZWxlci9Nb2RlbGVy LmphdmENCj8gc3JjL2phdmEvb3JnL2FwYWNoZS9jb21tb25zL21vZGVsZXIv aW1wbA0KSW5kZXg6IFBST1BPU0FMLmh0bWwNCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0NClJDUyBmaWxlOiAvaG9tZS9jdnMvamFrYXJ0YS1jb21tb25zL21v ZGVsZXIvUFJPUE9TQUwuaHRtbCx2DQpyZXRyaWV2aW5nIHJldmlzaW9uIDEu MS4xLjENCmRpZmYgLXUgLXIxLjEuMS4xIFBST1BPU0FMLmh0bWwNCi0tLSBQ Uk9QT1NBTC5odG1sCTMwIEFwciAyMDAyIDIwOjU4OjUwIC0wMDAwCTEuMS4x LjENCisrKyBQUk9QT1NBTC5odG1sCTcgQXVnIDIwMDIgMTc6MTQ6MTEgLTAw MDANCkBAIC0xMjcsNiArMTI3LDcgQEANCiA8dWw+DQogICA8bGk+Q3JhaWcg Ui4gTWNDbGFuYWhhbjwvbGk+DQogICA8bGk+UmVteSBNYXVjaGVyYXQ8L2xp Pg0KKyAgPGxpPkNvc3RpbiBNYW5vbGFjaGU8L2xpPg0KIDwvdWw+DQogDQog PC9ib2R5Pg0KSW5kZXg6IHNyYy9qYXZhL29yZy9hcGFjaGUvY29tbW9ucy9t b2RlbGVyL0Jhc2VNb2RlbE1CZWFuLmphdmENCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0NClJDUyBmaWxlOiAvaG9tZS9jdnMvamFrYXJ0YS1jb21tb25zL21v ZGVsZXIvc3JjL2phdmEvb3JnL2FwYWNoZS9jb21tb25zL21vZGVsZXIvQmFz ZU1vZGVsTUJlYW4uamF2YSx2DQpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMg0K ZGlmZiAtdSAtcjEuMiBCYXNlTW9kZWxNQmVhbi5qYXZhDQotLS0gc3JjL2ph dmEvb3JnL2FwYWNoZS9jb21tb25zL21vZGVsZXIvQmFzZU1vZGVsTUJlYW4u amF2YQkxNSBKdW4gMjAwMiAxODoxNzowMiAtMDAwMAkxLjINCisrKyBzcmMv amF2YS9vcmcvYXBhY2hlL2NvbW1vbnMvbW9kZWxlci9CYXNlTW9kZWxNQmVh bi5qYXZhCTcgQXVnIDIwMDIgMTc6MTQ6MTMgLTAwMDANCkBAIC02OSw2ICs2 OSw3IEBADQogaW1wb3J0IGphdmEubGFuZy5yZWZsZWN0Lkludm9jYXRpb25U YXJnZXRFeGNlcHRpb247DQogaW1wb3J0IGphdmEubGFuZy5yZWZsZWN0Lk1l dGhvZDsNCiBpbXBvcnQgamF2YS51dGlsLkl0ZXJhdG9yOw0KK2ltcG9ydCBq YXZhLnV0aWwuSGFzaHRhYmxlOw0KIGltcG9ydCBqYXZheC5tYW5hZ2VtZW50 LkF0dHJpYnV0ZTsNCiBpbXBvcnQgamF2YXgubWFuYWdlbWVudC5BdHRyaWJ1 dGVDaGFuZ2VOb3RpZmljYXRpb247DQogaW1wb3J0IGphdmF4Lm1hbmFnZW1l bnQuQXR0cmlidXRlTGlzdDsNCkBAIC0xOTYsNiArMTk3LDE2IEBADQogDQog DQogICAgIC8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLSBEeW5hbWljTUJlYW4gTWV0aG9kcw0KKyAgICBz dGF0aWMgZmluYWwgT2JqZWN0W10gTk9fQVJHU19QQVJBTT1uZXcgT2JqZWN0 WzBdOw0KKyAgICBzdGF0aWMgZmluYWwgQ2xhc3NbXSBOT19BUkdTX1BBUkFN X1NJRz1uZXcgQ2xhc3NbMF07DQorICAgIC8vIGtleTogYXR0cmlidXRlIHZh bDogZ2V0dGVyIG1ldGhvZA0KKyAgICBIYXNodGFibGUgZ2V0QXR0TWFwPW5l dyBIYXNodGFibGUoKTsNCisNCisgICAgLy8ga2V5OiBhdHRyaWJ1dGUgdmFs OiBzZXR0ZXIgbWV0aG9kDQorICAgIEhhc2h0YWJsZSBzZXRBdHRNYXA9bmV3 IEhhc2h0YWJsZSgpOw0KKw0KKyAgICAvLyBrZXk6IG9wZXJhdGlvbiB2YWw6 IGludm9rZSBtZXRob2QNCisgICAgSGFzaHRhYmxlIGludm9rZUF0dE1hcD1u ZXcgSGFzaHRhYmxlKCk7DQogDQogDQogICAgIC8qKg0KQEAgLTIxMywzMiAr MjI0LDc5IEBADQogICAgIHB1YmxpYyBPYmplY3QgZ2V0QXR0cmlidXRlKFN0 cmluZyBuYW1lKQ0KICAgICAgICAgdGhyb3dzIEF0dHJpYnV0ZU5vdEZvdW5k RXhjZXB0aW9uLCBNQmVhbkV4Y2VwdGlvbiwNCiAgICAgICAgIFJlZmxlY3Rp b25FeGNlcHRpb24gew0KLQ0KICAgICAgICAgLy8gVmFsaWRhdGUgdGhlIGlu cHV0IHBhcmFtZXRlcnMNCiAgICAgICAgIGlmIChuYW1lID09IG51bGwpDQog ICAgICAgICAgICAgdGhyb3cgbmV3IFJ1bnRpbWVPcGVyYXRpb25zRXhjZXB0 aW9uDQogICAgICAgICAgICAgICAgIChuZXcgSWxsZWdhbEFyZ3VtZW50RXhj ZXB0aW9uKCJBdHRyaWJ1dGUgbmFtZSBpcyBudWxsIiksDQogICAgICAgICAg ICAgICAgICAiQXR0cmlidXRlIG5hbWUgaXMgbnVsbCIpOw0KIA0KLSAgICAg ICAgLy8gTG9vayB1cCB0aGUgYWN0dWFsIG9wZXJhdGlvbiB0byBiZSB1c2Vk DQotICAgICAgICBNb2RlbE1CZWFuQXR0cmlidXRlSW5mbyBhdHRySW5mbyA9 IGluZm8uZ2V0QXR0cmlidXRlKG5hbWUpOw0KLSAgICAgICAgaWYgKGF0dHJJ bmZvID09IG51bGwpDQotICAgICAgICAgICAgdGhyb3cgbmV3IEF0dHJpYnV0 ZU5vdEZvdW5kRXhjZXB0aW9uDQotICAgICAgICAgICAgICAgICgiQ2Fubm90 IGZpbmQgYXR0cmlidXRlICIgKyBuYW1lKTsNCi0gICAgICAgIERlc2NyaXB0 b3IgYXR0ckRlc2MgPSBhdHRySW5mby5nZXREZXNjcmlwdG9yKCk7DQotICAg ICAgICBpZiAoYXR0ckRlc2MgPT0gbnVsbCkNCi0gICAgICAgICAgICB0aHJv dyBuZXcgQXR0cmlidXRlTm90Rm91bmRFeGNlcHRpb24NCi0gICAgICAgICAg ICAgICAgKCJDYW5ub3QgZmluZCBhdHRyaWJ1dGUgIiArIG5hbWUgKyAiIGRl c2NyaXB0b3IiKTsNCi0gICAgICAgIFN0cmluZyBnZXRNZXRob2QgPSAoU3Ry aW5nKSBhdHRyRGVzYy5nZXRGaWVsZFZhbHVlKCJnZXRNZXRob2QiKTsNCi0g ICAgICAgIGlmIChnZXRNZXRob2QgPT0gbnVsbCkNCi0gICAgICAgICAgICB0 aHJvdyBuZXcgQXR0cmlidXRlTm90Rm91bmRFeGNlcHRpb24NCi0gICAgICAg ICAgICAgICAgKCJDYW5ub3QgZmluZCBhdHRyaWJ1dGUgIiArIG5hbWUgKyAi IGdldCBtZXRob2QgbmFtZSIpOw0KLQ0KLSAgICAgICAgLy8gSW52b2tlIHRo ZSBzcGVjaWZpZWQgZ2V0IG1ldGhvZCBhbmQgcmV0dXJuIHRoZSByZXN1bHRz DQotICAgICAgICByZXR1cm4gKGludm9rZShnZXRNZXRob2QsDQotICAgICAg ICAgICAgICAgICAgICAgICBuZXcgT2JqZWN0W10geyB9LA0KLSAgICAgICAg ICAgICAgICAgICAgICAgbmV3IFN0cmluZ1tdIHsgfSkpOw0KKyAgICAgICAg Ly8gRXh0cmFjdCB0aGUgbWV0aG9kIGZyb20gY2FjaGUgDQorICAgICAgICBN ZXRob2QgbT0oTWV0aG9kKWdldEF0dE1hcC5nZXQoIG5hbWUgKTsNCiANCisg ICAgICAgIGlmKCBtPT1udWxsICkgew0KKyAgICAgICAgICAgIC8vIExvb2sg dXAgdGhlIGFjdHVhbCBvcGVyYXRpb24gdG8gYmUgdXNlZA0KKyAgICAgICAg ICAgIE1vZGVsTUJlYW5BdHRyaWJ1dGVJbmZvIGF0dHJJbmZvID0gaW5mby5n ZXRBdHRyaWJ1dGUobmFtZSk7DQorICAgICAgICAgICAgaWYgKGF0dHJJbmZv ID09IG51bGwpDQorICAgICAgICAgICAgICAgIHRocm93IG5ldyBBdHRyaWJ1 dGVOb3RGb3VuZEV4Y2VwdGlvbigiIENhbm5vdCBmaW5kIGF0dHJpYnV0ZSAi ICsgbmFtZSk7DQorICAgICAgICAgICAgRGVzY3JpcHRvciBhdHRyRGVzYyA9 IGF0dHJJbmZvLmdldERlc2NyaXB0b3IoKTsNCisgICAgICAgICAgICBpZiAo YXR0ckRlc2MgPT0gbnVsbCkNCisgICAgICAgICAgICAgICAgdGhyb3cgbmV3 IEF0dHJpYnV0ZU5vdEZvdW5kRXhjZXB0aW9uKCJDYW5ub3QgZmluZCBhdHRy aWJ1dGUgIiArIG5hbWUgKyAiIGRlc2NyaXB0b3IiKTsNCisgICAgICAgICAg ICBTdHJpbmcgZ2V0TWV0aG9kID0gKFN0cmluZykgYXR0ckRlc2MuZ2V0Rmll bGRWYWx1ZSgiZ2V0TWV0aG9kIik7DQorICAgICAgICAgICAgDQorICAgICAg ICAgICAgaWYgKGdldE1ldGhvZCA9PSBudWxsKQ0KKyAgICAgICAgICAgICAg ICB0aHJvdyBuZXcgQXR0cmlidXRlTm90Rm91bmRFeGNlcHRpb24oIkNhbm5v dCBmaW5kIGF0dHJpYnV0ZSAiICsgbmFtZSArICIgZ2V0IG1ldGhvZCBuYW1l Iik7DQorDQorICAgICAgICAgICAgT2JqZWN0IG9iamVjdCA9IG51bGw7DQor ICAgICAgICAgICAgTm9TdWNoTWV0aG9kRXhjZXB0aW9uIGV4Y2VwdGlvbiA9 IG51bGw7DQorICAgICAgICAgICAgdHJ5IHsNCisgICAgICAgICAgICAgICAg b2JqZWN0ID0gdGhpczsNCisgICAgICAgICAgICAgICAgbSA9IG9iamVjdC5n ZXRDbGFzcygpLmdldE1ldGhvZChnZXRNZXRob2QsIE5PX0FSR1NfUEFSQU1f U0lHKTsNCisgICAgICAgICAgICB9IGNhdGNoIChOb1N1Y2hNZXRob2RFeGNl cHRpb24gZSkgew0KKyAgICAgICAgICAgICAgICBleGNlcHRpb24gPSBlOzsN CisgICAgICAgICAgICB9DQorICAgICAgICAgICAgaWYoIG09PSBudWxsICYm IHJlc291cmNlICE9IG51bGwgKSB7DQorICAgICAgICAgICAgICAgIHRyeSB7 DQorICAgICAgICAgICAgICAgICAgICBvYmplY3QgPSByZXNvdXJjZTsNCisg ICAgICAgICAgICAgICAgICAgIG0gPSBvYmplY3QuZ2V0Q2xhc3MoKS5nZXRN ZXRob2QoZ2V0TWV0aG9kLCBOT19BUkdTX1BBUkFNX1NJRyk7DQorICAgICAg ICAgICAgICAgICAgICBleGNlcHRpb249bnVsbDsNCisgICAgICAgICAgICAg ICAgfSBjYXRjaCAoTm9TdWNoTWV0aG9kRXhjZXB0aW9uIGUpIHsNCisgICAg ICAgICAgICAgICAgICAgIGV4Y2VwdGlvbiA9IGU7DQorICAgICAgICAgICAg ICAgIH0NCisgICAgICAgICAgICB9DQorICAgICAgICAgICAgaWYoIGV4Y2Vw dGlvbiAhPSBudWxsICkNCisgICAgICAgICAgICAgICAgdGhyb3cgbmV3IFJl ZmxlY3Rpb25FeGNlcHRpb24oZXhjZXB0aW9uLCANCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIkNhbm5vdCBmaW5k IGdldHRlciBtZXRob2QgIiArIGdldE1ldGhvZCk7DQorICAgICAgICAgICAg Z2V0QXR0TWFwLnB1dCggbmFtZSwgbSApOw0KKyAgICAgICAgfQ0KKyAgICAg ICAgDQorICAgICAgICBPYmplY3QgcmVzdWx0ID0gbnVsbDsNCisgICAgICAg IHRyeSB7DQorICAgICAgICAgICAgaWYoIG0uZ2V0RGVjbGFyaW5nQ2xhc3Mo KSA9PSB0aGlzLmdldENsYXNzKCkgKSB7DQorICAgICAgICAgICAgICAgIHJl c3VsdCA9IG0uaW52b2tlKHRoaXMsIE5PX0FSR1NfUEFSQU0gKTsNCisgICAg ICAgICAgICB9IGVsc2Ugew0KKyAgICAgICAgICAgICAgICByZXN1bHQgPSBt Lmludm9rZShyZXNvdXJjZSwgTk9fQVJHU19QQVJBTSApOw0KKyAgICAgICAg ICAgIH0NCisgICAgICAgIH0gY2F0Y2ggKEludm9jYXRpb25UYXJnZXRFeGNl cHRpb24gZSkgew0KKyAgICAgICAgICAgIFRocm93YWJsZSB0ID0gZS5nZXRU YXJnZXRFeGNlcHRpb24oKTsNCisgICAgICAgICAgICBpZiAodCA9PSBudWxs KQ0KKyAgICAgICAgICAgICAgICB0ID0gZTsNCisgICAgICAgICAgICBpZiAo dCBpbnN0YW5jZW9mIFJ1bnRpbWVFeGNlcHRpb24pDQorICAgICAgICAgICAg ICAgIHRocm93IG5ldyBSdW50aW1lT3BlcmF0aW9uc0V4Y2VwdGlvbg0KKyAg ICAgICAgICAgICAgICAgICAgKChSdW50aW1lRXhjZXB0aW9uKSB0LCAiRXhj ZXB0aW9uIGludm9raW5nIG1ldGhvZCAiICsgbmFtZSk7DQorICAgICAgICAg ICAgZWxzZSBpZiAodCBpbnN0YW5jZW9mIEVycm9yKQ0KKyAgICAgICAgICAg ICAgICB0aHJvdyBuZXcgUnVudGltZUVycm9yRXhjZXB0aW9uDQorICAgICAg ICAgICAgICAgICAgICAoKEVycm9yKSB0LCAiRXJyb3IgaW52b2tpbmcgbWV0 aG9kICIgKyBuYW1lKTsNCisgICAgICAgICAgICBlbHNlDQorICAgICAgICAg ICAgICAgIHRocm93IG5ldyBNQmVhbkV4Y2VwdGlvbg0KKyAgICAgICAgICAg ICAgICAgICAgKGUsICJFeGNlcHRpb24gaW52b2tpbmcgbWV0aG9kICIgKyBu YW1lKTsNCisgICAgICAgIH0gY2F0Y2ggKEV4Y2VwdGlvbiBlKSB7DQorICAg ICAgICAgICAgdGhyb3cgbmV3IE1CZWFuRXhjZXB0aW9uDQorICAgICAgICAg ICAgICAgIChlLCAiRXhjZXB0aW9uIGludm9raW5nIG1ldGhvZCAiICsgbmFt ZSk7DQorICAgICAgICB9DQorDQorICAgICAgICAvLyBSZXR1cm4gdGhlIHJl c3VsdHMgb2YgdGhpcyBtZXRob2QgaW52b2NhdGlvbg0KKyAgICAgICAgLy8g RklYTUUgLSBzaG91bGQgd2UgdmFsaWRhdGUgdGhlIHJldHVybiB0eXBlPw0K KyAgICAgICAgcmV0dXJuIChyZXN1bHQpOw0KICAgICB9DQogDQogDQpAQCAt Mjc0LDkgKzMzMiw4IEBADQogICAgICAqIFJldHVybiB0aGUgPGNvZGU+TUJl YW5JbmZvPC9jb2RlPiBvYmplY3QgZm9yIHRoaXMgTUJlYW4uDQogICAgICAq Lw0KICAgICBwdWJsaWMgTUJlYW5JbmZvIGdldE1CZWFuSW5mbygpIHsNCi0N CisgICAgICAgIC8vIFhYWCBXaHkgZG8gd2UgaGF2ZSB0byBjbG9uZSA/DQog ICAgICAgICByZXR1cm4gKChNQmVhbkluZm8pIGluZm8uY2xvbmUoKSk7DQot DQogICAgIH0NCiANCiANCkBAIC0zMDcsODQgKzM2NCw3MCBAQA0KICAgICAg ICAgICAgIHRocm93IG5ldyBSdW50aW1lT3BlcmF0aW9uc0V4Y2VwdGlvbg0K ICAgICAgICAgICAgICAgICAobmV3IElsbGVnYWxBcmd1bWVudEV4Y2VwdGlv bigiTWV0aG9kIG5hbWUgaXMgbnVsbCIpLA0KICAgICAgICAgICAgICAgICAg Ik1ldGhvZCBuYW1lIGlzIG51bGwiKTsNCi0gICAgICAgIGlmIChwYXJhbXMg PT0gbnVsbCkNCi0gICAgICAgICAgICBwYXJhbXMgPSBuZXcgT2JqZWN0WzBd Ow0KLSAgICAgICAgaWYgKHNpZ25hdHVyZSA9PSBudWxsKQ0KLSAgICAgICAg ICAgIHNpZ25hdHVyZSA9IG5ldyBTdHJpbmdbMF07DQotICAgICAgICBpZiAo cGFyYW1zLmxlbmd0aCAhPSBzaWduYXR1cmUubGVuZ3RoKQ0KLSAgICAgICAg ICAgIHRocm93IG5ldyBSdW50aW1lT3BlcmF0aW9uc0V4Y2VwdGlvbg0KLSAg ICAgICAgICAgICAgICAobmV3IElsbGVnYWxBcmd1bWVudEV4Y2VwdGlvbigi SW5jb25zaXN0ZW50IGFyZ3VtZW50cyBhbmQgc2lnbmF0dXJlIiksDQotICAg ICAgICAgICAgICAgICAiSW5jb25zaXN0ZW50IGFyZ3VtZW50cyBhbmQgc2ln bmF0dXJlIik7DQotDQotICAgICAgICAvLyBBY3F1aXJlIHRoZSBNb2RlbE1C ZWFuT3BlcmF0aW9uSW5mbyBpbmZvcm1hdGlvbiBmb3INCi0gICAgICAgIC8v IHRoZSByZXF1ZXN0ZWQgb3BlcmF0aW9uDQotICAgICAgICBNb2RlbE1CZWFu T3BlcmF0aW9uSW5mbyBvcEluZm8gPSBpbmZvLmdldE9wZXJhdGlvbihuYW1l KTsNCi0gICAgICAgIGlmIChvcEluZm8gPT0gbnVsbCkNCi0gICAgICAgICAg ICB0aHJvdyBuZXcgTUJlYW5FeGNlcHRpb24NCi0gICAgICAgICAgICAgICAg KG5ldyBTZXJ2aWNlTm90Rm91bmRFeGNlcHRpb24oIkNhbm5vdCBmaW5kIG9w ZXJhdGlvbiAiICsgbmFtZSksDQotICAgICAgICAgICAgICAgICAiQ2Fubm90 IGZpbmQgb3BlcmF0aW9uICIgKyBuYW1lKTsNCiANCi0gICAgICAgIC8vIFBy ZXBhcmUgdGhlIHNpZ25hdHVyZSByZXF1aXJlZCBieSBKYXZhIHJlZmxlY3Rp b24gQVBJcw0KLSAgICAgICAgLy8gRklYTUUgLSBzaG91bGQgd2UgdXNlIHRo ZSBzaWduYXR1cmUgZnJvbSBvcEluZm8/DQotICAgICAgICBDbGFzcyB0eXBl c1tdID0gbmV3IENsYXNzW3NpZ25hdHVyZS5sZW5ndGhdOw0KLSAgICAgICAg Zm9yIChpbnQgaSA9IDA7IGkgPCBzaWduYXR1cmUubGVuZ3RoOyBpKyspIHsN Ci0gICAgICAgICAgICBpZiAoc2lnbmF0dXJlW2ldLmVxdWFscyhCb29sZWFu LlRZUEUuZ2V0TmFtZSgpKSkNCi0gICAgICAgICAgICAgICAgdHlwZXNbaV0g PSBCb29sZWFuLlRZUEU7DQotICAgICAgICAgICAgZWxzZSBpZiAoc2lnbmF0 dXJlW2ldLmVxdWFscyhCeXRlLlRZUEUuZ2V0TmFtZSgpKSkNCi0gICAgICAg ICAgICAgICAgdHlwZXNbaV0gPSBCeXRlLlRZUEU7DQotICAgICAgICAgICAg ZWxzZSBpZiAoc2lnbmF0dXJlW2ldLmVxdWFscyhDaGFyYWN0ZXIuVFlQRS5n ZXROYW1lKCkpKQ0KLSAgICAgICAgICAgICAgICB0eXBlc1tpXSA9IENoYXJh Y3Rlci5UWVBFOw0KLSAgICAgICAgICAgIGVsc2UgaWYgKHNpZ25hdHVyZVtp XS5lcXVhbHMoRG91YmxlLlRZUEUuZ2V0TmFtZSgpKSkNCi0gICAgICAgICAg ICAgICAgdHlwZXNbaV0gPSBEb3VibGUuVFlQRTsNCi0gICAgICAgICAgICBl bHNlIGlmIChzaWduYXR1cmVbaV0uZXF1YWxzKEZsb2F0LlRZUEUuZ2V0TmFt ZSgpKSkNCi0gICAgICAgICAgICAgICAgdHlwZXNbaV0gPSBGbG9hdC5UWVBF Ow0KLSAgICAgICAgICAgIGVsc2UgaWYgKHNpZ25hdHVyZVtpXS5lcXVhbHMo SW50ZWdlci5UWVBFLmdldE5hbWUoKSkpDQotICAgICAgICAgICAgICAgIHR5 cGVzW2ldID0gSW50ZWdlci5UWVBFOw0KLSAgICAgICAgICAgIGVsc2UgaWYg KHNpZ25hdHVyZVtpXS5lcXVhbHMoTG9uZy5UWVBFLmdldE5hbWUoKSkpDQot ICAgICAgICAgICAgICAgIHR5cGVzW2ldID0gTG9uZy5UWVBFOw0KLSAgICAg ICAgICAgIGVsc2UgaWYgKHNpZ25hdHVyZVtpXS5lcXVhbHMoU2hvcnQuVFlQ RS5nZXROYW1lKCkpKQ0KLSAgICAgICAgICAgICAgICB0eXBlc1tpXSA9IFNo b3J0LlRZUEU7DQotICAgICAgICAgICAgZWxzZSB7DQotICAgICAgICAgICAg ICAgIHRyeSB7DQotICAgICAgICAgICAgICAgICAgICB0eXBlc1tpXSA9IENs YXNzLmZvck5hbWUoc2lnbmF0dXJlW2ldKTsNCi0gICAgICAgICAgICAgICAg fSBjYXRjaCAoQ2xhc3NOb3RGb3VuZEV4Y2VwdGlvbiBlKSB7DQotICAgICAg ICAgICAgICAgICAgICB0aHJvdyBuZXcgUmVmbGVjdGlvbkV4Y2VwdGlvbg0K LSAgICAgICAgICAgICAgICAgICAgICAgIChlLCAiQ2Fubm90IGZpbmQgQ2xh c3MgZm9yICIgKyBzaWduYXR1cmVbaV0pOw0KLSAgICAgICAgICAgICAgICB9 DQorICAgICAgICBNZXRob2QgbWV0aG9kPShNZXRob2QpaW52b2tlQXR0TWFw LmdldChuYW1lKTsNCisgICAgICAgIGlmKCBtZXRob2Q9PW51bGwgKSB7IA0K KyAgICAgICAgICAgIGlmIChwYXJhbXMgPT0gbnVsbCkNCisgICAgICAgICAg ICAgICAgcGFyYW1zID0gbmV3IE9iamVjdFswXTsNCisgICAgICAgICAgICBp ZiAoc2lnbmF0dXJlID09IG51bGwpDQorICAgICAgICAgICAgICAgIHNpZ25h dHVyZSA9IG5ldyBTdHJpbmdbMF07DQorICAgICAgICAgICAgaWYgKHBhcmFt cy5sZW5ndGggIT0gc2lnbmF0dXJlLmxlbmd0aCkNCisgICAgICAgICAgICAg ICAgdGhyb3cgbmV3IFJ1bnRpbWVPcGVyYXRpb25zRXhjZXB0aW9uDQorICAg ICAgICAgICAgICAgICAgICAobmV3IElsbGVnYWxBcmd1bWVudEV4Y2VwdGlv bigiSW5jb25zaXN0ZW50IGFyZ3VtZW50cyBhbmQgc2lnbmF0dXJlIiksDQor ICAgICAgICAgICAgICAgICAgICAgIkluY29uc2lzdGVudCBhcmd1bWVudHMg YW5kIHNpZ25hdHVyZSIpOw0KKw0KKyAgICAgICAgICAgIC8vIEFjcXVpcmUg dGhlIE1vZGVsTUJlYW5PcGVyYXRpb25JbmZvIGluZm9ybWF0aW9uIGZvcg0K KyAgICAgICAgICAgIC8vIHRoZSByZXF1ZXN0ZWQgb3BlcmF0aW9uDQorICAg ICAgICAgICAgTW9kZWxNQmVhbk9wZXJhdGlvbkluZm8gb3BJbmZvID0gaW5m by5nZXRPcGVyYXRpb24obmFtZSk7DQorICAgICAgICAgICAgaWYgKG9wSW5m byA9PSBudWxsKQ0KKyAgICAgICAgICAgICAgICB0aHJvdyBuZXcgTUJlYW5F eGNlcHRpb24NCisgICAgICAgICAgICAgICAgICAgIChuZXcgU2VydmljZU5v dEZvdW5kRXhjZXB0aW9uKCJDYW5ub3QgZmluZCBvcGVyYXRpb24gIiArIG5h bWUpLA0KKyAgICAgICAgICAgICAgICAgICAgICJDYW5ub3QgZmluZCBvcGVy YXRpb24gIiArIG5hbWUpOw0KKyAgICAgICAgICAgIA0KKyAgICAgICAgICAg IC8vIFByZXBhcmUgdGhlIHNpZ25hdHVyZSByZXF1aXJlZCBieSBKYXZhIHJl ZmxlY3Rpb24gQVBJcw0KKyAgICAgICAgICAgIC8vIEZJWE1FIC0gc2hvdWxk IHdlIHVzZSB0aGUgc2lnbmF0dXJlIGZyb20gb3BJbmZvPw0KKyAgICAgICAg ICAgIENsYXNzIHR5cGVzW10gPSBuZXcgQ2xhc3Nbc2lnbmF0dXJlLmxlbmd0 aF07DQorICAgICAgICAgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBzaWduYXR1 cmUubGVuZ3RoOyBpKyspIHsNCisgICAgICAgICAgICAgICAgdHlwZXNbaV09 Z2V0QXR0cmlidXRlQ2xhc3MoIHNpZ25hdHVyZVtpXSApOw0KICAgICAgICAg ICAgIH0NCi0gICAgICAgIH0NCiANCi0gICAgICAgIC8vIExvY2F0ZSB0aGUg bWV0aG9kIHRvIGJlIGludm9rZWQsIGVpdGhlciBpbiB0aGlzIE1CZWFuIGl0 c2VsZg0KLSAgICAgICAgLy8gb3IgaW4gdGhlIGNvcnJlc3BvbmRpbmcgbWFu YWdlZCByZXNvdXJjZQ0KLSAgICAgICAgLy8gRklYTUUgLSBBY2Nlc3NpYmxl IG1ldGhvZHMgaW4gc3VwZXJpbnRlcmZhY2VzPw0KLSAgICAgICAgTWV0aG9k IG1ldGhvZCA9IG51bGw7DQotICAgICAgICBPYmplY3Qgb2JqZWN0ID0gbnVs bDsNCi0gICAgICAgIEV4Y2VwdGlvbiBleGNlcHRpb24gPSBudWxsOw0KLSAg ICAgICAgdHJ5IHsNCi0gICAgICAgICAgICBvYmplY3QgPSB0aGlzOw0KLSAg ICAgICAgICAgIG1ldGhvZCA9IG9iamVjdC5nZXRDbGFzcygpLmdldE1ldGhv ZChuYW1lLCB0eXBlcyk7DQotICAgICAgICB9IGNhdGNoIChOb1N1Y2hNZXRo b2RFeGNlcHRpb24gZSkgew0KLSAgICAgICAgICAgIGV4Y2VwdGlvbiA9IGU7 Ow0KLSAgICAgICAgfQ0KLSAgICAgICAgdHJ5IHsNCi0gICAgICAgICAgICBp ZiAoKG1ldGhvZCA9PSBudWxsKSAmJiAocmVzb3VyY2UgIT0gbnVsbCkpIHsN Ci0gICAgICAgICAgICAgICAgb2JqZWN0ID0gcmVzb3VyY2U7DQorICAgICAg ICAgICAgLy8gTG9jYXRlIHRoZSBtZXRob2QgdG8gYmUgaW52b2tlZCwgZWl0 aGVyIGluIHRoaXMgTUJlYW4gaXRzZWxmDQorICAgICAgICAgICAgLy8gb3Ig aW4gdGhlIGNvcnJlc3BvbmRpbmcgbWFuYWdlZCByZXNvdXJjZQ0KKyAgICAg ICAgICAgIC8vIEZJWE1FIC0gQWNjZXNzaWJsZSBtZXRob2RzIGluIHN1cGVy aW50ZXJmYWNlcz8NCisgICAgICAgICAgICBPYmplY3Qgb2JqZWN0ID0gbnVs bDsNCisgICAgICAgICAgICBFeGNlcHRpb24gZXhjZXB0aW9uID0gbnVsbDsN CisgICAgICAgICAgICB0cnkgew0KKyAgICAgICAgICAgICAgICBvYmplY3Qg PSB0aGlzOw0KICAgICAgICAgICAgICAgICBtZXRob2QgPSBvYmplY3QuZ2V0 Q2xhc3MoKS5nZXRNZXRob2QobmFtZSwgdHlwZXMpOw0KKyAgICAgICAgICAg IH0gY2F0Y2ggKE5vU3VjaE1ldGhvZEV4Y2VwdGlvbiBlKSB7DQorICAgICAg ICAgICAgICAgIGV4Y2VwdGlvbiA9IGU7Ow0KICAgICAgICAgICAgIH0NCi0g ICAgICAgIH0gY2F0Y2ggKE5vU3VjaE1ldGhvZEV4Y2VwdGlvbiBlKSB7DQot ICAgICAgICAgICAgZXhjZXB0aW9uID0gZTsNCi0gICAgICAgIH0NCi0gICAg ICAgIGlmIChtZXRob2QgPT0gbnVsbCkgew0KLSAgICAgICAgICAgIHRocm93 IG5ldyBSZWZsZWN0aW9uRXhjZXB0aW9uKGV4Y2VwdGlvbiwNCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiQ2Fubm90IGZp bmQgbWV0aG9kICIgKyBuYW1lICsNCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAiIHdpdGggdGhpcyBzaWduYXR1cmUiKTsN CisgICAgICAgICAgICB0cnkgew0KKyAgICAgICAgICAgICAgICBpZiAoKG1l dGhvZCA9PSBudWxsKSAmJiAocmVzb3VyY2UgIT0gbnVsbCkpIHsNCisgICAg ICAgICAgICAgICAgICAgIG9iamVjdCA9IHJlc291cmNlOw0KKyAgICAgICAg ICAgICAgICAgICAgbWV0aG9kID0gb2JqZWN0LmdldENsYXNzKCkuZ2V0TWV0 aG9kKG5hbWUsIHR5cGVzKTsNCisgICAgICAgICAgICAgICAgfQ0KKyAgICAg ICAgICAgIH0gY2F0Y2ggKE5vU3VjaE1ldGhvZEV4Y2VwdGlvbiBlKSB7DQor ICAgICAgICAgICAgICAgIGV4Y2VwdGlvbiA9IGU7DQorICAgICAgICAgICAg fQ0KKyAgICAgICAgICAgIGlmIChtZXRob2QgPT0gbnVsbCkgew0KKyAgICAg ICAgICAgICAgICB0aHJvdyBuZXcgUmVmbGVjdGlvbkV4Y2VwdGlvbihleGNl cHRpb24sDQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICJDYW5ub3QgZmluZCBtZXRob2QgIiArIG5hbWUgKw0KKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAi IHdpdGggdGhpcyBzaWduYXR1cmUiKTsNCisgICAgICAgICAgICB9DQorICAg ICAgICAgICAgaW52b2tlQXR0TWFwLnB1dCggbmFtZSwgbWV0aG9kICk7DQog ICAgICAgICB9DQotDQorICAgICAgICANCiAgICAgICAgIC8vIEludm9rZSB0 aGUgc2VsZWN0ZWQgbWV0aG9kIG9uIHRoZSBhcHByb3ByaWF0ZSBvYmplY3QN CiAgICAgICAgIE9iamVjdCByZXN1bHQgPSBudWxsOw0KICAgICAgICAgdHJ5 IHsNCi0gICAgICAgICAgICByZXN1bHQgPSBtZXRob2QuaW52b2tlKG9iamVj dCwgcGFyYW1zKTsNCisgICAgICAgICAgICBpZiggbWV0aG9kLmdldERlY2xh cmluZ0NsYXNzKCkgPT0gdGhpcy5nZXRDbGFzcygpICkgew0KKyAgICAgICAg ICAgICAgICByZXN1bHQgPSBtZXRob2QuaW52b2tlKHRoaXMsIHBhcmFtcyAp Ow0KKyAgICAgICAgICAgIH0gZWxzZSB7DQorICAgICAgICAgICAgICAgIHJl c3VsdCA9IG1ldGhvZC5pbnZva2UocmVzb3VyY2UsIHBhcmFtcyk7DQorICAg ICAgICAgICAgfQ0KICAgICAgICAgfSBjYXRjaCAoSW52b2NhdGlvblRhcmdl dEV4Y2VwdGlvbiBlKSB7DQorICAgICAgICAgICAgbG9nLmVycm9yKCJFeGNl cHRpb24gaW52b2tpbmcgbWV0aG9kICIgKyBuYW1lICwgZSApOw0KICAgICAg ICAgICAgIFRocm93YWJsZSB0ID0gZS5nZXRUYXJnZXRFeGNlcHRpb24oKTsN CiAgICAgICAgICAgICBpZiAodCA9PSBudWxsKQ0KICAgICAgICAgICAgICAg ICB0ID0gZTsNCkBAIC0zOTgsNiArNDQxLDcgQEANCiAgICAgICAgICAgICAg ICAgdGhyb3cgbmV3IE1CZWFuRXhjZXB0aW9uDQogICAgICAgICAgICAgICAg ICAgICAoZSwgIkV4Y2VwdGlvbiBpbnZva2luZyBtZXRob2QgIiArIG5hbWUp Ow0KICAgICAgICAgfSBjYXRjaCAoRXhjZXB0aW9uIGUpIHsNCisgICAgICAg ICAgICBsb2cuZXJyb3IoIkV4Y2VwdGlvbiBpbnZva2luZyBtZXRob2QgIiAr IG5hbWUgLCBlICk7DQogICAgICAgICAgICAgdGhyb3cgbmV3IE1CZWFuRXhj ZXB0aW9uDQogICAgICAgICAgICAgICAgIChlLCAiRXhjZXB0aW9uIGludm9r aW5nIG1ldGhvZCAiICsgbmFtZSk7DQogICAgICAgICB9DQpAQCAtNDA4LDYg KzQ1MiwzNCBAQA0KIA0KICAgICB9DQogDQorICAgIHByaXZhdGUgQ2xhc3Mg Z2V0QXR0cmlidXRlQ2xhc3MoU3RyaW5nIHNpZ25hdHVyZSkNCisgICAgICAg IHRocm93cyBSZWZsZWN0aW9uRXhjZXB0aW9uDQorICAgIHsNCisgICAgICAg IGlmIChzaWduYXR1cmUuZXF1YWxzKEJvb2xlYW4uVFlQRS5nZXROYW1lKCkp KQ0KKyAgICAgICAgICAgIHJldHVybiBCb29sZWFuLlRZUEU7DQorICAgICAg ICBlbHNlIGlmIChzaWduYXR1cmUuZXF1YWxzKEJ5dGUuVFlQRS5nZXROYW1l KCkpKQ0KKyAgICAgICAgICAgIHJldHVybiBCeXRlLlRZUEU7DQorICAgICAg ICBlbHNlIGlmIChzaWduYXR1cmUuZXF1YWxzKENoYXJhY3Rlci5UWVBFLmdl dE5hbWUoKSkpDQorICAgICAgICAgICAgcmV0dXJuIENoYXJhY3Rlci5UWVBF Ow0KKyAgICAgICAgZWxzZSBpZiAoc2lnbmF0dXJlLmVxdWFscyhEb3VibGUu VFlQRS5nZXROYW1lKCkpKQ0KKyAgICAgICAgICAgIHJldHVybiBEb3VibGUu VFlQRTsNCisgICAgICAgIGVsc2UgaWYgKHNpZ25hdHVyZS5lcXVhbHMoRmxv YXQuVFlQRS5nZXROYW1lKCkpKQ0KKyAgICAgICAgICAgIHJldHVybiBGbG9h dC5UWVBFOw0KKyAgICAgICAgZWxzZSBpZiAoc2lnbmF0dXJlLmVxdWFscyhJ bnRlZ2VyLlRZUEUuZ2V0TmFtZSgpKSkNCisgICAgICAgICAgICByZXR1cm4g SW50ZWdlci5UWVBFOw0KKyAgICAgICAgZWxzZSBpZiAoc2lnbmF0dXJlLmVx dWFscyhMb25nLlRZUEUuZ2V0TmFtZSgpKSkNCisgICAgICAgICAgICByZXR1 cm4gTG9uZy5UWVBFOw0KKyAgICAgICAgZWxzZSBpZiAoc2lnbmF0dXJlLmVx dWFscyhTaG9ydC5UWVBFLmdldE5hbWUoKSkpDQorICAgICAgICAgICAgcmV0 dXJuIFNob3J0LlRZUEU7DQorICAgICAgICBlbHNlIHsNCisgICAgICAgICAg ICB0cnkgew0KKyAgICAgICAgICAgICAgICByZXR1cm4gQ2xhc3MuZm9yTmFt ZShzaWduYXR1cmUpOw0KKyAgICAgICAgICAgIH0gY2F0Y2ggKENsYXNzTm90 Rm91bmRFeGNlcHRpb24gZSkgew0KKyAgICAgICAgICAgICAgICB0aHJvdyBu ZXcgUmVmbGVjdGlvbkV4Y2VwdGlvbg0KKyAgICAgICAgICAgICAgICAgICAg KGUsICJDYW5ub3QgZmluZCBDbGFzcyBmb3IgIiArIHNpZ25hdHVyZSk7DQor ICAgICAgICAgICAgfQ0KKyAgICAgICAgfQ0KKyAgICB9DQogDQogICAgIC8q Kg0KICAgICAgKiBTZXQgdGhlIHZhbHVlIG9mIGEgc3BlY2lmaWMgYXR0cmli dXRlIG9mIHRoaXMgTUJlYW4uDQpAQCAtNDI0LDEzICs0OTYsMTUgQEANCiAg ICAgICovDQogICAgIHB1YmxpYyB2b2lkIHNldEF0dHJpYnV0ZShBdHRyaWJ1 dGUgYXR0cmlidXRlKQ0KICAgICAgICAgdGhyb3dzIEF0dHJpYnV0ZU5vdEZv dW5kRXhjZXB0aW9uLCBNQmVhbkV4Y2VwdGlvbiwNCi0gICAgICAgIFJlZmxl Y3Rpb25FeGNlcHRpb24gew0KLQ0KKyAgICAgICAgUmVmbGVjdGlvbkV4Y2Vw dGlvbg0KKyAgICB7DQorICAgICAgICAvLyBYWFggU2VuZCBhdHRyaWJ1dGUg Y2hhbmdlZCBub3RpZmljYXRpb24gISEhDQogICAgICAgICAvLyBWYWxpZGF0 ZSB0aGUgaW5wdXQgcGFyYW1ldGVycw0KICAgICAgICAgaWYgKGF0dHJpYnV0 ZSA9PSBudWxsKQ0KICAgICAgICAgICAgIHRocm93IG5ldyBSdW50aW1lT3Bl cmF0aW9uc0V4Y2VwdGlvbg0KICAgICAgICAgICAgICAgICAobmV3IElsbGVn YWxBcmd1bWVudEV4Y2VwdGlvbigiQXR0cmlidXRlIGlzIG51bGwiKSwNCiAg ICAgICAgICAgICAgICAgICJBdHRyaWJ1dGUgaXMgbnVsbCIpOw0KKyAgICAg ICAgDQogICAgICAgICBTdHJpbmcgbmFtZSA9IGF0dHJpYnV0ZS5nZXROYW1l KCk7DQogICAgICAgICBPYmplY3QgdmFsdWUgPSBhdHRyaWJ1dGUuZ2V0VmFs dWUoKTsNCiAgICAgICAgIGlmIChuYW1lID09IG51bGwpDQpAQCAtNDM4LDI1 ICs1MTIsNzIgQEANCiAgICAgICAgICAgICAgICAgKG5ldyBJbGxlZ2FsQXJn dW1lbnRFeGNlcHRpb24oIkF0dHJpYnV0ZSBuYW1lIGlzIG51bGwiKSwNCiAg ICAgICAgICAgICAgICAgICJBdHRyaWJ1dGUgbmFtZSBpcyBudWxsIik7DQog DQotICAgICAgICAvLyBMb29rIHVwIHRoZSBhY3R1YWwgb3BlcmF0aW9uIHRv IGJlIHVzZWQNCi0gICAgICAgIE1vZGVsTUJlYW5BdHRyaWJ1dGVJbmZvIGF0 dHJJbmZvID0gaW5mby5nZXRBdHRyaWJ1dGUobmFtZSk7DQotICAgICAgICBp ZiAoYXR0ckluZm8gPT0gbnVsbCkNCi0gICAgICAgICAgICB0aHJvdyBuZXcg QXR0cmlidXRlTm90Rm91bmRFeGNlcHRpb24NCi0gICAgICAgICAgICAgICAg KCJDYW5ub3QgZmluZCBhdHRyaWJ1dGUgIiArIG5hbWUpOw0KLSAgICAgICAg RGVzY3JpcHRvciBhdHRyRGVzYyA9IGF0dHJJbmZvLmdldERlc2NyaXB0b3Io KTsNCi0gICAgICAgIGlmIChhdHRyRGVzYyA9PSBudWxsKQ0KLSAgICAgICAg ICAgIHRocm93IG5ldyBBdHRyaWJ1dGVOb3RGb3VuZEV4Y2VwdGlvbg0KLSAg ICAgICAgICAgICAgICAoIkNhbm5vdCBmaW5kIGF0dHJpYnV0ZSAiICsgbmFt ZSArICIgZGVzY3JpcHRvciIpOw0KLSAgICAgICAgU3RyaW5nIHNldE1ldGhv ZCA9IChTdHJpbmcpIGF0dHJEZXNjLmdldEZpZWxkVmFsdWUoInNldE1ldGhv ZCIpOw0KLSAgICAgICAgaWYgKHNldE1ldGhvZCA9PSBudWxsKQ0KLSAgICAg ICAgICAgIHRocm93IG5ldyBBdHRyaWJ1dGVOb3RGb3VuZEV4Y2VwdGlvbg0K LSAgICAgICAgICAgICAgICAoIkNhbm5vdCBmaW5kIGF0dHJpYnV0ZSAiICsg bmFtZSArICIgc2V0IG1ldGhvZCBuYW1lIik7DQotDQotICAgICAgICAvLyBJ bnZva2UgdGhlIHNwZWNpZmllZCBzZXQgbWV0aG9kIGFuZCBpZ25vcmUgYW55 IHJlc3VsdHMNCi0gICAgICAgIGludm9rZShzZXRNZXRob2QsDQotICAgICAg ICAgICAgICAgbmV3IE9iamVjdFtdIHsgdmFsdWUgfSwNCi0gICAgICAgICAg ICAgICBuZXcgU3RyaW5nW10geyBhdHRySW5mby5nZXRUeXBlKCkgfSk7DQor ICAgICAgICAvLyBFeHRyYWN0IHRoZSBtZXRob2QgZnJvbSBjYWNoZSANCisg ICAgICAgIE1ldGhvZCBtPShNZXRob2Qpc2V0QXR0TWFwLmdldCggbmFtZSAp Ow0KIA0KKyAgICAgICAgaWYoIG09PW51bGwgKSB7DQorICAgICAgICAgICAg Ly8gTG9vayB1cCB0aGUgYWN0dWFsIG9wZXJhdGlvbiB0byBiZSB1c2VkDQor ICAgICAgICAgICAgTW9kZWxNQmVhbkF0dHJpYnV0ZUluZm8gYXR0ckluZm8g PSBpbmZvLmdldEF0dHJpYnV0ZShuYW1lKTsNCisgICAgICAgICAgICBpZiAo YXR0ckluZm8gPT0gbnVsbCkNCisgICAgICAgICAgICAgICAgdGhyb3cgbmV3 IEF0dHJpYnV0ZU5vdEZvdW5kRXhjZXB0aW9uKCJDYW5ub3QgZmluZCBhdHRy aWJ1dGUgIiArIG5hbWUpOw0KKyAgICAgICAgICAgIERlc2NyaXB0b3IgYXR0 ckRlc2MgPSBhdHRySW5mby5nZXREZXNjcmlwdG9yKCk7DQorICAgICAgICAg ICAgaWYgKGF0dHJEZXNjID09IG51bGwpDQorICAgICAgICAgICAgICAgIHRo cm93IG5ldyBBdHRyaWJ1dGVOb3RGb3VuZEV4Y2VwdGlvbigiQ2Fubm90IGZp bmQgYXR0cmlidXRlICIgKyBuYW1lICsgIiBkZXNjcmlwdG9yIik7DQorICAg ICAgICAgICAgU3RyaW5nIHNldE1ldGhvZCA9IChTdHJpbmcpIGF0dHJEZXNj LmdldEZpZWxkVmFsdWUoInNldE1ldGhvZCIpOw0KKyAgICAgICAgICAgIGlm IChzZXRNZXRob2QgPT0gbnVsbCkNCisgICAgICAgICAgICAgICAgdGhyb3cg bmV3IEF0dHJpYnV0ZU5vdEZvdW5kRXhjZXB0aW9uKCJDYW5ub3QgZmluZCBh dHRyaWJ1dGUgIiArIG5hbWUgKyAiIHNldCBtZXRob2QgbmFtZSIpOw0KKw0K KyAgICAgICAgICAgIFN0cmluZyBhcmdUeXBlPWF0dHJJbmZvLmdldFR5cGUo KTsNCisgICAgICAgICAgICBDbGFzcyBzaWduYXR1cmVbXSA9IG5ldyBDbGFz c1tdIHsgZ2V0QXR0cmlidXRlQ2xhc3MoIGFyZ1R5cGUgKSB9Ow0KKw0KKyAg ICAgICAgICAgIE9iamVjdCBvYmplY3QgPSBudWxsOw0KKyAgICAgICAgICAg IE5vU3VjaE1ldGhvZEV4Y2VwdGlvbiBleGNlcHRpb24gPSBudWxsOw0KKyAg ICAgICAgICAgIHRyeSB7DQorICAgICAgICAgICAgICAgIG9iamVjdCA9IHRo aXM7DQorICAgICAgICAgICAgICAgIG0gPSBvYmplY3QuZ2V0Q2xhc3MoKS5n ZXRNZXRob2Qoc2V0TWV0aG9kLCBzaWduYXR1cmUpOw0KKyAgICAgICAgICAg IH0gY2F0Y2ggKE5vU3VjaE1ldGhvZEV4Y2VwdGlvbiBlKSB7DQorICAgICAg ICAgICAgICAgIGV4Y2VwdGlvbiA9IGU7Ow0KKyAgICAgICAgICAgIH0NCisg ICAgICAgICAgICBpZiggbT09IG51bGwgJiYgcmVzb3VyY2UgIT0gbnVsbCAp IHsNCisgICAgICAgICAgICAgICAgdHJ5IHsNCisgICAgICAgICAgICAgICAg ICAgIG9iamVjdCA9IHJlc291cmNlOw0KKyAgICAgICAgICAgICAgICAgICAg bSA9IG9iamVjdC5nZXRDbGFzcygpLmdldE1ldGhvZChzZXRNZXRob2QsIHNp Z25hdHVyZSk7DQorICAgICAgICAgICAgICAgICAgICBleGNlcHRpb249bnVs bDsNCisgICAgICAgICAgICAgICAgfSBjYXRjaCAoTm9TdWNoTWV0aG9kRXhj ZXB0aW9uIGUpIHsNCisgICAgICAgICAgICAgICAgICAgIGV4Y2VwdGlvbiA9 IGU7DQorICAgICAgICAgICAgICAgIH0NCisgICAgICAgICAgICB9DQorICAg ICAgICAgICAgaWYoIGV4Y2VwdGlvbiAhPSBudWxsICkNCisgICAgICAgICAg ICAgICAgdGhyb3cgbmV3IFJlZmxlY3Rpb25FeGNlcHRpb24oZXhjZXB0aW9u LCANCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIkNhbm5vdCBmaW5kIHNldHRlciBtZXRob2QgIiArIHNldE1ldGhv ZCk7DQorICAgICAgICAgICAgc2V0QXR0TWFwLnB1dCggbmFtZSwgbSApOw0K KyAgICAgICAgfQ0KKyAgICAgICAgDQorICAgICAgICBPYmplY3QgcmVzdWx0 ID0gbnVsbDsNCisgICAgICAgIHRyeSB7DQorICAgICAgICAgICAgaWYoIG0u Z2V0RGVjbGFyaW5nQ2xhc3MoKSA9PSB0aGlzLmdldENsYXNzKCkgKSB7DQor ICAgICAgICAgICAgICAgIHJlc3VsdCA9IG0uaW52b2tlKHRoaXMsIG5ldyBP YmplY3RbXSB7IHZhbHVlIH0pOw0KKyAgICAgICAgICAgIH0gZWxzZSB7DQor ICAgICAgICAgICAgICAgIHJlc3VsdCA9IG0uaW52b2tlKHJlc291cmNlLCBu ZXcgT2JqZWN0W10geyB2YWx1ZSB9KTsNCisgICAgICAgICAgICB9DQorICAg ICAgICB9IGNhdGNoIChJbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uIGUpIHsN CisgICAgICAgICAgICBUaHJvd2FibGUgdCA9IGUuZ2V0VGFyZ2V0RXhjZXB0 aW9uKCk7DQorICAgICAgICAgICAgaWYgKHQgPT0gbnVsbCkNCisgICAgICAg ICAgICAgICAgdCA9IGU7DQorICAgICAgICAgICAgaWYgKHQgaW5zdGFuY2Vv ZiBSdW50aW1lRXhjZXB0aW9uKQ0KKyAgICAgICAgICAgICAgICB0aHJvdyBu ZXcgUnVudGltZU9wZXJhdGlvbnNFeGNlcHRpb24NCisgICAgICAgICAgICAg ICAgICAgICgoUnVudGltZUV4Y2VwdGlvbikgdCwgIkV4Y2VwdGlvbiBpbnZv a2luZyBtZXRob2QgIiArIG5hbWUpOw0KKyAgICAgICAgICAgIGVsc2UgaWYg KHQgaW5zdGFuY2VvZiBFcnJvcikNCisgICAgICAgICAgICAgICAgdGhyb3cg bmV3IFJ1bnRpbWVFcnJvckV4Y2VwdGlvbg0KKyAgICAgICAgICAgICAgICAg ICAgKChFcnJvcikgdCwgIkVycm9yIGludm9raW5nIG1ldGhvZCAiICsgbmFt ZSk7DQorICAgICAgICAgICAgZWxzZQ0KKyAgICAgICAgICAgICAgICB0aHJv dyBuZXcgTUJlYW5FeGNlcHRpb24NCisgICAgICAgICAgICAgICAgICAgIChl LCAiRXhjZXB0aW9uIGludm9raW5nIG1ldGhvZCAiICsgbmFtZSk7DQorICAg ICAgICB9IGNhdGNoIChFeGNlcHRpb24gZSkgew0KKyAgICAgICAgICAgIGxv Zy5lcnJvcigiRXhjZXB0aW9uIGludm9raW5nIG1ldGhvZCAiICsgbmFtZSAs IGUgKTsNCisgICAgICAgICAgICB0aHJvdyBuZXcgTUJlYW5FeGNlcHRpb24N CisgICAgICAgICAgICAgICAgKGUsICJFeGNlcHRpb24gaW52b2tpbmcgbWV0 aG9kICIgKyBuYW1lKTsNCisgICAgICAgIH0NCiAgICAgfQ0KIA0KIA0KQEAg LTEwMDYsMTAgKzExMjcsMTAgQEANCiAgICAgICogQHBhcmFtIGluZm8gVGhl IDxjb2RlPk1vZGVsTUJlYW5JbmZvIG9iamVjdCB0byBjaGVjaw0KICAgICAg Ki8NCiAgICAgcHJvdGVjdGVkIGJvb2xlYW4gaXNNb2RlbE1CZWFuSW5mb1Zh bGlkKE1vZGVsTUJlYW5JbmZvIGluZm8pIHsNCi0NCiAgICAgICAgIHJldHVy biAodHJ1ZSk7DQotDQogICAgIH0NCiANCisgICAgcHJpdmF0ZSBzdGF0aWMg b3JnLmFwYWNoZS5jb21tb25zLmxvZ2dpbmcuTG9nIGxvZz0NCisgICAgICAg ICBvcmcuYXBhY2hlLmNvbW1vbnMubG9nZ2luZy5Mb2dGYWN0b3J5LmdldExv ZyggQmFzZU1vZGVsTUJlYW4uY2xhc3MgKTsNCiANCiB9DQpJbmRleDogc3Jj L2phdmEvb3JnL2FwYWNoZS9jb21tb25zL21vZGVsZXIvTWFuYWdlZEJlYW4u amF2YQ0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KUkNTIGZpbGU6IC9ob21l L2N2cy9qYWthcnRhLWNvbW1vbnMvbW9kZWxlci9zcmMvamF2YS9vcmcvYXBh Y2hlL2NvbW1vbnMvbW9kZWxlci9NYW5hZ2VkQmVhbi5qYXZhLHYNCnJldHJp ZXZpbmcgcmV2aXNpb24gMS4xLjEuMQ0KZGlmZiAtdSAtcjEuMS4xLjEgTWFu YWdlZEJlYW4uamF2YQ0KLS0tIHNyYy9qYXZhL29yZy9hcGFjaGUvY29tbW9u cy9tb2RlbGVyL01hbmFnZWRCZWFuLmphdmEJMzAgQXByIDIwMDIgMjA6NTg6 NTEgLTAwMDAJMS4xLjEuMQ0KKysrIHNyYy9qYXZhL29yZy9hcGFjaGUvY29t bW9ucy9tb2RlbGVyL01hbmFnZWRCZWFuLmphdmEJNyBBdWcgMjAwMiAxNzox NDoxMyAtMDAwMA0KQEAgLTQ0MSw2ICs0NDUsNyBAQA0KICAgICAgICAgZm9y IChpbnQgaSA9IDA7IGkgPCBvcGVycy5sZW5ndGg7IGkrKykNCiAgICAgICAg ICAgICBvcGVyYXRpb25zW2ldID0gb3BlcnNbaV0uY3JlYXRlT3BlcmF0aW9u SW5mbygpOw0KIA0KKyAgICAgICAgLyoNCiAgICAgICAgIC8vIEFkZCBvcGVy YXRpb25zIGZvciBhdHRyaWJ1dGUgZ2V0dGVycyBhbmQgc2V0dGVycyBhcyBu ZWVkZWQNCiAgICAgICAgIEFycmF5TGlzdCBsaXN0ID0gbmV3IEFycmF5TGlz dCgpOw0KICAgICAgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBvcGVyYXRpb25z Lmxlbmd0aDsgaSsrKQ0KQEAgLTQ2NSw3ICs0NzAsOCBAQA0KICAgICAgICAg aWYgKGxpc3Quc2l6ZSgpID4gb3BlcmF0aW9ucy5sZW5ndGgpDQogICAgICAg ICAgICAgb3BlcmF0aW9ucyA9DQogICAgICAgICAgICAgICAgIChNb2RlbE1C ZWFuT3BlcmF0aW9uSW5mb1tdKSBsaXN0LnRvQXJyYXkob3BlcmF0aW9ucyk7 DQotDQorICAgICAgICAqLw0KKyAgICAgICAgDQogICAgICAgICAvLyBDb25z dHJ1Y3QgYW5kIHJldHVybiBhIG5ldyBNb2RlbE1CZWFuSW5mbyBvYmplY3QN CiAgICAgICAgIGluZm8gPSBuZXcgTW9kZWxNQmVhbkluZm9TdXBwb3J0DQog ICAgICAgICAgICAgKGdldENsYXNzTmFtZSgpLCBnZXREZXNjcmlwdGlvbigp LA0KSW5kZXg6IHNyYy9qYXZhL29yZy9hcGFjaGUvY29tbW9ucy9tb2RlbGVy L1JlZ2lzdHJ5LmphdmENCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NClJDUyBm aWxlOiAvaG9tZS9jdnMvamFrYXJ0YS1jb21tb25zL21vZGVsZXIvc3JjL2ph dmEvb3JnL2FwYWNoZS9jb21tb25zL21vZGVsZXIvUmVnaXN0cnkuamF2YSx2 DQpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMg0KZGlmZiAtdSAtcjEuMiBSZWdp c3RyeS5qYXZhDQotLS0gc3JjL2phdmEvb3JnL2FwYWNoZS9jb21tb25zL21v ZGVsZXIvUmVnaXN0cnkuamF2YQkyOSBKdWwgMjAwMiAyMjoyNTo1NCAtMDAw MAkxLjINCisrKyBzcmMvamF2YS9vcmcvYXBhY2hlL2NvbW1vbnMvbW9kZWxl ci9SZWdpc3RyeS5qYXZhCTcgQXVnIDIwMDIgMTc6MTQ6MTMgLTAwMDANCkBA IC0yMjYsNyArMjI2LDcgQEANCiAgICAgcHVibGljIHN5bmNocm9uaXplZCBz dGF0aWMgUmVnaXN0cnkgZ2V0UmVnaXN0cnkoKSB7DQogDQogICAgICAgICBp ZiAocmVnaXN0cnkgPT0gbnVsbCkgew0KLSAgICAgICAgICAgIGxvZy5pbmZv KCJDcmVhdGluZyBuZXcgUmVnaXN0cnkgaW5zdGFuY2UiKTsNCisgICAgICAg ICAgICBsb2cuZGVidWcoIkNyZWF0aW5nIG5ldyBSZWdpc3RyeSBpbnN0YW5j ZSIpOw0KICAgICAgICAgICAgIHJlZ2lzdHJ5ID0gbmV3IFJlZ2lzdHJ5KCk7 DQogICAgICAgICB9DQogICAgICAgICByZXR1cm4gKHJlZ2lzdHJ5KTsNCkBA IC0yMzksMTggKzIzOSwxOCBAQA0KICAgICAgKiA8Y29kZT5NQmVhblNlcnZl cjwvY29kZT4gaW5zdGFuY2UuDQogICAgICAqLw0KICAgICBwdWJsaWMgc3lu Y2hyb25pemVkIHN0YXRpYyBNQmVhblNlcnZlciBnZXRTZXJ2ZXIoKSB7DQor ICAgICAgICBsb25nIHQxPVN5c3RlbS5jdXJyZW50VGltZU1pbGxpcygpOw0K IA0KICAgICAgICAgaWYgKHNlcnZlciA9PSBudWxsKSB7DQogICAgICAgICAg ICAgaWYoIE1CZWFuU2VydmVyRmFjdG9yeS5maW5kTUJlYW5TZXJ2ZXIobnVs bCkuc2l6ZSgpID4gMCApIHsNCi0gICAgICAgICAgICAgICAgbG9nLmluZm8o IlVzaW5nIGV4aXN0aW5nIE1CZWFuU2VydmVyIik7DQogICAgICAgICAgICAg ICAgIHNlcnZlcj0oTUJlYW5TZXJ2ZXIpTUJlYW5TZXJ2ZXJGYWN0b3J5LmZp bmRNQmVhblNlcnZlcihudWxsKS5nZXQoMCk7DQorICAgICAgICAgICAgICAg IGxvZy5kZWJ1ZygiVXNpbmcgZXhpc3RpbmcgTUJlYW5TZXJ2ZXIgIiArIChT eXN0ZW0uY3VycmVudFRpbWVNaWxsaXMoKSAtIHQxICkpOw0KICAgICAgICAg ICAgIH0gZWxzZSB7DQotICAgICAgICAgICAgICAgIGxvZy5pbmZvKCJDcmVh dGluZyBNQmVhblNlcnZlciIpOw0KICAgICAgICAgICAgICAgICBzZXJ2ZXI9 TUJlYW5TZXJ2ZXJGYWN0b3J5LmNyZWF0ZU1CZWFuU2VydmVyKCk7DQorICAg ICAgICAgICAgICAgIGxvZy5kZWJ1ZygiQ3JlYXRpbmcgTUJlYW5TZXJ2ZXIi KyAoU3lzdGVtLmN1cnJlbnRUaW1lTWlsbGlzKCkgLSB0MSApKTsNCiAgICAg ICAgICAgICB9DQogICAgICAgICB9DQogICAgICAgICByZXR1cm4gKHNlcnZl cik7DQotDQogICAgIH0NCiANCiANCkBAIC0yNjUsMTQgKzI2NSwxMyBAQA0K ICAgICAgKi8NCiAgICAgcHVibGljIHN0YXRpYyB2b2lkIGxvYWRSZWdpc3Ry eShJbnB1dFN0cmVhbSBzdHJlYW0pDQogICAgICAgICB0aHJvd3MgRXhjZXB0 aW9uIHsNCi0NCi0gICAgICAgIGxvZy5pbmZvKCJMb2FkaW5nIHJlZ2lzdHJ5 IGluZm9ybWF0aW9uIik7DQorICAgICAgICBsb25nIHQxPVN5c3RlbS5jdXJy ZW50VGltZU1pbGxpcygpOw0KIA0KICAgICAgICAgLy8gQ3JlYXRlIGEgZGln ZXN0ZXIgdG8gdXNlIGZvciBwYXJzaW5nDQogICAgICAgICBSZWdpc3RyeSBy ZWdpc3RyeSA9IGdldFJlZ2lzdHJ5KCk7DQogICAgICAgICBEaWdlc3RlciBk aWdlc3RlciA9IG5ldyBEaWdlc3RlcigpOw0KICAgICAgICAgZGlnZXN0ZXIu c2V0TmFtZXNwYWNlQXdhcmUoZmFsc2UpOw0KLSAgICAgICAgZGlnZXN0ZXIu c2V0VmFsaWRhdGluZyh0cnVlKTsNCisgICAgICAgIGRpZ2VzdGVyLnNldFZh bGlkYXRpbmcoZmFsc2UpOyANCiAgICAgICAgIFVSTCB1cmwgPSByZWdpc3Ry eS5nZXRDbGFzcygpLmdldFJlc291cmNlDQogICAgICAgICAgICAgKCIvb3Jn L2FwYWNoZS9jb21tb25zL21vZGVsZXIvbWJlYW5zLWRlc2NyaXB0b3JzLmR0 ZCIpOw0KICAgICAgICAgZGlnZXN0ZXIucmVnaXN0ZXINCkBAIC0zNjMsOSAr MzYyLDkgQEANCiAgICAgICAgICAgICBsb2cuZXJyb3IoIkVycm9yIGRpZ2Vz dGluZyBSZWdpc3RyeSBkYXRhIiwgZSk7DQogICAgICAgICAgICAgdGhyb3cg ZTsNCiAgICAgICAgIH0NCi0NCisgICAgICAgIGxvbmcgdDI9U3lzdGVtLmN1 cnJlbnRUaW1lTWlsbGlzKCk7DQorICAgICAgICBsb2cuZGVidWcoIkxvYWRl ZCByZWdpc3RyeSBpbmZvcm1hdGlvbiAiICsgKCB0MiAtIHQxICkgKyAiIG1z Iik7DQogICAgIH0NCi0NCiANCiAgICAgLyoqDQogICAgICAqIFNldCB0aGUg PGNvZGU+TUJlYW5TZXJ2ZXI8L2NvZGU+IHRvIGJlIHV0aWxpemVkIGZvciBv dXINCg== --697600-802087594-1028740348=:1468 Content-Type: text/plain; charset=us-ascii -- To unsubscribe, e-mail: For additional commands, e-mail: --697600-802087594-1028740348=:1468--