From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13286 invoked by alias); 31 Jul 2005 18:08:05 -0000 Mailing-List: contact mauve-discuss-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: mauve-discuss-owner@sources.redhat.com Received: (qmail 13271 invoked by uid 22791); 31 Jul 2005 18:07:57 -0000 Received: from wildebeest.demon.nl (HELO gnu.wildebeest.org) (83.160.152.237) by sourceware.org (qpsmtpd/0.30-dev) with ESMTP; Sun, 31 Jul 2005 18:07:57 +0000 Received: from elsschot.wildebeest.org ([192.168.1.26]) by gnu.wildebeest.org with esmtp (Exim 3.36 #1 (Debian)) id 1DzHpT-0006Tm-00 for ; Sun, 31 Jul 2005 19:42:27 +0200 Subject: New locks tests need -Dmauve.vmexec set From: Mark Wielaard To: mauve-discuss@sources.redhat.com Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="=-jDtQIVvhNwj1s7i4X57y" Date: Sun, 31 Jul 2005 18:08:00 -0000 Message-Id: <1122831744.5924.25.camel@localhost.localdomain> Mime-Version: 1.0 X-Virus-Checked: Checked by ClamAV on sourceware.org X-SW-Source: 2005-q3/txt/msg00001.txt.bz2 --=-jDtQIVvhNwj1s7i4X57y Content-Type: multipart/mixed; boundary="=-FXOcnpRqDe0b6WnA6nuo" --=-FXOcnpRqDe0b6WnA6nuo Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Content-length: 392 Hi, I just checked in the following for the new file lock tests. I have updated runner to pass -Dmauve.vmexec=3D$RUNTIME. When you use some other way to run mauve you may want to update that to include the appropriate system property. If you don't the test will fail with: FAIL: gnu.testlet.java.nio.channels.FileChannel.lock: mauve.vmexec system property NOT SET! (number 1) Cheers, Mark --=-FXOcnpRqDe0b6WnA6nuo Content-Disposition: inline; filename=patch Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name=patch; charset=ANSI_X3.4-1968 Content-length: 20647 SW5kZXg6IENoYW5nZUxvZw0KPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KUkNT IGZpbGU6IC9jdnMvbWF1dmUvbWF1dmUvQ2hhbmdlTG9nLHYNCnJldHJpZXZp bmcgcmV2aXNpb24gMS4xMDM5DQpkaWZmIC11IC1yMS4xMDM5IENoYW5nZUxv Zw0KLS0tIENoYW5nZUxvZwkyOSBKdWwgMjAwNSAxMTo0NzowOCAtMDAwMAkx LjEwMzkNCisrKyBDaGFuZ2VMb2cJMzEgSnVsIDIwMDUgMTc6NDE6MjMgLTAw MDANCkBAIC0xLDMgKzEsOSBAQA0KKzIwMDUtMDctMzEgIE1hcmsgV2llbGFh cmQgIDxtYXJrQGtsb21wLm9yZz4NCisNCisJKiBnbnUvdGVzdGxldC9qYXZh L25pby9jaGFubmVscy9GaWxlQ2hhbm5lbC9sb2NrLmphdmE6IE5ldyB0ZXN0 Lg0KKwkqIHJ1bm5lcjogQWRkIC1EbWF1dmUudm1leGVjPSRSVU5USU1FLg0K KwkqIGJhdGNoX3J1biAoQ09NUElMRVIpOiBBZGQgLW5vd2Fybi4NCisNCiAy MDA1LTA3LTI5ICBKZXJvZW4gRnJpanRlcnMgIDxqZXJvZW5AZnJpanRlcnMu bmV0Pg0KIA0KIAkqIGdudS90ZXN0bGV0L2phdmEvbGFuZy9DbGFzc0xvYWRl ci9maW5kTG9hZGVkQ2xhc3MuamF2YToNCkluZGV4OiBiYXRjaF9ydW4NCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0NClJDUyBmaWxlOiAvY3ZzL21hdXZlL21h dXZlL2JhdGNoX3J1bix2DQpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMTYNCmRp ZmYgLXUgLXIxLjE2IGJhdGNoX3J1bg0KLS0tIGJhdGNoX3J1bgk5IEp1bCAy MDA1IDE5OjA1OjUzIC0wMDAwCTEuMTYNCisrKyBiYXRjaF9ydW4JMzEgSnVs IDIwMDUgMTc6NDE6MjMgLTAwMDANCkBAIC0zOCw3ICszOCw3IEBADQogDQog aWYgdGVzdCAieCRDT01QSUxFUiIgPSAieCI7IHRoZW4NCiAjQ09NUElMRVI9 ImdjaiAtQyAtV25vLWRlcHJlY2F0ZWQiDQotQ09NUElMRVI9Imppa2VzIC1i b290Y2xhc3NwYXRoIC91c3IvbG9jYWwvY2xhc3NwYXRoL3NoYXJlL2NsYXNz cGF0aC9nbGliai56aXAiDQorQ09NUElMRVI9Imppa2VzIC1ub3dhcm4gLWJv b3RjbGFzc3BhdGggL3Vzci9sb2NhbC9jbGFzc3BhdGgvc2hhcmUvY2xhc3Nw YXRoL2dsaWJqLnppcCINCiBmaQ0KIA0KIGlmIHRlc3QgIngkQ09NUElMRVIi ID0gInhnY2oiOyB0aGVuDQpJbmRleDogcnVubmVyDQo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09DQpSQ1MgZmlsZTogL2N2cy9tYXV2ZS9tYXV2ZS9ydW5uZXIs dg0KcmV0cmlldmluZyByZXZpc2lvbiAxLjEzDQpkaWZmIC11IC1yMS4xMyBy dW5uZXINCi0tLSBydW5uZXIJOSBKdWwgMjAwNSAxOTozMTowNyAtMDAwMAkx LjEzDQorKysgcnVubmVyCTMxIEp1bCAyMDA1IDE3OjQxOjIzIC0wMDAwDQpA QCAtMzUsNyArMzUsNyBAQA0KICNSVU5USU1FPSJLaXNzbWUiDQogI1JVTlRJ TUU9Ii91c3IvbG9jYWwvc2FibGV2bS9iaW4vc2FibGV2bSAtWSINCiAjUlVO VElNRT0iamMgLVhpbnQiDQotUlVOVElNRT1qYW12bQ0KK1JVTlRJTUU9Imph bXZtIg0KICNSVU5USU1FPSJuYXRpdmUiDQogZmkNCiANCkBAIC02Myw3ICs2 Myw3IEBADQogICAgIGVjaG8gJHRlc3RjbGFzcyA+IHRlc3RmaWxlbmFtZS50 eHQNCiAgICAgLi9TaW1wbGVUZXN0SGFybmVzcyAtZGVidWcgLXZlcmJvc2Ug LWZpbGUgdGVzdGZpbGVuYW1lLnR4dCAmDQogZWxzZQ0KLSAgICBlY2hvICR0 ZXN0Y2xhc3MgfCAkUlVOVElNRSBnbnUudGVzdGxldC5TaW1wbGVUZXN0SGFy bmVzcyAtZGVidWcgLXZlcmJvc2UgJg0KKyAgICBlY2hvICR0ZXN0Y2xhc3Mg fCAkUlVOVElNRSAtRG1hdXZlLnZtZXhlYz0kUlVOVElNRSBnbnUudGVzdGxl dC5TaW1wbGVUZXN0SGFybmVzcyAtZGVidWcgLXZlcmJvc2UgJg0KIGZpDQog UElEPSQhDQogd2FpdCAkUElEDQpJbmRleDogZ251L3Rlc3RsZXQvamF2YS9u aW8vY2hhbm5lbHMvRmlsZUNoYW5uZWwvbG9jay5qYXZhDQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09DQpSQ1MgZmlsZTogZ251L3Rlc3RsZXQvamF2YS9uaW8v Y2hhbm5lbHMvRmlsZUNoYW5uZWwvbG9jay5qYXZhDQpkaWZmIC1OIGdudS90 ZXN0bGV0L2phdmEvbmlvL2NoYW5uZWxzL0ZpbGVDaGFubmVsL2xvY2suamF2 YQ0KLS0tIC9kZXYvbnVsbAkxIEphbiAxOTcwIDAwOjAwOjAwIC0wMDAwDQor KysgZ251L3Rlc3RsZXQvamF2YS9uaW8vY2hhbm5lbHMvRmlsZUNoYW5uZWwv bG9jay5qYXZhCTMxIEp1bCAyMDA1IDE3OjQxOjIzIC0wMDAwDQpAQCAtMCww ICsxLDUzOSBAQA0KKy8vIFRhZ3M6IEpESzEuNA0KKw0KKy8vIENvcHlyaWdo dCAoQykgMjAwNSBNYXJrIEouIFdpZWxhYXJkIDxtYXJrQGtsb21wLm9yZz4N CisNCisvLyBUaGlzIGZpbGUgaXMgcGFydCBvZiBNYXV2ZS4NCisNCisvLyBN YXV2ZSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBp dCBhbmQvb3IgbW9kaWZ5DQorLy8gaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRo ZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBhcyBwdWJsaXNoZWQgYnkN CisvLyB0aGUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uOyBlaXRoZXIgdmVy c2lvbiAyLCBvciAoYXQgeW91ciBvcHRpb24pDQorLy8gYW55IGxhdGVyIHZl cnNpb24uDQorDQorLy8gTWF1dmUgaXMgZGlzdHJpYnV0ZWQgaW4gdGhlIGhv cGUgdGhhdCBpdCB3aWxsIGJlIHVzZWZ1bCwNCisvLyBidXQgV0lUSE9VVCBB TlkgV0FSUkFOVFk7IHdpdGhvdXQgZXZlbiB0aGUgaW1wbGllZCB3YXJyYW50 eSBvZg0KKy8vIE1FUkNIQU5UQUJJTElUWSBvciBGSVRORVNTIEZPUiBBIFBB UlRJQ1VMQVIgUFVSUE9TRS4gIFNlZSB0aGUNCisvLyBHTlUgR2VuZXJhbCBQ dWJsaWMgTGljZW5zZSBmb3IgbW9yZSBkZXRhaWxzLg0KKw0KKy8vIFlvdSBz aG91bGQgaGF2ZSByZWNlaXZlZCBhIGNvcHkgb2YgdGhlIEdOVSBHZW5lcmFs IFB1YmxpYyBMaWNlbnNlDQorLy8gYWxvbmcgd2l0aCBNYXV2ZTsgc2VlIHRo ZSBmaWxlIENPUFlJTkcuICBJZiBub3QsIHdyaXRlIHRvDQorLy8gdGhlIEZy ZWUgU29mdHdhcmUgRm91bmRhdGlvbiwgNTkgVGVtcGxlIFBsYWNlIC0gU3Vp dGUgMzMwLA0KKy8vIEJvc3RvbiwgTUEgMDIxMTEtMTMwNywgVVNBLg0KKw0K K3BhY2thZ2UgZ251LnRlc3RsZXQuamF2YS5uaW8uY2hhbm5lbHMuRmlsZUNo YW5uZWw7DQorDQoraW1wb3J0IGphdmEuaW8uKjsNCitpbXBvcnQgamF2YS5u aW8uKjsNCitpbXBvcnQgamF2YS5uaW8uY2hhbm5lbHMuKjsNCisNCitpbXBv cnQgZ251LnRlc3RsZXQuVGVzdGxldDsNCitpbXBvcnQgZ251LnRlc3RsZXQu VGVzdEhhcm5lc3M7DQorDQorLyoqDQorICogVGVzdHMgRmlsZUNoYW5uZWwg bG9jaygpLCB0cnlMb2NrKCkgYW5kIEZpbGVMb2NrIG1ldGhvZHMuICBXZSB0 ZXN0DQorICogc2hhcmVkIGxvY2tpbmcgKHdoaWNoIGlzIG9wdGlvbmFsIGZv ciByZWFkIG9ubHkgY2hhbm5lbHMsIHNvIHdpbGwNCisgKiBmYWlsIHdoZW4g bm90IHN1cHBvcnRlZCkuDQorICovDQorcHVibGljIGNsYXNzIGxvY2sgaW1w bGVtZW50cyBUZXN0bGV0LCBSdW5uYWJsZQ0KK3sNCisNCisgIERhdGFJbnB1 dFN0cmVhbSBkaXM7DQorICBEYXRhT3V0cHV0U3RyZWFtIGRvczsNCisgIEJ1 ZmZlcmVkUmVhZGVyIGJyOw0KKw0KKyAgVGVzdEhhcm5lc3MgaGFybmVzczsN CisNCisgIHB1YmxpYyB2b2lkIHRlc3QoVGVzdEhhcm5lc3MgaGFybmVzcykN CisgIHsNCisgICAgdGhpcy5oYXJuZXNzID0gaGFybmVzczsNCisgICAgU3Ry aW5nIGZpbGVuYW1lID0gaGFybmVzcy5nZXRUZW1wRGlyZWN0b3J5KCkNCisg ICAgICArIEZpbGUuc2VwYXJhdG9yICsgIm1hdXZlbG9jayI7DQorICAgIEZp bGUgZmlsZSA9IG5ldyBGaWxlKGZpbGVuYW1lKTsNCisNCisgICAgRmlsZU91 dHB1dFN0cmVhbSBmb3MgPSBudWxsOw0KKyAgICBGaWxlSW5wdXRTdHJlYW0g ZmlzID0gbnVsbDsNCisgICAgUmFuZG9tQWNjZXNzRmlsZSByYWYgPSBudWxs Ow0KKyAgICBGaWxlQ2hhbm5lbCBjaGFubmVsOw0KKw0KKyAgICB0cnkNCisg ICAgICB7DQorCS8vIFNldHVwLiBSZW1vdmUgYW5kIHJlY3JlYXRlIHRlc3Qg ZmlsZQ0KKwkvLyBGaWxsIHRoZSBmaWxlIHdpdGggc29tZSBzdHVmZiA1TWIg aW4gdG90YWwNCisJLy8gU3RhcnQgYW5vdGhlciBydW50aW1lIHRoZSBjaGVj ayB0aGF0IGxvY2tzIGFjdHVhbGx5IHdvcmsuDQorCWZpbGUuZGVsZXRlKCk7 DQorCWZpbGUuY3JlYXRlTmV3RmlsZSgpOw0KKwlmb3MgPSBuZXcgRmlsZU91 dHB1dFN0cmVhbShmaWxlKTsNCisJYnl0ZVtdIGJzID0gbmV3IGJ5dGVbMjU2 XTsNCisJZm9yIChpbnQgaSA9IDA7IGkgPCAyNTY7IGkrKykNCisJICBic1tp XSA9IChieXRlKSBpOw0KKwlmb3IgKGludCBpID0gMDsgaSA8IDQgKiA1OyBp KyspDQorCSAgZm9zLndyaXRlKGJzKTsNCisJZm9zLmNsb3NlKCk7DQorCWZv cyA9IG51bGw7DQorICAgICAgfQ0KKyAgICBjYXRjaCAoSU9FeGNlcHRpb24g aW9lKQ0KKyAgICAgIHsNCisJLy8gSWYgd2UgY2Fubm90IGV2ZW4gY3JlYXRl IHRoZSBmaWxlIGp1c3QgZGllDQorCWhhcm5lc3MuY2hlY2soZmFsc2UsIGlv ZS50b1N0cmluZygpKTsNCisJaGFybmVzcy5kZWJ1Zyhpb2UpOw0KKwlyZXR1 cm47DQorICAgICAgfQ0KKw0KKyAgICBQcm9jZXNzIHAgPSBudWxsOw0KKyAg ICB0cnkNCisgICAgICB7DQorCVN0cmluZyBleGVjdm0gPSBTeXN0ZW0uZ2V0 UHJvcGVydHkoIm1hdXZlLnZtZXhlYyIpOw0KKwlpZiAoZXhlY3ZtID09IG51 bGwgfHwgZXhlY3ZtLmVxdWFscygiIikpDQorCSAgaGFybmVzcy5jaGVjayhm YWxzZSwgIm1hdXZlLnZtZXhlYyBzeXN0ZW0gcHJvcGVydHkgTk9UIFNFVCEi KTsNCisJZWxzZQ0KKwkgIHsNCisJICAgIFN0cmluZyBjbWQgPSBleGVjdm0g KyAiICIgKyB0aGlzLmdldENsYXNzKCkuZ2V0TmFtZSgpOw0KKwkgICAgcCA9 IFJ1bnRpbWUuZ2V0UnVudGltZSgpLmV4ZWMoY21kKTsNCisJICAgIGRpcyA9 IG5ldyBEYXRhSW5wdXRTdHJlYW0ocC5nZXRJbnB1dFN0cmVhbSgpKTsNCisJ ICAgIGRvcyA9IG5ldyBEYXRhT3V0cHV0U3RyZWFtKHAuZ2V0T3V0cHV0U3Ry ZWFtKCkpOw0KKwkgICAgYnIgPSBuZXcgQnVmZmVyZWRSZWFkZXIobmV3IElu cHV0U3RyZWFtUmVhZGVyKHAuZ2V0RXJyb3JTdHJlYW0oKSkpOw0KKwkgICAg Ly8gRHJhaW4gZXJyb3Igc3RyZWFtDQorCSAgICBUaHJlYWQgdCA9IG5ldyBU aHJlYWQodGhpcyk7DQorCSAgICB0LnNldERhZW1vbih0cnVlKTsNCisJICAg IHQuc3RhcnQoKTsNCisJICAgIA0KKwkgICAgZG9zLndyaXRlVVRGKGZpbGVu YW1lKTsNCisJICAgIGRvcy5mbHVzaCgpOw0KKwkgICAgDQorCSAgICAvLyBS ZWFkIE9LIG1lc3NhZ2UgdG8gbWFrZSBzdXJlIG90aGVyIHByb2Nlc3MgaXMg cmVhZHkuDQorCSAgICBoYXJuZXNzLmRlYnVnKGRpcy5yZWFkVVRGKCkpOw0K KwkgIH0NCisgICAgICB9DQorICAgIGNhdGNoIChJT0V4Y2VwdGlvbiBpb2Up DQorICAgICAgew0KKwkvLyBOb3QgbXVjaCB3aWxsIHdvcmsgbm93Li4uDQor CXAgPSBudWxsOw0KKwloYXJuZXNzLmNoZWNrKGZhbHNlLCBpb2UudG9TdHJp bmcoKSk7DQorCWhhcm5lc3MuZGVidWcoaW9lKTsNCisgICAgICB9DQorDQor ICAgIHRyeQ0KKyAgICAgIHsNCisJZm9zID0gbmV3IEZpbGVPdXRwdXRTdHJl YW0oZmlsZSk7DQorCWNoYW5uZWwgPSBmb3MuZ2V0Q2hhbm5lbCgpOw0KKwl0 ZXN0Q2hhbm5lbExvY2soIkZpbGVPdXRwdXRTdHJlYW0iLCBjaGFubmVsLCBm YWxzZSwgdHJ1ZSk7DQorCWZvcy5jbG9zZSgpOw0KKwlmb3MgPSBudWxsOw0K KwkNCisJZmlzID0gbmV3IEZpbGVJbnB1dFN0cmVhbShmaWxlKTsNCisJY2hh bm5lbCA9IGZpcy5nZXRDaGFubmVsKCk7DQorCXRlc3RDaGFubmVsTG9jaygi RmlsZUlucHV0U3RyZWFtIiwgY2hhbm5lbCwgdHJ1ZSwgZmFsc2UpOw0KKwlm aXMuY2xvc2UoKTsNCisJZmlzID0gbnVsbDsNCisJDQorCXJhZiA9IG5ldyBS YW5kb21BY2Nlc3NGaWxlKGZpbGUsICJyIik7DQorCWNoYW5uZWwgPSByYWYu Z2V0Q2hhbm5lbCgpOw0KKwl0ZXN0Q2hhbm5lbExvY2soIlJhbmRvbUFjY2Vz c0ZpbGUocikiLCBjaGFubmVsLCB0cnVlLCBmYWxzZSk7DQorCXJhZi5jbG9z ZSgpOw0KKwlyYWYgPSBudWxsOw0KKw0KKwlyYWYgPSBuZXcgUmFuZG9tQWNj ZXNzRmlsZShmaWxlLCAicnciKTsNCisJY2hhbm5lbCA9IHJhZi5nZXRDaGFu bmVsKCk7DQorCXRlc3RDaGFubmVsTG9jaygiUmFuZG9tQWNjZXNzRmlsZShy dykiLCBjaGFubmVsLCB0cnVlLCB0cnVlKTsNCisJcmFmLmNsb3NlKCk7DQor CXJhZiA9IG51bGw7DQorICAgICAgfQ0KKyAgICBjYXRjaCAoSU9FeGNlcHRp b24gaW9lKQ0KKyAgICAgIHsNCisJLy8gRGVlcCB0cm91YmxlLi4uDQorCWhh cm5lc3MuZGVidWcoaW9lKTsNCisJaGFybmVzcy5jaGVjayhmYWxzZSwgaW9l LnRvU3RyaW5nKCkpOw0KKyAgICAgIH0NCisgICAgZmluYWxseQ0KKyAgICAg IHsNCisJLy8gQ2xlYW51cCwgY2xvc2UgZXZlcnl0aGluZyBhbmQgcmVtb3Zl IHRlc3QgZmlsZS4NCisJaWYgKGZvcyAhPSBudWxsKQ0KKwkgIHsNCisJICAg IHRyeQ0KKwkgICAgICB7DQorCQlmb3MuY2xvc2UoKTsNCisJICAgICAgfQ0K KwkgICAgY2F0Y2ggKElPRXhjZXB0aW9uIGlvZSkNCisJICAgICAgew0KKwkJ aGFybmVzcy5kZWJ1Zyhpb2UpOw0KKwkgICAgICB9DQorCSAgfQ0KKwlpZiAo ZmlzICE9IG51bGwpDQorCSAgew0KKwkgICAgdHJ5DQorCSAgICAgIHsNCisJ CWZpcy5jbG9zZSgpOw0KKwkgICAgICB9DQorCSAgICBjYXRjaCAoSU9FeGNl cHRpb24gaW9lKQ0KKwkgICAgICB7DQorCQloYXJuZXNzLmRlYnVnKGlvZSk7 DQorCSAgICAgIH0NCisJICB9DQorCWlmIChyYWYgIT0gbnVsbCkNCisJICB7 DQorCSAgICB0cnkNCisJICAgICAgew0KKwkJcmFmLmNsb3NlKCk7DQorCSAg ICAgIH0NCisJICAgIGNhdGNoIChJT0V4Y2VwdGlvbiBpb2UpDQorCSAgICAg IHsNCisJCWhhcm5lc3MuZGVidWcoaW9lKTsNCisJICAgICAgfQ0KKwkgIH0N CisJaGFybmVzcy5jaGVjayhmaWxlLmRlbGV0ZSgpLCAiY2xlYW51cCAiICsg ZmlsZSk7DQorDQorCXRyeQ0KKwkgIHsNCisJICAgIGlmIChwICE9IG51bGwp DQorCSAgICAgIHsNCisJCWRvcy53cml0ZVVURigicXVpdCIpOw0KKwkJZG9z LmZsdXNoKCk7DQorCQlwLmRlc3Ryb3koKTsNCisJCXAud2FpdEZvcigpOw0K KwkgICAgICB9DQorCSAgfQ0KKwljYXRjaCAoSU9FeGNlcHRpb24gaW9lKQ0K KwkgIHsNCisJICAgIGhhcm5lc3MuZGVidWcoaW9lKTsNCisJICB9DQorCWNh dGNoIChJbnRlcnJ1cHRlZEV4Y2VwdGlvbiBpZSkNCisJICB7DQorCSAgICBo YXJuZXNzLmRlYnVnKGllKTsNCisJICB9DQorICAgICAgfQ0KKyAgfQ0KKw0K KyAgcHJpdmF0ZSB2b2lkIHRlc3RDaGFubmVsTG9jayhTdHJpbmcgd2hhdCwN CisJCQkgICAgICAgRmlsZUNoYW5uZWwgY2hhbm5lbCwNCisJCQkgICAgICAg Ym9vbGVhbiByZWFkLCBib29sZWFuIHdyaXRlKQ0KKyAgew0KKyAgICBGaWxl TG9jayBsb2NrID0gbnVsbDsNCisgICAgdHJ5DQorICAgICAgew0KKwloYXJu ZXNzLmNoZWNrUG9pbnQod2hhdCArICIgbG9jaygpIik7DQorCWJvb2xlYW4g aWxsZWdhbDsNCisJdHJ5DQorCSAgew0KKwkgICAgbG9jayA9IGNoYW5uZWwu bG9jaygpOw0KKwkgICAgaWxsZWdhbCA9IGZhbHNlOw0KKwkgIH0NCisJY2F0 Y2ggKE5vbldyaXRhYmxlQ2hhbm5lbEV4Y2VwdGlvbiBucmNhKQ0KKwkgIHsN CisJICAgIGlsbGVnYWwgPSB0cnVlOw0KKwkgIH0NCisJaGFybmVzcy5jaGVj ayhpbGxlZ2FsLCAhd3JpdGUpOw0KKwloYXJuZXNzLmNoZWNrKGlsbGVnYWwg fHwgbG9jayAhPSBudWxsKTsNCisJaWYgKGxvY2sgIT0gbnVsbCkNCisJICB7 DQorCSAgICB0cnkNCisJICAgICAgew0KKwkJdGVzdExvY2sod2hhdCwgY2hh bm5lbCwgbG9jaywgMCwgTG9uZy5NQVhfVkFMVUUsIGZhbHNlKTsNCisJICAg ICAgfQ0KKwkgICAgZmluYWxseQ0KKwkgICAgICB7DQorCQlsb2NrLnJlbGVh c2UoKTsNCisJCWhhcm5lc3MuY2hlY2sobG9jay5pc1ZhbGlkKCksIGZhbHNl KTsNCisJCWxvY2sgPSBudWxsOw0KKwkgICAgICB9DQorCSAgfQ0KKw0KKwlo YXJuZXNzLmNoZWNrUG9pbnQod2hhdCArICIgdHJ5TG9jaygpIik7DQorCXRy eQ0KKwkgIHsNCisJICAgIGxvY2sgPSBjaGFubmVsLnRyeUxvY2soKTsNCisJ ICAgIGlsbGVnYWwgPSBmYWxzZTsNCisJICB9DQorCWNhdGNoIChOb25Xcml0 YWJsZUNoYW5uZWxFeGNlcHRpb24gbndjZSkNCisJICB7DQorCSAgICBpbGxl Z2FsID0gdHJ1ZTsNCisJICB9DQorCWhhcm5lc3MuY2hlY2soaWxsZWdhbCwg IXdyaXRlKTsNCisJaGFybmVzcy5jaGVjayhpbGxlZ2FsIHx8IGxvY2sgIT0g bnVsbCk7DQorCWlmIChsb2NrICE9IG51bGwpDQorCSAgew0KKwkgICAgdHJ5 DQorCSAgICAgIHsNCisJCXRlc3RMb2NrKHdoYXQsIGNoYW5uZWwsIGxvY2ss IDAsIExvbmcuTUFYX1ZBTFVFLCBmYWxzZSk7DQorCSAgICAgIH0NCisJICAg IGZpbmFsbHkNCisJICAgICAgew0KKwkJbG9jay5yZWxlYXNlKCk7DQorCQlo YXJuZXNzLmNoZWNrKGxvY2suaXNWYWxpZCgpLCBmYWxzZSk7DQorCQlsb2Nr ID0gbnVsbDsNCisJICAgICAgfQ0KKwkgIH0NCisNCisJaGFybmVzcy5jaGVj a1BvaW50KHdoYXQgKyAiIGxvY2soMTI5LCAyMDUwLCBmYWxzZSkiKTsNCisJ dHJ5DQorCSAgew0KKwkgICAgbG9jayA9IGNoYW5uZWwubG9jaygxMjksIDIw NTAsIGZhbHNlKTsNCisJICAgIGlsbGVnYWwgPSBmYWxzZTsNCisJICB9DQor CWNhdGNoIChOb25Xcml0YWJsZUNoYW5uZWxFeGNlcHRpb24gbndjZSkNCisJ ICB7DQorCSAgICBpbGxlZ2FsID0gdHJ1ZTsNCisJICB9DQorCWhhcm5lc3Mu Y2hlY2soaWxsZWdhbCwgIXdyaXRlKTsNCisJaGFybmVzcy5jaGVjayhpbGxl Z2FsIHx8IGxvY2sgIT0gbnVsbCk7DQorCWlmIChsb2NrICE9IG51bGwpDQor CSAgew0KKwkgICAgdHJ5DQorCSAgICAgIHsNCisJCXRlc3RMb2NrKHdoYXQs IGNoYW5uZWwsIGxvY2ssIDEyOSwgMjA1MCwgZmFsc2UpOw0KKwkgICAgICB9 DQorCSAgICBmaW5hbGx5DQorCSAgICAgIHsNCisJCWxvY2sucmVsZWFzZSgp Ow0KKwkJaGFybmVzcy5jaGVjayhsb2NrLmlzVmFsaWQoKSwgZmFsc2UpOw0K KwkJbG9jayA9IG51bGw7DQorCSAgICAgIH0NCisJICB9DQorCQ0KKwloYXJu ZXNzLmNoZWNrUG9pbnQod2hhdCArICIgdHJ5TG9jaygxMjksIDIwNTAsIGZh bHNlKSIpOw0KKwl0cnkNCisJICB7DQorCSAgICBsb2NrID0gY2hhbm5lbC50 cnlMb2NrKDEyOSwgMjA1MCwgZmFsc2UpOw0KKwkgICAgaWxsZWdhbCA9IGZh bHNlOw0KKwkgIH0NCisJY2F0Y2ggKE5vbldyaXRhYmxlQ2hhbm5lbEV4Y2Vw dGlvbiBud2NlKQ0KKwkgIHsNCisJICAgIGlsbGVnYWwgPSB0cnVlOw0KKwkg IH0NCisJaGFybmVzcy5jaGVjayhpbGxlZ2FsLCAhd3JpdGUpOw0KKwloYXJu ZXNzLmNoZWNrKGlsbGVnYWwgfHwgbG9jayAhPSBudWxsKTsNCisJaWYgKGxv Y2sgIT0gbnVsbCkNCisJICB7DQorCSAgICB0cnkNCisJICAgICAgew0KKwkJ dGVzdExvY2sod2hhdCwgY2hhbm5lbCwgbG9jaywgMTI5LCAyMDUwLCBmYWxz ZSk7DQorCSAgICAgIH0NCisJICAgIGZpbmFsbHkNCisJICAgICAgew0KKwkJ bG9jay5yZWxlYXNlKCk7DQorCQloYXJuZXNzLmNoZWNrKGxvY2suaXNWYWxp ZCgpLCBmYWxzZSk7DQorCQlsb2NrID0gbnVsbDsNCisJICAgICAgfQ0KKwkg IH0NCisJDQorCWhhcm5lc3MuY2hlY2tQb2ludCh3aGF0ICsgIiBsb2NrKDEy OSwgMjA1MCwgdHJ1ZSkiKTsNCisJdHJ5DQorCSAgew0KKwkgICAgbG9jayA9 IGNoYW5uZWwubG9jaygxMjksIDIwNTAsIHRydWUpOw0KKwkgICAgaWxsZWdh bCA9IGZhbHNlOw0KKwkgIH0NCisJY2F0Y2ggKE5vblJlYWRhYmxlQ2hhbm5l bEV4Y2VwdGlvbiBucmNlKQ0KKwkgIHsNCisJICAgIGlsbGVnYWwgPSB0cnVl Ow0KKwkgIH0NCisJaGFybmVzcy5jaGVjayhpbGxlZ2FsLCAhcmVhZCk7DQor CWhhcm5lc3MuY2hlY2soaWxsZWdhbCB8fCBsb2NrICE9IG51bGwpOw0KKwlp ZiAobG9jayAhPSBudWxsKQ0KKwkgIHsNCisJICAgIHRyeQ0KKwkgICAgICB7 DQorCQl0ZXN0TG9jayh3aGF0LCBjaGFubmVsLCBsb2NrLCAxMjksIDIwNTAs IHRydWUpOw0KKwkgICAgICB9DQorCSAgICBmaW5hbGx5DQorCSAgICAgIHsN CisJCWxvY2sucmVsZWFzZSgpOw0KKwkJaGFybmVzcy5jaGVjayhsb2NrLmlz VmFsaWQoKSwgZmFsc2UpOw0KKwkJbG9jayA9IG51bGw7DQorCSAgICAgIH0N CisJICB9DQorDQorCWhhcm5lc3MuY2hlY2tQb2ludCh3aGF0ICsgIiB0cnlM b2NrKDEyOSwgMjA1MCwgdHJ1ZSkiKTsNCisJdHJ5DQorCSAgew0KKwkgICAg bG9jayA9IGNoYW5uZWwudHJ5TG9jaygxMjksIDIwNTAsIHRydWUpOw0KKwkg ICAgaWxsZWdhbCA9IGZhbHNlOw0KKwkgIH0NCisJY2F0Y2ggKE5vblJlYWRh YmxlQ2hhbm5lbEV4Y2VwdGlvbiBucmNlKQ0KKwkgIHsNCisJICAgIGlsbGVn YWwgPSB0cnVlOw0KKwkgIH0NCisJaGFybmVzcy5jaGVjayhpbGxlZ2FsLCAh cmVhZCk7DQorCWhhcm5lc3MuY2hlY2soaWxsZWdhbCB8fCBsb2NrICE9IG51 bGwpOw0KKwlpZiAobG9jayAhPSBudWxsKQ0KKwkgIHsNCisJICAgIHRyeQ0K KwkgICAgICB7DQorCQl0ZXN0TG9jayh3aGF0LCBjaGFubmVsLCBsb2NrLCAx MjksIDIwNTAsIHRydWUpOw0KKwkgICAgICB9DQorCSAgICBmaW5hbGx5DQor CSAgICAgIHsNCisJCWxvY2sucmVsZWFzZSgpOw0KKwkJaGFybmVzcy5jaGVj ayhsb2NrLmlzVmFsaWQoKSwgZmFsc2UpOw0KKwkJbG9jayA9IG51bGw7DQor CSAgICAgIH0NCisJICB9DQorICAgICAgfQ0KKyAgICBjYXRjaChJT0V4Y2Vw dGlvbiBpb2UpDQorICAgICAgew0KKwloYXJuZXNzLmRlYnVnKGlvZSk7DQor CWhhcm5lc3MuY2hlY2soZmFsc2UpOw0KKyAgICAgIH0NCisgIH0NCisNCisg IHByaXZhdGUgdm9pZCB0ZXN0TG9jayhTdHJpbmcgd2hhdCwNCisJCQlGaWxl Q2hhbm5lbCBjaGFubmVsLA0KKwkJCUZpbGVMb2NrIGxvY2ssDQorCQkJbG9u ZyBwb3NpdGlvbiwNCisJCQlsb25nIHNpemUsDQorCQkJYm9vbGVhbiBzaGFy ZWQpDQorICAgIHRocm93cyBJT0V4Y2VwdGlvbg0KKyAgew0KKyAgICBoYXJu ZXNzLmNoZWNrUG9pbnQod2hhdCArICI6ICIgKyBsb2NrKTsNCisgICAgaGFy bmVzcy5jaGVjayhsb2NrLmNoYW5uZWwoKSwgY2hhbm5lbCk7DQorICAgIGhh cm5lc3MuY2hlY2sobG9jay5wb3NpdGlvbigpLCBwb3NpdGlvbik7DQorICAg IGhhcm5lc3MuY2hlY2sobG9jay5zaXplKCksIHNpemUpOw0KKyAgICBoYXJu ZXNzLmNoZWNrKGxvY2suaXNTaGFyZWQoKSwgc2hhcmVkKTsNCisgICAgaGFy bmVzcy5jaGVjayhsb2NrLmlzVmFsaWQoKSwgdHJ1ZSk7DQorICAgIGhhcm5l c3MuY2hlY2sobG9jay5vdmVybGFwcygwLCBMb25nLk1BWF9WQUxVRSksIHRy dWUpOw0KKyAgICBoYXJuZXNzLmNoZWNrKGxvY2sub3ZlcmxhcHMocG9zaXRp b24sIHNpemUpLCB0cnVlKTsNCisgICAgaWYgKHBvc2l0aW9uIDwgTG9uZy5N QVhfVkFMVUUpDQorICAgICAgaGFybmVzcy5jaGVjayhsb2NrLm92ZXJsYXBz KDAsIHBvc2l0aW9uICsgMSksIHRydWUpOw0KKyAgICBpZiAocG9zaXRpb24g PiAwKQ0KKyAgICAgIHsNCisJaGFybmVzcy5jaGVjayhsb2NrLm92ZXJsYXBz KDAsIDEpLCBmYWxzZSk7DQorCWhhcm5lc3MuY2hlY2sobG9jay5vdmVybGFw cygwLCBwb3NpdGlvbiAtIDEpLCBmYWxzZSk7DQorICAgICAgfQ0KKyAgICBp ZiAoc2l6ZSA8IExvbmcuTUFYX1ZBTFVFICYmIHBvc2l0aW9uID4gMCkNCisg ICAgICBoYXJuZXNzLmNoZWNrKGxvY2sub3ZlcmxhcHMocG9zaXRpb24gLSAx LCBzaXplICsgMSksIHRydWUpOw0KKyAgICBpZiAoc2l6ZSA+IDEpDQorICAg ICAgaGFybmVzcy5jaGVjayhsb2NrLm92ZXJsYXBzKHBvc2l0aW9uLCBzaXpl IC0gMSksIHRydWUpOw0KKw0KKyAgICAvLyBMZXQgdGhlIG90aGVyIHByb2Nl c3MgdHJ5IHRvIGxvY2sgc29tZSB0aGluZ3MuDQorICAgIGlmIChkb3MgIT0g bnVsbCkNCisgICAgICB7DQorCWRvcy53cml0ZVVURigibG9jayIpOw0KKwlo YXJuZXNzLmRlYnVnKCJTZW5kaW5nOiAiDQorCQkgICAgICArIHBvc2l0aW9u ICsgIiwgIiArIHNpemUgKyAiICgiICsgc2hhcmVkICsgIikiKTsNCisJaGFy bmVzcy5kZWJ1ZygibG9jazogIiArIGxvY2spOw0KKwlkb3Mud3JpdGVMb25n KHBvc2l0aW9uKTsNCisJZG9zLndyaXRlTG9uZyhzaXplKTsNCisJZG9zLndy aXRlQm9vbGVhbihzaGFyZWQpOw0KKwlkb3MuZmx1c2goKTsNCisNCisJaGFy bmVzcy5kZWJ1ZygiRVhURVJOQUw6ICIgKyBkaXMucmVhZFVURigpKTsNCisJ aGFybmVzcy5jaGVjayhkaXMucmVhZEJvb2xlYW4oKSwgd2hhdCArICIgZXh0 ZXJuYWwgIiArIGxvY2spOw0KKyAgICAgIH0NCisgIH0NCisNCisgIHB1Ymxp YyB2b2lkIHJ1bigpDQorICB7DQorICAgIC8vIERyYWluIGVycm9yIHN0cmVh bSBmcm9tIGV4dGVybmFsIHByb2Nlc3MuDQorICAgIC8vIE51bGwgaW5wdXQg KEVPRkV4Y2VwdGlvbikgd2lsbCBzdG9wIGxvb3AuDQorICAgIHRyeQ0KKyAg ICAgIHsNCisJU3RyaW5nIGxpbmUgPSBici5yZWFkTGluZSgpOw0KKwl3aGls ZSAobGluZSAhPSBudWxsKQ0KKwkgIHsNCisJICAgIGhhcm5lc3MuZGVidWco IiBleDogIiArIGxpbmUpOw0KKwkgICAgbGluZSA9IGJyLnJlYWRMaW5lKCk7 DQorCSAgfQ0KKyAgICAgIH0NCisgICAgY2F0Y2goSU9FeGNlcHRpb24gaW9l KQ0KKyAgICAgIHsNCisgICAgICB9DQorICB9DQorDQorICBwdWJsaWMgc3Rh dGljIHZvaWQgbWFpbihTdHJpbmdbXSBhcmdzKSB0aHJvd3MgRXhjZXB0aW9u DQorICB7DQorICAgIERhdGFJbnB1dFN0cmVhbSBkaXMgPSBuZXcgRGF0YUlu cHV0U3RyZWFtKFN5c3RlbS5pbik7DQorICAgIERhdGFPdXRwdXRTdHJlYW0g ZG9zID0gbmV3IERhdGFPdXRwdXRTdHJlYW0oU3lzdGVtLm91dCk7DQorDQor ICAgIFN0cmluZyBmaWxlID0gZGlzLnJlYWRVVEYoKTsNCisgICAgUmFuZG9t QWNjZXNzRmlsZSByYWYgPSBuZXcgUmFuZG9tQWNjZXNzRmlsZShmaWxlLCAi cnciKTsNCisgICAgRmlsZUNoYW5uZWwgY2hhbm5lbCA9IHJhZi5nZXRDaGFu bmVsKCk7DQorDQorICAgIC8vIExldCB0aGUgb3RoZXIgcHJvY2VzcyBrbm93 IHdlIGFyZSByZWFkeS4NCisgICAgZG9zLndyaXRlVVRGKCJPcGVuZWQgZmls ZTogIiArIGZpbGUpOw0KKyAgICBkb3MuZmx1c2goKTsNCisNCisgICAgdHJ5 DQorICAgICAgew0KKwlTdHJpbmcgY29tbWFuZCA9IGRpcy5yZWFkVVRGKCk7 DQorCXdoaWxlIChjb21tYW5kICE9IG51bGwgJiYgIWNvbW1hbmQuZXF1YWxz KCJxdWl0IikpDQorCSAgew0KKwkgICAgbG9uZyBwb3NpdGlvbiA9IGRpcy5y ZWFkTG9uZygpOw0KKwkgICAgbG9uZyBzaXplID0gZGlzLnJlYWRMb25nKCk7 DQorCSAgICBib29sZWFuIHNoYXJlZCA9IGRpcy5yZWFkQm9vbGVhbigpOw0K KwkgICAgDQorCSAgICAvLyBUaGlzIHdpbGwgYmUgcHJpbnRlZCBieSB0aGUg bWFpbiBwcm9jZXNzIHdpdGggaGFybmVzcy5kZWJ1ZygpDQorCSAgICBTeXN0 ZW0uZXJyLnByaW50bG4oIlJlY3Y6ICINCisJCQkgICAgICAgKyBwb3NpdGlv biArICIsICIgKyBzaXplICsgIiAoIiArIHNoYXJlZCArICIpIik7DQorDQor CSAgICBTdHJpbmcgd2hhdCA9ICJsb2NrWyIgKyBwb3NpdGlvbiArICIsIiAr IHNpemUgKyAiLCIgKyBzaGFyZWQgKyAiXSI7DQorCSAgICBTdHJpbmcgbWVz c2FnZSA9ICJYIjsNCisJICAgIGJvb2xlYW4gcmVzdWx0ID0gdHJ1ZTsNCisJ ICAgIA0KKwkgICAgLy8gVHJ5IHRvIGdldCB0aGUgc2FtZSAoYW5kIGV4Y2x1 c2l2ZSkgbG9jaw0KKwkgICAgLy8gVGhpcyBzaG91bGQgYWx3YXlzIGZhaWwu DQorCSAgICBGaWxlTG9jayBsb2NrID0gbnVsbDsNCisJICAgIHRyeQ0KKwkg ICAgICB7DQorCQlsb2NrID0gY2hhbm5lbC50cnlMb2NrKHBvc2l0aW9uLCBz aXplLCBmYWxzZSk7DQorCQlpZiAobG9jayAhPSBudWxsKQ0KKwkJICB7DQor CQkgICAgcmVzdWx0ID0gZmFsc2U7DQorCQkgICAgbWVzc2FnZSA9ICJHb3Qg bG9jazogIiArIGxvY2s7DQorCQkgIH0NCisJICAgICAgfQ0KKwkgICAgZmlu YWxseQ0KKwkgICAgICB7DQorCQkvLyBDbGVhbiB1cCBhbnl3YXkNCisJCXRy eQ0KKwkJICB7DQorCQkgICAgbG9jay5yZWxlYXNlKCk7DQorCQkgICAgbG9j ayA9IG51bGw7DQorCQkgIH0NCisJCWNhdGNoKFRocm93YWJsZSB0KQ0KKwkJ ICB7DQorCQkgIH0NCisJICAgICAgfQ0KKw0KKwkgICAgLy8gSWYgd2UgY291 bGRuJ3QgZ2V0IGFuIGV4Y2x1c2l2ZSBsb2NrIGFuZCB0aGUgbG9jayBpcyBz aGFyZWQsDQorCSAgICAvLyB3ZSBzaG91bGQgYmUgYWJsZSB0byBnZXQgYSBz aGFyZWQgbG9jaw0KKwkgICAgaWYgKHJlc3VsdCAmJiBzaGFyZWQpDQorCSAg ICAgIHsNCisJCXRyeQ0KKwkJICB7DQorCQkgICAgbG9jayA9IGNoYW5uZWwu dHJ5TG9jayhwb3NpdGlvbiwgc2l6ZSwgdHJ1ZSk7DQorCQkgICAgaWYgKGxv Y2sgPT0gbnVsbCkNCisJCSAgICAgIHsNCisJCQlyZXN1bHQgPSBmYWxzZTsN CisJCQltZXNzYWdlID0gIkNvdWxkbid0IGdldCBzaGFyZWQgbG9jayI7DQor CQkgICAgICB9DQorCQkgIH0NCisJCWZpbmFsbHkNCisJCSAgew0KKwkJICAg IC8vIENsZWFuIHVwDQorCQkgICAgdHJ5DQorCQkgICAgICB7DQorCQkJbG9j ay5yZWxlYXNlKCk7DQorCQkJbG9jayA9IG51bGw7DQorCQkgICAgICB9DQor CQkgICAgY2F0Y2goVGhyb3dhYmxlIHQpDQorCQkgICAgICB7DQorCQkgICAg ICB9DQorCQkgIH0NCisJICAgICAgfQ0KKw0KKwkgICAgaWYgKHJlc3VsdCkN CisJICAgICAgZG9zLndyaXRlVVRGKCJPSzogIiArIHdoYXQpOw0KKwkgICAg ZWxzZQ0KKwkgICAgICBkb3Mud3JpdGVVVEYoIkZhaWxlZDogIiArIHdoYXQg KyAiOiAiICsgbWVzc2FnZSk7DQorCSAgICBkb3Mud3JpdGVCb29sZWFuKHJl c3VsdCk7DQorCSAgICBkb3MuZmx1c2goKTsNCisNCisJICAgIGNvbW1hbmQg PSBkaXMucmVhZFVURigpOw0KKwkgIH0NCisgICAgICB9DQorICAgIGNhdGNo IChUaHJvd2FibGUgdCkNCisgICAgICB7DQorCS8vIFVyZ2gNCisJZG9zLndy aXRlVVRGKCJFeHRlcm5hbCBlcnJvcjogIiArIHQudG9TdHJpbmcoKSk7DQor CXQucHJpbnRTdGFja1RyYWNlKCk7DQorCVN5c3RlbS5lcnIuZmx1c2goKTsN CisgICAgICB9DQorICB9DQorfQ0K --=-FXOcnpRqDe0b6WnA6nuo-- --=-jDtQIVvhNwj1s7i4X57y Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part Content-length: 189 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQBC7Q2AxVhZCJWr9QwRAtptAJ9nsh1M54gsLDciwA5g3r4WelxrMwCgqCeI rSRJon5/tHOjW/PlxjlBGSQ= =xinE -----END PGP SIGNATURE----- --=-jDtQIVvhNwj1s7i4X57y--