57096 2011-03-25 05:50:53 -0700 REGRESSION(r81953): "inspector test breakage: part 2/2" (Requested by apavlov on #webkit). 2011-03-25 06:39:42 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 56310 1 webkit.review.bot webkit.review.bot apavlov commit-queue pfeldman oldest_to_newest 373460 0 webkit.review.bot 2011-03-25 05:50:53 -0700 http://trac.webkit.org/changeset/81953 broke the build: "inspector test breakage: part 2/2" (Requested by apavlov on #webkit). This is an automatic bug report generated by the sheriff-bot. If this bug report was created because of a flaky test, please file a bug for the flaky test (if we don't already have one on file) and dup this bug against that bug so that we can track how often these flaky tests case pain. "Only you can prevent forest fires." -- Smokey the Bear 373461 1 86925 webkit.review.bot 2011-03-25 05:51:15 -0700 Created attachment 86925 ROLLOUT of r81953 Any committer can land this patch automatically by marking it commit-queue+. The commit-queue will build and test the patch before landing to ensure that the rollout will be successful. This process takes approximately 15 minutes. If you would like to land the rollout faster, you can use the following command: webkit-patch land-attachment ATTACHMENT_ID --ignore-builders where ATTACHMENT_ID is the ID of this attachment. 373480 2 86925 commit-queue 2011-03-25 06:39:38 -0700 Comment on attachment 86925 ROLLOUT of r81953 Clearing flags on attachment: 86925 Committed r81957: <http://trac.webkit.org/changeset/81957> 373481 3 commit-queue 2011-03-25 06:39:42 -0700 All reviewed patches have been landed. Closing bug. 86925 2011-03-25 05:51:15 -0700 2011-03-25 06:39:38 -0700 ROLLOUT of r81953 bug-57096-20110325124909.patch text/plain 21053 webkit.review.bot U3VidmVyc2lvbiBSZXZpc2lvbjogODE5NTYKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA2MzMzNzEzN2M3YmZiNmRkYTg1Zjk3 NDU3M2I4YTAxMjQ1MWViMDc1Li44YjNiMmZjNGU2NmEwMWMwNDU1OTliNTc5YzJmMDhiNzczYTYw Zjk3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDUgKzEsMTggQEAKIDIwMTEtMDMtMjUgIFNoZXJpZmYgQm90ICA8d2Vi a2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCisgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcg b3V0IHI4MTk1My4KKyAgICAgICAgaHR0cDovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvODE5 NTMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU3MDk2 CisKKyAgICAgICAgImluc3BlY3RvciB0ZXN0IGJyZWFrYWdlOiBwYXJ0IDIvMiIgKFJlcXVlc3Rl ZCBieSBhcGF2bG92IG9uCisgICAgICAgICN3ZWJraXQpLgorCisgICAgICAgICogaW5zcGVjdG9y L3N0eWxlcy9nZXQtc2V0LXN0eWxlc2hlZXQtdGV4dC1leHBlY3RlZC50eHQ6IFJlbW92ZWQuCisg ICAgICAgICogaW5zcGVjdG9yL3N0eWxlcy9nZXQtc2V0LXN0eWxlc2hlZXQtdGV4dC5odG1sOiBS ZW1vdmVkLgorICAgICAgICAqIGluc3BlY3Rvci9zdHlsZXMvc3R5bGVzLW5ldy1BUEkuaHRtbDoK KworMjAxMS0wMy0yNSAgU2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+ CisKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjgxOTU0LgogICAgICAgICBodHRw Oi8vdHJhYy53ZWJraXQub3JnL2NoYW5nZXNldC84MTk1NAogICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTcwOTQKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L2luc3BlY3Rvci9zdHlsZXMvZ2V0LXNldC1zdHlsZXNoZWV0LXRleHQtZXhwZWN0ZWQudHh0IGIv TGF5b3V0VGVzdHMvaW5zcGVjdG9yL3N0eWxlcy9nZXQtc2V0LXN0eWxlc2hlZXQtdGV4dC1leHBl Y3RlZC50eHQKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDZiNzUzNTlmYjMzM2ZiNzU5 ZjdiYTkyYTZhMjRlM2FlMGQwZGM1NmQuLjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3N0eWxlcy9nZXQtc2V0LXN0eWxl c2hlZXQtdGV4dC1leHBlY3RlZC50eHQKKysrIC9kZXYvbnVsbApAQCAtMSw0MCArMCwwIEBACi1U ZXN0cyB0aGF0IFdlYkluc3BlY3Rvci5DU1NTdHlsZVNoZWV0IG1ldGhvZHMgd29yayBhcyBleHBl Y3RlZC4KLQotSW5zcGVjdCBNZQotCi0KLVJ1bm5pbmc6IHRlc3RTZXRUZXh0Ci09PT0gT3JpZ2lu YWwgc3R5bGVzaGVldCB0ZXh0OiA9PT0KLWJvZHkgewotICAgIGZvbnQtc2l6ZTogMTJweDsKLSAg ICBmb286IGJhciAhCi0KLSAgICBpbXBvcnRhbnQgLyogIWltcG9ydGFudCBwcm9wZXJ0eSBub3Qg cmVjb2duaXplZCBieSBXZWJDb3JlICovOwotICAgIGhlaWdodDogMTAwJSAhaW1wb3J0YW50Owot ICAgIGNvbG9yejogIiFpbXBvcnRhbnQiOwotICAgIGltcG9ydGFudDohaW1wb3J0YW50OwotICAg IGNvbG9yOiAiYmFkY29sb3IiICEgaW1wb3J0YW50IC8qIGdvb2QgcHJvcGVydHkgd2l0aCBzdHJh bmdlIHZhbHVlICovOwotfQotCi0vKiBjb21tZW50IGJlZm9yZSBzZWxlY3RvciAqL2JvZHkubWFp bjEvKiBjb21tZW50IGFmdGVyIHNlbGVjdG9yICovey8qIGNvbW1lbnQgKi9jb2xvcjogI0YwMEJB QTt6b286bW9vIC8qIG5vdCBhbiAhaW1wb3J0YW50IHVucmVjb2duaXplZCBwcm9wZXJ0eSAqL30v KiBjb21tZW50ICovCi0KLWJvZHkubWFpbjJ7YmFja2dyb3VuZDogZ3JlZW4gLyogdmFsdWUgIWlt cG9ydGFudCBjb21tZW50ICovICFpbXBvcnRhbnQgLyogbm8gc2VtaWNvbG9uLCB2ZXJ5ICFpbXBv cnRhbnQgKi99Ci0KLQotUnVubmluZzogdGVzdE5ld0VsZW1lbnRTdHlsZXMKLT09PSBNYXRjaGVk IHJ1bGVzIGZvciBoMSBhZnRlciBzZXRUZXh0KCkgPT09Ci0KLXJ1bGUKLWgxOiBbdXNlci1hZ2Vu dF0KLVsnZGlzcGxheSc6J2Jsb2NrJ10gQFt1bmRlZmluZWQtdW5kZWZpbmVkXSBzdHlsZQotWydm b250LXNpemUnOicyZW0nXSBAW3VuZGVmaW5lZC11bmRlZmluZWRdIHN0eWxlCi1bJy13ZWJraXQt bWFyZ2luLWJlZm9yZSc6JzAuNjdlbSddIEBbdW5kZWZpbmVkLXVuZGVmaW5lZF0gc3R5bGUKLVsn LXdlYmtpdC1tYXJnaW4tYWZ0ZXInOicwLjY3ZW0nXSBAW3VuZGVmaW5lZC11bmRlZmluZWRdIHN0 eWxlCi1bJy13ZWJraXQtbWFyZ2luLXN0YXJ0JzonMHB4J10gQFt1bmRlZmluZWQtdW5kZWZpbmVk XSBzdHlsZQotWyctd2Via2l0LW1hcmdpbi1lbmQnOicwcHgnXSBAW3VuZGVmaW5lZC11bmRlZmlu ZWRdIHN0eWxlCi1bJ2ZvbnQtd2VpZ2h0JzonYm9sZCddIEBbdW5kZWZpbmVkLXVuZGVmaW5lZF0g c3R5bGUKLQotcnVsZQotaDE6IFtdCi1bJ2NvbG9yJzoncmVkJ10gQFsxLTEyXSBhY3RpdmUKLQpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3N0eWxlcy9nZXQtc2V0LXN0eWxlc2hl ZXQtdGV4dC5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3N0eWxlcy9nZXQtc2V0LXN0eWxl c2hlZXQtdGV4dC5odG1sCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAxODIzY2JhZmI4 YTU1NTA2NjNkYzAyNDU4MjY2MWQ0NDIwMDIyMGI4Li4wMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwCi0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9zdHlsZXMvZ2V0LXNl dC1zdHlsZXNoZWV0LXRleHQuaHRtbAorKysgL2Rldi9udWxsCkBAIC0xLDExNyArMCwwIEBACi08 aHRtbD4KLTxoZWFkPgotCi08c3R5bGU+Ci0KLS8qIEFuIGlubGluZSBzdHlsZXNoZWV0ICovCi1i b2R5Lm1haW5wYWdlIHsKLSAgICB0ZXh0LWRlY29yYXRpb246IG5vbmU7Ci19Ci08L3N0eWxlPgot Ci08bGluayByZWw9InN0eWxlc2hlZXQiIGhyZWY9InJlc291cmNlcy9nZXQtc2V0LXN0eWxlc2hl ZXQtdGV4dC5jc3MiPgotCi08c2NyaXB0IHNyYz0iLi4vLi4vaHR0cC90ZXN0cy9pbnNwZWN0b3Iv aW5zcGVjdG9yLXRlc3QuanMiPjwvc2NyaXB0PgotPHNjcmlwdCBzcmM9Ii4uLy4uL2h0dHAvdGVz dHMvaW5zcGVjdG9yL2VsZW1lbnRzLXRlc3QuanMiPjwvc2NyaXB0PgotPHNjcmlwdD4KLQotZnVu Y3Rpb24gdGVzdCgpCi17Ci0gICAgdmFyIGZvdW5kU3R5bGVTaGVldDsKLQotICAgIENTU0FnZW50 LmdldEFsbFN0eWxlU2hlZXRzKGZpbmRTdHlsZVNoZWV0KTsKLQotICAgIGZ1bmN0aW9uIGZpbmRT dHlsZVNoZWV0KGVycm9yLCBzdHlsZVNoZWV0SW5mb3MpCi0gICAgewotICAgICAgICBmdW5jdGlv biBjYWxsYmFjayhzdHlsZVNoZWV0KQotICAgICAgICB7Ci0gICAgICAgICAgICBmb3VuZFN0eWxl U2hlZXQgPSBzdHlsZVNoZWV0OwotICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5ydW5UZXN0U3Vp dGUoWyB0ZXN0U2V0VGV4dCwgdGVzdE5ld0VsZW1lbnRTdHlsZXMgXSk7Ci0gICAgICAgIH0KLQot ICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHN0eWxlU2hlZXRJbmZvcy5sZW5ndGg7ICsraSkg ewotICAgICAgICAgICAgaWYgKHN0eWxlU2hlZXRJbmZvc1tpXS5zb3VyY2VVUkwuaW5kZXhPZigi Z2V0LXNldC1zdHlsZXNoZWV0LXRleHQuY3NzIikgPj0gMCkgewotICAgICAgICAgICAgICAgIFdl Ykluc3BlY3Rvci5DU1NTdHlsZVNoZWV0LmNyZWF0ZUZvcklkKHN0eWxlU2hlZXRJbmZvc1tpXS5z dHlsZVNoZWV0SWQsIGNhbGxiYWNrKTsKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAg ICAgIH0KLSAgICAgICAgfQotICAgIH0KLQotICAgIGZ1bmN0aW9uIHRlc3RTZXRUZXh0KG5leHQp Ci0gICAgewotICAgICAgICBmdW5jdGlvbiBjYWxsYmFjayhzdWNjZXNzKQotICAgICAgICB7Ci0g ICAgICAgICAgICBpZiAoIXN1Y2Nlc3MpIHsKLSAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0 LmFkZEVycm9yKCJGYWlsZWQgdG8gc2V0IHN0eWxlc2hlZXQgdGV4dCIpOwotICAgICAgICAgICAg ICAgIHJldHVybjsKLSAgICAgICAgICAgIH0KLQotICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5y dW5BZnRlclBlbmRpbmdEaXNwYXRjaGVzKG5leHQpOwotICAgICAgICB9Ci0KLSAgICAgICAgSW5z cGVjdG9yVGVzdC5hZGRSZXN1bHQoIj09PSBPcmlnaW5hbCBzdHlsZXNoZWV0IHRleHQ6ID09PSIp OwotICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdChmb3VuZFN0eWxlU2hlZXQuZ2V0VGV4 dCgpKTsKLSAgICAgICAgZm91bmRTdHlsZVNoZWV0LnNldFRleHQoImgxIHsgY29sb3I6IHJlZDsg fSIsIGNhbGxiYWNrKTsKLSAgICB9Ci0KLSAgICBmdW5jdGlvbiB0ZXN0TmV3RWxlbWVudFN0eWxl cygpCi0gICAgewotICAgICAgICBmdW5jdGlvbiBjYWxsYmFjayhlcnJvciwgc3R5bGVzKQotICAg ICAgICB7Ci0gICAgICAgICAgICBpZiAoZXJyb3IpIHsKLSAgICAgICAgICAgICAgICBJbnNwZWN0 b3JUZXN0LmFkZEVycm9yKCJlcnJvcjogIiArIGVycm9yKTsKLSAgICAgICAgICAgICAgICByZXR1 cm47Ci0gICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0 KCI9PT0gTWF0Y2hlZCBydWxlcyBmb3IgaDEgYWZ0ZXIgc2V0VGV4dCgpID09PSIpOwotICAgICAg ICAgICAgZHVtcFJ1bGVzQXJyYXkoc3R5bGVzLm1hdGNoZWRDU1NSdWxlcyk7Ci0gICAgICAgICAg ICBJbnNwZWN0b3JUZXN0LmNvbXBsZXRlVGVzdCgpOwotICAgICAgICB9Ci0KLSAgICAgICAgZnVu Y3Rpb24gbm9kZUNhbGxiYWNrKG5vZGUpCi0gICAgICAgIHsKLSAgICAgICAgICAgIENTU0FnZW50 LmdldFN0eWxlc0Zvck5vZGUobm9kZS5pZCwgY2FsbGJhY2spOwotICAgICAgICB9Ci0KLSAgICAg ICAgSW5zcGVjdG9yVGVzdC5zZWxlY3ROb2RlV2l0aElkKCJpbnNwZWN0ZWQiLCBub2RlQ2FsbGJh Y2spOwotICAgIH0KLQotCi0gICAgLy8gRGF0YSBkdW1waW5nCi0KLSAgICBmdW5jdGlvbiBkdW1w UnVsZXNBcnJheShydWxlcykKLSAgICB7Ci0gICAgICAgIGlmICghcnVsZXMpCi0gICAgICAgICAg ICByZXR1cm47Ci0gICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgcnVsZXMubGVuZ3RoOyArK2kp Ci0gICAgICAgICAgICBkdW1wUnVsZU9yU3R5bGUocnVsZXNbaV0pOwotICAgIH0KLQotICAgIGZ1 bmN0aW9uIGR1bXBSdWxlT3JTdHlsZShydWxlT3JTdHlsZSkKLSAgICB7Ci0gICAgICAgIGlmICgh cnVsZU9yU3R5bGUpCi0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIHZhciBpc1J1bGUgPSAh IShydWxlT3JTdHlsZS5zdHlsZSk7Ci0gICAgICAgIHZhciBzdHlsZSA9IGlzUnVsZSA/IHJ1bGVP clN0eWxlLnN0eWxlIDogcnVsZU9yU3R5bGU7Ci0gICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVz dWx0KCIiKTsKLSAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoaXNSdWxlID8gInJ1bGUi IDogInN0eWxlIik7Ci0gICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KChpc1J1bGUgPyAo cnVsZU9yU3R5bGUuc2VsZWN0b3JUZXh0ICsgIjogWyIgKyBydWxlT3JTdHlsZS5vcmlnaW4gKyAi XSIpIDogInJhdyBzdHlsZSIpKTsKLSAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBzdHlsZS5j c3NQcm9wZXJ0aWVzLmxlbmd0aDsgKytpKSB7Ci0gICAgICAgICAgICB2YXIgcHJvcGVydHkgPSBz dHlsZS5jc3NQcm9wZXJ0aWVzW2ldOwotICAgICAgICAgICAgaWYgKHByb3BlcnR5LnN0YXR1cyAh PT0gImRpc2FibGVkIikKLSAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdCgi WyciICsgcHJvcGVydHkubmFtZSArICInOiciICsgcHJvcGVydHkudmFsdWUgKyAiJyIgKyAocHJv cGVydHkucHJpb3JpdHkgPT09ICJpbXBvcnRhbnQiID8gIiBpcy1pbXBvcnRhbnQiIDogIiIpICsg KCgicGFyc2VkT2siIGluIHByb3BlcnR5KSA/ICIgbm9uLXBhcnNlZCIgOiAiIikgKyJdIEBbIiAr IHByb3BlcnR5LnN0YXJ0T2Zmc2V0ICsgIi0iICsgcHJvcGVydHkuZW5kT2Zmc2V0ICsgIl0gIiAr IChwcm9wZXJ0eS5zdGF0dXMgfHwgInN0eWxlIikpOwotICAgICAgICAgICAgZWxzZQotICAgICAg ICAgICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KCJbdGV4dD0nIiArIHByb3BlcnR5LnRl eHQgKyAiJ10gIiArIHByb3BlcnR5LnN0YXR1cyk7Ci0gICAgICAgIH0KLSAgICB9Ci19Ci08L3Nj cmlwdD4KLTwvaGVhZD4KLQotPGJvZHkgb25sb2FkPSJydW5UZXN0KCkiPgotPHA+Ci1UZXN0cyB0 aGF0IFdlYkluc3BlY3Rvci5DU1NTdHlsZVNoZWV0IG1ldGhvZHMgd29yayBhcyBleHBlY3RlZC4K LTwvcD4KLTxoMSBpZD0iaW5zcGVjdGVkIj5JbnNwZWN0IE1lPC9oMT4KLTwvYm9keT4KLTwvaHRt bD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9zdHlsZXMvc3R5bGVzLW5ldy1B UEkuaHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9zdHlsZXMvc3R5bGVzLW5ldy1BUEkuaHRt bAppbmRleCA2YzkyNTEyNTVmZDVlNDMwZTYwOWI1ZGViZGQ3MTk2NmJmZGNlMDU5Li4yZmU2MmIy ZTc2N2Y0YTkzZjA4N2UxM2ZhM2EyN2I5Y2Q3N2FiMWNmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9pbnNwZWN0b3Ivc3R5bGVzL3N0eWxlcy1uZXctQVBJLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMv aW5zcGVjdG9yL3N0eWxlcy9zdHlsZXMtbmV3LUFQSS5odG1sCkBAIC0xMDIsNyArMTAyLDcgQEAg ZnVuY3Rpb24gdGVzdCgpCiAgICAgICAgICAgICAgICAgbG9hZEFuZER1bXBTdHlsZVNoZWV0LmJp bmQobnVsbCwgc3R5bGVTaGVldC5zdHlsZVNoZWV0SWQsIHRlc3RfY2hhbmdlU2VsZWN0b3IpKTsK ICAgICAgICAgfQogCi0gICAgICAgIGZ1bmN0aW9uIHN0eWxlU2hlZXRJbmZvc0xvYWRlZChlcnJv ciwgaW5mb3MpCisgICAgICAgIGZ1bmN0aW9uIHN0eWxlU2hlZXRJZHNMb2FkZWQoZXJyb3IsIGlk cykKICAgICAgICAgewogICAgICAgICAgICAgaWYgKGVycm9yKSB7CiAgICAgICAgICAgICAgICAg SW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoImVycm9yOiAiICsgZXJyb3IpOwpAQCAtMTEwLDEwICsx MTAsMTAgQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBJbnNw ZWN0b3JUZXN0LmFkZFJlc3VsdCgiIik7CiAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJl c3VsdCgiPT09IEFsbCBzdHlsZXNoZWV0cyA9PT0iKTsKLSAgICAgICAgICAgIGZvciAodmFyIGkg PSAwOyBpIDwgaW5mb3MubGVuZ3RoOyArK2kpCi0gICAgICAgICAgICAgICAgbG9hZEFuZER1bXBT dHlsZVNoZWV0KGluZm9zW2ldLnN0eWxlU2hlZXRJZCwgKGkgPCBpbmZvcy5sZW5ndGggLSAxKSA/ IG51bGwgOiBwYXRjaFN0eWxlU2hlZXQpOworICAgICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkg PCBpZHMubGVuZ3RoOyArK2kpCisgICAgICAgICAgICAgICAgbG9hZEFuZER1bXBTdHlsZVNoZWV0 KGlkc1tpXSwgKGkgPCBpZHMubGVuZ3RoIC0gMSkgPyBudWxsIDogcGF0Y2hTdHlsZVNoZWV0KTsK ICAgICAgICAgfQotICAgICAgICBDU1NBZ2VudC5nZXRBbGxTdHlsZVNoZWV0cyhzdHlsZVNoZWV0 SW5mb3NMb2FkZWQpOworICAgICAgICBDU1NBZ2VudC5nZXRBbGxTdHlsZXMoc3R5bGVTaGVldElk c0xvYWRlZCk7CiAgICAgfQogCiAgICAgZnVuY3Rpb24gdGVzdF9jaGFuZ2VTZWxlY3RvcihzdHls ZVNoZWV0KQpAQCAtMjk2LDE0ICsyOTYsMTMgQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgZnVuY3Rp b24gbG9hZEFuZER1bXBTdHlsZVNoZWV0KHN0eWxlU2hlZXRJZCwgY29udGludWF0aW9uLCBlcnJv cikKICAgICB7CiAgICAgICAgIGlmIChlcnJvcikgewotICAgICAgICAgICAgSW5zcGVjdG9yVGVz dC5hZGRFcnJvcigiZXJyb3I6ICIgKyBlcnJvcik7CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0 LmFkZFJlY29yZCgiZXJyb3I6ICIgKyBlcnJvcik7CiAgICAgICAgICAgICByZXR1cm47CiAgICAg ICAgIH0KLQogICAgICAgICBmdW5jdGlvbiBzdHlsZVNoZWV0TG9hZGVkKGVycm9yLCBzdHlsZVNo ZWV0KQogICAgICAgICB7CiAgICAgICAgICAgICBpZiAoZXJyb3IpIHsKLSAgICAgICAgICAgICAg ICBJbnNwZWN0b3JUZXN0LmFkZEVycm9yKCJlcnJvcjogIiArIGVycm9yKTsKKyAgICAgICAgICAg ICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlY29yZCgiZXJyb3I6ICIgKyBlcnJvcik7CiAgICAgICAg ICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgSW5zcGVjdG9yVGVz dC5hZGRSZXN1bHQoIiIpOwpAQCAtMzIxLDcgKzMyMCw3IEBAIGZ1bmN0aW9uIHRlc3QoKQogLyoK IENvdmVyZWQgQVBJIG1ldGhvZHM6CiAgLSBnZXRTdHlsZXNGb3JOb2RlCi0gLSBnZXRBbGxTdHls ZVNoZWV0cworIC0gZ2V0QWxsU3R5bGVzCiAgLSBnZXRTdHlsZVNoZWV0CiAgLSBzZXRTdHlsZVNo ZWV0VGV4dAogIC0gc2V0U3R5bGVEYXRhCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFu Z2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTVlY2FiMDgzY2VmYWVhMzBj YjQ0ZjE2MmEwMTUzNmQ0Nzg2MGFhYy4uMzg1M2U2N2UwMGFlODhmMTMyNTUyNGZjODFhY2NjNTNh YzY2ZmExNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDExLTAzLTI1ICBTaGVyaWZm IEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KKworICAgICAgICBVbnJldmlld2Vk LCByb2xsaW5nIG91dCByODE5NTMuCisgICAgICAgIGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hh bmdlc2V0LzgxOTUzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD01NzA5NgorCisgICAgICAgICJpbnNwZWN0b3IgdGVzdCBicmVha2FnZTogcGFydCAyLzIi IChSZXF1ZXN0ZWQgYnkgYXBhdmxvdiBvbgorICAgICAgICAjd2Via2l0KS4KKworICAgICAgICAq IGluc3BlY3Rvci9JbnNwZWN0b3IuanNvbjoKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9y Q1NTQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ1NTQWdlbnQ6OmdldEFs bFN0eWxlcyk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckNTU0FnZW50Lmg6CisgICAg ICAgICogaW5zcGVjdG9yL0luc3BlY3RvclN0eWxlU2hlZXQuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6SW5zcGVjdG9yU3R5bGVTaGVldDo6YnVpbGRPYmplY3RGb3JTdHlsZVNoZWV0KToKKyAgICAg ICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yU3R5bGVTaGVldC5oOgorICAgICAgICAqIGluc3BlY3Rv ci9mcm9udC1lbmQvQXVkaXRSdWxlcy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5BdWRpdFJ1 bGVzLlVudXNlZENzc1J1bGUucHJvdG90eXBlLmRvUnVuLnN0eWxlU2hlZXRDYWxsYmFjayk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuQXVkaXRSdWxlcy5VbnVzZWRDc3NSdWxlLnByb3RvdHlwZS5k b1J1bi5hbGxTdHlsZXNDYWxsYmFjayk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQXVkaXRSdWxl cy5VbnVzZWRDc3NSdWxlLnByb3RvdHlwZS5kb1J1bik6CisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9DU1NTdHlsZU1vZGVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNTU1N0eWxl TW9kZWwucHJvdG90eXBlLl9zdHlsZVNoZWV0Q2hhbmdlZC5jYWxsYmFjayk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuQ1NTU3R5bGVNb2RlbC5wcm90b3R5cGUuX3N0eWxlU2hlZXRDaGFuZ2VkKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5DU1NTdHlsZU1vZGVsLnByb3RvdHlwZS5fb25SZXZlcnQp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNTU1N0eWxlU2hlZXQpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkNTU1N0eWxlU2hlZXQucHJvdG90eXBlLnNldFRleHQpOgorCiAyMDExLTAzLTE1ICBB bGV4YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgUGF2ZWwgRmVsZG1hbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3IuanNvbiBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNv bgppbmRleCA5OTZmNGVjMThhNjM2ZjIwNWVmMDhkNjg1OTVjNzg2ZDM0MjMzMzM0Li40MTkzOTM5 ZGRmMTQwZWYwNDYyNTE0NzE1MGM3ZTA1YWJmYTU1NTJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3Rvci5qc29uCkBAIC04ODEsOSArODgxLDkgQEAKICAgICAgICAgICAgICAgICBd CiAgICAgICAgICAgICB9LAogICAgICAgICAgICAgewotICAgICAgICAgICAgICAgICJuYW1lIjog ImdldEFsbFN0eWxlU2hlZXRzIiwKKyAgICAgICAgICAgICAgICAibmFtZSI6ICJnZXRBbGxTdHls ZXMiLAogICAgICAgICAgICAgICAgICJyZXR1cm5zIjogWwotICAgICAgICAgICAgICAgICAgICB7 ICJuYW1lIjogInN0eWxlU2hlZXRJbmZvcyIsICJ0eXBlIjogImFycmF5IiwgIml0ZW1zIjogeyAi JHJlZiI6ICJDU1NTdHlsZVNoZWV0SW5mbyIgfSB9CisgICAgICAgICAgICAgICAgICAgIHsgIm5h bWUiOiAic3R5bGVTaGVldElkcyIsICJ0eXBlIjogImFycmF5IiwgIml0ZW1zIjogeyAidHlwZSI6 ICJzdHJpbmciIH0gfQogICAgICAgICAgICAgICAgIF0KICAgICAgICAgICAgIH0sCiAgICAgICAg ICAgICB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ1NT QWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNTU0FnZW50LmNw cAppbmRleCBlZDRlMjQ1MDhlODUyN2ZiNDc2YTZmZTRmNWY2NjVmZWM0NjQ5NWMzLi5hODg3M2Jm ODFiMzUzNTdlOTMxOTEzZmEwMTliYTEzYTRmMWZhNmJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ1NTQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JDU1NBZ2VudC5jcHAKQEAgLTEwNCwyMSArMTA0LDE3IEBACiAv LyAgICBzZWxlY3RvclJhbmdlOiB7IHN0YXJ0OiA8bnVtYmVyPiwgZW5kOiA8bnVtYmVyPiB9IC8v IE9wdGlvbmFsIC0gZm9yIHNvdXJjZS1iYXNlZCBydWxlcyBvbmx5CiAvLyB9CiAvLwotLy8gY3Nz U3R5bGVTaGVldEluZm8gPSB7Ci0vLyAgICBzdHlsZVNoZWV0SWQgOiA8bnVtYmVyPgotLy8gICAg c291cmNlVVJMICAgIDogPHN0cmluZz4KLS8vICAgIHRpdGxlICAgICAgICA6IDxzdHJpbmc+Ci0v LyAgICBkaXNhYmxlZCAgICAgOiA8Ym9vbGVhbj4KLS8vIH0KLS8vCiAvLyBjc3NTdHlsZVNoZWV0 ID0gewotLy8gICAgc3R5bGVTaGVldElkIDogPG51bWJlcj4KLS8vICAgIHJ1bGVzICAgICAgICA6 IFsKLS8vICAgICAgICAgICAgICAgICAgICAgICAjY3NzUnVsZSwKLS8vICAgICAgICAgICAgICAg ICAgICAgICAuLi4KLS8vICAgICAgICAgICAgICAgICAgICAgICAjY3NzUnVsZQotLy8gICAgICAg ICAgICAgICAgICAgXQotLy8gICAgdGV4dCAgICAgICAgIDogPHN0cmluZz4gLy8gT3B0aW9uYWwg LSB3aGVuZXZlciB0aGUgdGV4dCBpcyBhdmFpbGFibGUgZm9yIGEgdGV4dC1iYXNlZCBzdHlsZXNo ZWV0CisvLyAgICBzdHlsZVNoZWV0SWQgICA6IDxudW1iZXI+CisvLyAgICBzb3VyY2VVUkwgICAg ICA6IDxzdHJpbmc+CisvLyAgICB0aXRsZSAgICAgICAgICA6IDxzdHJpbmc+CisvLyAgICBkaXNh YmxlZCAgICAgICA6IDxib29sZWFuPgorLy8gICAgcnVsZXMgICAgICAgICAgOiBbCisvLyAgICAg ICAgICAgICAgICAgICAgICAgICAjY3NzUnVsZSwKKy8vICAgICAgICAgICAgICAgICAgICAgICAg IC4uLgorLy8gICAgICAgICAgICAgICAgICAgICAgICAgI2Nzc1J1bGUKKy8vICAgICAgICAgICAg ICAgICAgICAgXQorLy8gICAgdGV4dCAgICAgICAgICAgOiA8c3RyaW5nPiAvLyBPcHRpb25hbCAt IHdoZW5ldmVyIHRoZSB0ZXh0IGlzIGF2YWlsYWJsZSBmb3IgYSB0ZXh0LWJhc2VkIHN0eWxlc2hl ZXQKIC8vIH0KIAogbmFtZXNwYWNlIFdlYkNvcmUgewpAQCAtMjU0LDcgKzI1MCw3IEBAIHZvaWQg SW5zcGVjdG9yQ1NTQWdlbnQ6OmdldENvbXB1dGVkU3R5bGVGb3JOb2RlKEVycm9yU3RyaW5nKiBl cnJvclN0cmluZywgaW50IG5vCiAgICAgKnN0eWxlID0gaW5zcGVjdG9yU3R5bGUtPmJ1aWxkT2Jq ZWN0Rm9yU3R5bGUoKTsKIH0KIAotdm9pZCBJbnNwZWN0b3JDU1NBZ2VudDo6Z2V0QWxsU3R5bGVT aGVldHMoRXJyb3JTdHJpbmcqLCBSZWZQdHI8SW5zcGVjdG9yQXJyYXk+KiBzdHlsZUluZm9zKQor dm9pZCBJbnNwZWN0b3JDU1NBZ2VudDo6Z2V0QWxsU3R5bGVzKEVycm9yU3RyaW5nKiwgUmVmUHRy PEluc3BlY3RvckFycmF5Piogc3R5bGVzKQogewogICAgIFZlY3RvcjxEb2N1bWVudCo+IGRvY3Vt ZW50cyA9IG1fZG9tQWdlbnQtPmRvY3VtZW50cygpOwogICAgIGZvciAoVmVjdG9yPERvY3VtZW50 Kj46Oml0ZXJhdG9yIGl0ID0gZG9jdW1lbnRzLmJlZ2luKCk7IGl0ICE9IGRvY3VtZW50cy5lbmQo KTsgKytpdCkgewpAQCAtMjYzLDcgKzI1OSw3IEBAIHZvaWQgSW5zcGVjdG9yQ1NTQWdlbnQ6Omdl dEFsbFN0eWxlU2hlZXRzKEVycm9yU3RyaW5nKiwgUmVmUHRyPEluc3BlY3RvckFycmF5PioKICAg ICAgICAgICAgIFN0eWxlU2hlZXQqIHN0eWxlU2hlZXQgPSBsaXN0LT5pdGVtKGkpOwogICAgICAg ICAgICAgaWYgKHN0eWxlU2hlZXQtPmlzQ1NTU3R5bGVTaGVldCgpKSB7CiAgICAgICAgICAgICAg ICAgSW5zcGVjdG9yU3R5bGVTaGVldCogaW5zcGVjdG9yU3R5bGVTaGVldCA9IGJpbmRTdHlsZVNo ZWV0KHN0YXRpY19jYXN0PENTU1N0eWxlU2hlZXQqPihzdHlsZVNoZWV0KSk7Ci0gICAgICAgICAg ICAgICAgKCpzdHlsZUluZm9zKS0+cHVzaE9iamVjdChpbnNwZWN0b3JTdHlsZVNoZWV0LT5idWls ZE9iamVjdEZvclN0eWxlU2hlZXRJbmZvKCkpOworICAgICAgICAgICAgICAgICgqc3R5bGVzKS0+ cHVzaFN0cmluZyhpbnNwZWN0b3JTdHlsZVNoZWV0LT5pZCgpKTsKICAgICAgICAgICAgIH0KICAg ICAgICAgfQogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JDU1NBZ2VudC5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNTU0Fn ZW50LmgKaW5kZXggODkzMjY2OGNjZmZhZDZlMzlkM2YzZjhiMDU3YWIyMWZlYzZlZTRkYS4uODdl Y2ExZTJkOGNhY2Y4OWVkZDY3NWEzZmJiOWE4YmQyOTBlNjQ4OSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNTU0FnZW50LmgKKysrIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvckNTU0FnZW50LmgKQEAgLTY0LDcgKzY0LDcgQEAgcHVibGlj OgogICAgIHZvaWQgZ2V0U3R5bGVzRm9yTm9kZShFcnJvclN0cmluZyosIGludCBub2RlSWQsIFJl ZlB0cjxJbnNwZWN0b3JPYmplY3Q+KiByZXN1bHQpOwogICAgIHZvaWQgZ2V0SW5saW5lU3R5bGVG b3JOb2RlKEVycm9yU3RyaW5nKiwgaW50IG5vZGVJZCwgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4q IHN0eWxlKTsKICAgICB2b2lkIGdldENvbXB1dGVkU3R5bGVGb3JOb2RlKEVycm9yU3RyaW5nKiwg aW50IG5vZGVJZCwgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4qIHN0eWxlKTsKLSAgICB2b2lkIGdl dEFsbFN0eWxlU2hlZXRzKEVycm9yU3RyaW5nKiwgUmVmUHRyPEluc3BlY3RvckFycmF5Piogc3R5 bGVTaGVldE1ldGFpbmZvcyk7CisgICAgdm9pZCBnZXRBbGxTdHlsZXMoRXJyb3JTdHJpbmcqLCBS ZWZQdHI8SW5zcGVjdG9yQXJyYXk+KiBzdHlsZXMpOwogICAgIHZvaWQgZ2V0U3R5bGVTaGVldChF cnJvclN0cmluZyosIGNvbnN0IFN0cmluZyYgc3R5bGVTaGVldElkLCBSZWZQdHI8SW5zcGVjdG9y T2JqZWN0PiogcmVzdWx0KTsKICAgICB2b2lkIGdldFN0eWxlU2hlZXRUZXh0KEVycm9yU3RyaW5n KiwgY29uc3QgU3RyaW5nJiBzdHlsZVNoZWV0SWQsIFN0cmluZyogdXJsLCBTdHJpbmcqIHJlc3Vs dCk7CiAgICAgdm9pZCBzZXRTdHlsZVNoZWV0VGV4dChFcnJvclN0cmluZyosIGNvbnN0IFN0cmlu ZyYgc3R5bGVTaGVldElkLCBjb25zdCBTdHJpbmcmIHRleHQsIGJvb2wqIHN1Y2Nlc3MpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclN0eWxlU2hlZXQuY3Bw IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclN0eWxlU2hlZXQuY3BwCmluZGV4 IDEzNDJkZDVkOTZjOWJmOTdlZDM1N2YzZmExZWI4MTg4ZjU0OWVhMjMuLjc3Y2NkZTAxNGE2NDA3 MDkxYWMyMjRjNDI3YjgyMzIwMjA2NWM3ODAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JTdHlsZVNoZWV0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yU3R5bGVTaGVldC5jcHAKQEAgLTcwOCw3ICs3MDgsOSBAQCBQYXNzUmVm UHRyPEluc3BlY3Rvck9iamVjdD4gSW5zcGVjdG9yU3R5bGVTaGVldDo6YnVpbGRPYmplY3RGb3JT dHlsZVNoZWV0KCkKICAgICAgICAgcmV0dXJuIDA7CiAKICAgICBSZWZQdHI8SW5zcGVjdG9yT2Jq ZWN0PiByZXN1bHQgPSBJbnNwZWN0b3JPYmplY3Q6OmNyZWF0ZSgpOwotICAgIHJlc3VsdC0+c2V0 U3RyaW5nKCJzdHlsZVNoZWV0SWQiLCBpZCgpKTsKKyAgICByZXN1bHQtPnNldEJvb2xlYW4oImRp c2FibGVkIiwgc3R5bGVTaGVldC0+ZGlzYWJsZWQoKSk7CisgICAgcmVzdWx0LT5zZXRTdHJpbmco InNvdXJjZVVSTCIsIGZpbmFsVVJMKCkpOworICAgIHJlc3VsdC0+c2V0U3RyaW5nKCJ0aXRsZSIs IHN0eWxlU2hlZXQtPnRpdGxlKCkpOwogICAgIFJlZlB0cjxDU1NSdWxlTGlzdD4gY3NzUnVsZUxp c3QgPSBDU1NSdWxlTGlzdDo6Y3JlYXRlKHN0eWxlU2hlZXQsIHRydWUpOwogICAgIFJlZlB0cjxJ bnNwZWN0b3JBcnJheT4gY3NzUnVsZXMgPSBidWlsZEFycmF5Rm9yUnVsZUxpc3QoY3NzUnVsZUxp c3QuZ2V0KCkpOwogICAgIHJlc3VsdC0+c2V0QXJyYXkoInJ1bGVzIiwgY3NzUnVsZXMucmVsZWFz ZSgpKTsKQEAgLTcxOCwyMCArNzIwLDggQEAgUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IElu c3BlY3RvclN0eWxlU2hlZXQ6OmJ1aWxkT2JqZWN0Rm9yU3R5bGVTaGVldCgpCiAgICAgaWYgKHN1 Y2Nlc3MpCiAgICAgICAgIHJlc3VsdC0+c2V0U3RyaW5nKCJ0ZXh0Iiwgc3R5bGVTaGVldFRleHQp OwogCi0gICAgcmV0dXJuIHJlc3VsdC5yZWxlYXNlKCk7Ci19Ci0KLVBhc3NSZWZQdHI8SW5zcGVj dG9yT2JqZWN0PiBJbnNwZWN0b3JTdHlsZVNoZWV0OjpidWlsZE9iamVjdEZvclN0eWxlU2hlZXRJ bmZvKCkKLXsKLSAgICBDU1NTdHlsZVNoZWV0KiBzdHlsZVNoZWV0ID0gcGFnZVN0eWxlU2hlZXQo KTsKLSAgICBpZiAoIXN0eWxlU2hlZXQpCi0gICAgICAgIHJldHVybiAwOwotCi0gICAgUmVmUHRy PEluc3BlY3Rvck9iamVjdD4gcmVzdWx0ID0gSW5zcGVjdG9yT2JqZWN0OjpjcmVhdGUoKTsKICAg ICByZXN1bHQtPnNldFN0cmluZygic3R5bGVTaGVldElkIiwgaWQoKSk7Ci0gICAgcmVzdWx0LT5z ZXRCb29sZWFuKCJkaXNhYmxlZCIsIHN0eWxlU2hlZXQtPmRpc2FibGVkKCkpOwotICAgIHJlc3Vs dC0+c2V0U3RyaW5nKCJzb3VyY2VVUkwiLCBmaW5hbFVSTCgpKTsKLSAgICByZXN1bHQtPnNldFN0 cmluZygidGl0bGUiLCBzdHlsZVNoZWV0LT50aXRsZSgpKTsKKwogICAgIHJldHVybiByZXN1bHQu cmVsZWFzZSgpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yU3R5bGVTaGVldC5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclN0 eWxlU2hlZXQuaAppbmRleCAzMDQ4YjFiOGE1MzcxMmY5ZjgwM2U4NGVhNjk1NDQ2OTlhYzYyODUy Li45MjMxOGNiZmMwNWU1ODFlNzRlZDc5YjNjNmQ5YWI1ZDY1Yjc1OTY0IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yU3R5bGVTaGVldC5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JTdHlsZVNoZWV0LmgKQEAgLTE2OCw3ICsxNjgs NiBAQCBwdWJsaWM6CiAgICAgQ1NTU3R5bGVSdWxlKiBhZGRSdWxlKGNvbnN0IFN0cmluZyYgc2Vs ZWN0b3IpOwogICAgIENTU1N0eWxlUnVsZSogcnVsZUZvcklkKGNvbnN0IEluc3BlY3RvckNTU0lk JikgY29uc3Q7CiAgICAgUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGJ1aWxkT2JqZWN0Rm9y U3R5bGVTaGVldCgpOwotICAgIFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBidWlsZE9iamVj dEZvclN0eWxlU2hlZXRJbmZvKCk7CiAgICAgUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGJ1 aWxkT2JqZWN0Rm9yUnVsZShDU1NTdHlsZVJ1bGUqKTsKICAgICBQYXNzUmVmUHRyPEluc3BlY3Rv ck9iamVjdD4gYnVpbGRPYmplY3RGb3JTdHlsZShDU1NTdHlsZURlY2xhcmF0aW9uKik7CiAgICAg Ym9vbCBzZXRQcm9wZXJ0eVRleHQoY29uc3QgSW5zcGVjdG9yQ1NTSWQmLCB1bnNpZ25lZCBwcm9w ZXJ0eUluZGV4LCBjb25zdCBTdHJpbmcmIHRleHQsIGJvb2wgb3ZlcndyaXRlKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQXVkaXRSdWxlcy5qcyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQXVkaXRSdWxlcy5qcwppbmRleCBmM2Uy OGQ4ZjBkMjA4MmY2MWE5OTliYzRjODIwYWI3ZWNkMmQ1ZDJmLi5iNjE0MjU2ZWFlMTU5Y2E4Yzky MDFkYTdiZmUwYjRlOTNmYmQyYzMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0F1ZGl0UnVsZXMuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9BdWRpdFJ1bGVzLmpzCkBAIC0zNzcsMjggKzM3NywyNCBAQCBXZWJJbnNwZWN0 b3IuQXVkaXRSdWxlcy5VbnVzZWRDc3NSdWxlLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIFdl Ykluc3BlY3Rvci5BdWRpdFJ1bGVzLmV2YWx1YXRlSW5UYXJnZXRXaW5kb3cocm91dGluZSwgW3Nl bGVjdG9yc10sIHNlbGVjdG9yc0NhbGxiYWNrLmJpbmQobnVsbCwgY2FsbGJhY2ssIHN0eWxlU2hl ZXRzLCB0ZXN0ZWRTZWxlY3RvcnMpKTsKICAgICAgICAgfQogCi0gICAgICAgIGZ1bmN0aW9uIHN0 eWxlU2hlZXRDYWxsYmFjayhzdHlsZVNoZWV0cywgc291cmNlVVJMLCBjb250aW51YXRpb24sIHN0 eWxlU2hlZXQpCisgICAgICAgIGZ1bmN0aW9uIHN0eWxlU2hlZXRDYWxsYmFjayhzdHlsZVNoZWV0 cywgY29udGludWF0aW9uLCBzdHlsZVNoZWV0KQogICAgICAgICB7Ci0gICAgICAgICAgICBpZiAo c3R5bGVTaGVldCkgewotICAgICAgICAgICAgICAgIHN0eWxlU2hlZXQuc291cmNlVVJMID0gc291 cmNlVVJMOworICAgICAgICAgICAgaWYgKHN0eWxlU2hlZXQpCiAgICAgICAgICAgICAgICAgc3R5 bGVTaGVldHMucHVzaChzdHlsZVNoZWV0KTsKLSAgICAgICAgICAgIH0KICAgICAgICAgICAgIGlm IChjb250aW51YXRpb24pCiAgICAgICAgICAgICAgICAgY29udGludWF0aW9uKHN0eWxlU2hlZXRz KTsKICAgICAgICAgfQogCi0gICAgICAgIGZ1bmN0aW9uIGFsbFN0eWxlc0NhbGxiYWNrKGVycm9y LCBzdHlsZVNoZWV0SW5mb3MpCisgICAgICAgIGZ1bmN0aW9uIGFsbFN0eWxlc0NhbGxiYWNrKGVy cm9yLCBzdHlsZVNoZWV0SWRzKQogICAgICAgICB7Ci0gICAgICAgICAgICBpZiAoZXJyb3IgfHwg IXN0eWxlU2hlZXRJbmZvcyB8fCAhc3R5bGVTaGVldEluZm9zLmxlbmd0aCkKKyAgICAgICAgICAg IGlmIChlcnJvciB8fCAhc3R5bGVTaGVldElkcyB8fCAhc3R5bGVTaGVldElkcy5sZW5ndGgpCiAg ICAgICAgICAgICAgICAgcmV0dXJuIGV2YWxDYWxsYmFjayhbXSk7CiAgICAgICAgICAgICB2YXIg c3R5bGVTaGVldHMgPSBbXTsKLSAgICAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgc3R5bGVT aGVldEluZm9zLmxlbmd0aDsgKytpKSB7Ci0gICAgICAgICAgICAgICAgdmFyIGluZm8gPSBzdHls ZVNoZWV0SW5mb3NbaV07Ci0gICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLkNTU1N0eWxlU2hl ZXQuY3JlYXRlRm9ySWQoaW5mby5zdHlsZVNoZWV0SWQsIHN0eWxlU2hlZXRDYWxsYmFjay5iaW5k KG51bGwsIHN0eWxlU2hlZXRzLCBpbmZvLnNvdXJjZVVSTCwgaSA9PSBzdHlsZVNoZWV0SW5mb3Mu bGVuZ3RoIC0gMSA/IGV2YWxDYWxsYmFjayA6IG51bGwpKTsKLSAgICAgICAgICAgIH0KKyAgICAg ICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgc3R5bGVTaGVldElkcy5sZW5ndGg7ICsraSkKKyAg ICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVTaGVldC5jcmVhdGVGb3JJZChzdHls ZVNoZWV0SWRzW2ldLCBzdHlsZVNoZWV0Q2FsbGJhY2suYmluZChudWxsLCBzdHlsZVNoZWV0cywg aSA9PSBzdHlsZVNoZWV0SWRzLmxlbmd0aCAtIDEgPyBldmFsQ2FsbGJhY2sgOiBudWxsKSk7CiAg ICAgICAgIH0KIAotICAgICAgICBDU1NBZ2VudC5nZXRBbGxTdHlsZVNoZWV0cyhhbGxTdHlsZXND YWxsYmFjayk7CisgICAgICAgIENTU0FnZW50LmdldEFsbFN0eWxlcyhhbGxTdHlsZXNDYWxsYmFj ayk7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0NTU1N0eWxlTW9kZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0NTU1N0eWxlTW9kZWwuanMKaW5kZXggN2U0ZWRlNDUzMzhjZDM4Yzk0NDE0NDk0MDRkYTU2 MGI5MGU1NmEyYS4uZmJhZjViY2M4ZTUwN2I2NzQ0ZTIxMGVlNmY3ODMxMWJlNmE3ODU3NiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DU1NTdHlsZU1vZGVs LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ1NTU3R5bGVNb2Rl bC5qcwpAQCAtMTY4LDEwICsxNjgsOCBAQCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVNb2RlbC5wcm90 b3R5cGUgPSB7CiAgICAgICAgICAgICBpZiAoZXJyb3IpCiAgICAgICAgICAgICAgICAgcmV0dXJu OwogICAgICAgICAgICAgdmFyIHJlc291cmNlID0gV2ViSW5zcGVjdG9yLnJlc291cmNlRm9yVVJM KGhyZWYpOwotICAgICAgICAgICAgaWYgKHJlc291cmNlICYmIHJlc291cmNlLnR5cGUgPT09IFdl Ykluc3BlY3Rvci5SZXNvdXJjZS5UeXBlLlN0eWxlc2hlZXQpIHsKKyAgICAgICAgICAgIGlmIChy ZXNvdXJjZSAmJiByZXNvdXJjZS50eXBlID09PSBXZWJJbnNwZWN0b3IuUmVzb3VyY2UuVHlwZS5T dHlsZXNoZWV0KQogICAgICAgICAgICAgICAgIHJlc291cmNlLnNldENvbnRlbnQoY29udGVudCwg dGhpcy5fb25SZXZlcnQuYmluZCh0aGlzLCBzdHlsZVNoZWV0SWQpKTsKLSAgICAgICAgICAgICAg ICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycygic3R5bGVzaGVldCBjaGFuZ2VkIik7Ci0g ICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICAgICAgQ1NTQWdlbnQuZ2V0U3R5bGVTaGVldFRl eHQoc3R5bGVTaGVldElkLCBjYWxsYmFjay5iaW5kKHRoaXMpKTsKICAgICB9LApAQCAtMTgzLDYg KzE4MSw3IEBAIFdlYkluc3BlY3Rvci5DU1NTdHlsZU1vZGVsLnByb3RvdHlwZSA9IHsKICAgICAg ICAgICAgIGlmIChlcnJvcikKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB0 aGlzLl9zdHlsZVNoZWV0Q2hhbmdlZChzdHlsZVNoZWV0SWQsIHRydWUpOworICAgICAgICAgICAg dGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoInN0eWxlc2hlZXQgY2hhbmdlZCIpOwogICAg ICAgICB9CiAgICAgICAgIENTU0FnZW50LnNldFN0eWxlU2hlZXRUZXh0KHN0eWxlU2hlZXRJZCwg Y29udGVudFRvUmV2ZXJ0VG8sIGNhbGxiYWNrLmJpbmQodGhpcykpOwogICAgIH0KQEAgLTUzOCw2 ICs1MzcsOSBAQCBXZWJJbnNwZWN0b3IuQ1NTUHJvcGVydHkucHJvdG90eXBlID0gewogV2ViSW5z cGVjdG9yLkNTU1N0eWxlU2hlZXQgPSBmdW5jdGlvbihwYXlsb2FkKQogewogICAgIHRoaXMuaWQg PSBwYXlsb2FkLnN0eWxlU2hlZXRJZDsKKyAgICB0aGlzLnNvdXJjZVVSTCA9IHBheWxvYWQuc291 cmNlVVJMOworICAgIHRoaXMudGl0bGUgPSBwYXlsb2FkLnRpdGxlOworICAgIHRoaXMuZGlzYWJs ZWQgPSBwYXlsb2FkLmRpc2FibGVkOwogICAgIHRoaXMucnVsZXMgPSBbXTsKICAgICB0aGlzLnN0 eWxlcyA9IHt9OwogICAgIGZvciAodmFyIGkgPSAwOyBpIDwgcGF5bG9hZC5ydWxlcy5sZW5ndGg7 ICsraSkgewpAQCAtNTcwLDEyICs1NzIsMTQgQEAgV2ViSW5zcGVjdG9yLkNTU1N0eWxlU2hlZXQu cHJvdG90eXBlID0gewogCiAgICAgc2V0VGV4dDogZnVuY3Rpb24obmV3VGV4dCwgdXNlckNhbGxi YWNrKQogICAgIHsKLSAgICAgICAgZnVuY3Rpb24gY2FsbGJhY2soZXJyb3IsIGlzQ2hhbmdlU3Vj Y2Vzc2Z1bCkKKyAgICAgICAgZnVuY3Rpb24gY2FsbGJhY2soZXJyb3IsIHN0eWxlU2hlZXRQYXls b2FkKQogICAgICAgICB7Ci0gICAgICAgICAgICBpZiAodXNlckNhbGxiYWNrKQotICAgICAgICAg ICAgICAgIHVzZXJDYWxsYmFjayhpc0NoYW5nZVN1Y2Nlc3NmdWwpOwotICAgICAgICAgICAgaWYg KGlzQ2hhbmdlU3VjY2Vzc2Z1bCkKKyAgICAgICAgICAgIGlmIChlcnJvcikKKyAgICAgICAgICAg ICAgICB1c2VyQ2FsbGJhY2sobnVsbCk7CisgICAgICAgICAgICBlbHNlIHsKKyAgICAgICAgICAg ICAgICB1c2VyQ2FsbGJhY2sobmV3IFdlYkluc3BlY3Rvci5DU1NTdHlsZVNoZWV0KHN0eWxlU2hl ZXRQYXlsb2FkKSk7CiAgICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmNzc01vZGVsLl9zdHls ZVNoZWV0Q2hhbmdlZCh0aGlzLmlkLCB0cnVlKTsKKyAgICAgICAgICAgIH0KICAgICAgICAgfQog CiAgICAgICAgIENTU0FnZW50LnNldFN0eWxlU2hlZXRUZXh0KHRoaXMuaWQsIG5ld1RleHQsIGNh bGxiYWNrLmJpbmQodGhpcykpOwo=