56662 2011-03-18 11:35:23 -0700 REGRESSION(r81487): "Breaks inspector/styles/styles-add-blank-property.html" (Requested by apavlov on #webkit). 2011-03-18 12:28: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 369753 0 webkit.review.bot 2011-03-18 11:35:23 -0700 http://trac.webkit.org/changeset/81487 broke the build: "Breaks inspector/styles/styles-add-blank-property.html" (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 369755 1 86185 webkit.review.bot 2011-03-18 11:35:54 -0700 Created attachment 86185 ROLLOUT of r81487 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. 369787 2 86185 commit-queue 2011-03-18 12:28:37 -0700 Comment on attachment 86185 ROLLOUT of r81487 Clearing flags on attachment: 86185 Committed r81495: <http://trac.webkit.org/changeset/81495> 369788 3 commit-queue 2011-03-18 12:28:42 -0700 All reviewed patches have been landed. Closing bug. 86185 2011-03-18 11:35:54 -0700 2011-03-18 12:28:37 -0700 ROLLOUT of r81487 bug-56662-20110318183405.patch text/plain 21959 webkit.review.bot U3VidmVyc2lvbiBSZXZpc2lvbjogODE0ODkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAxOWUyMzNiNDM0ZWUxNGE3ODRlNTJm ODZiMWVlMWJmNzcwYjM0MjM2Li5iNTdhYWU1ZmNjNTI5NzRiZjBjYjk0NmUzNjQ5NTNlMmYwOWE4 NWM1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDMtMTggIFNoZXJpZmYgQm90ICA8d2Vi a2l0LnJldmlldy5ib3RAZ21haWwuY29tPgorCisgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcg b3V0IHI4MTQ4Ny4KKyAgICAgICAgaHR0cDovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvODE0 ODcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU2NjYy CisKKyAgICAgICAgIkJyZWFrcyBpbnNwZWN0b3Ivc3R5bGVzL3N0eWxlcy1hZGQtYmxhbmstcHJv cGVydHkuaHRtbCIKKyAgICAgICAgKFJlcXVlc3RlZCBieSBhcGF2bG92IG9uICN3ZWJraXQpLgor CisgICAgICAgICogaW5zcGVjdG9yL3N0eWxlcy9nZXQtc2V0LXN0eWxlc2hlZXQtdGV4dC1leHBl Y3RlZC50eHQ6IFJlbW92ZWQuCisgICAgICAgICogaW5zcGVjdG9yL3N0eWxlcy9nZXQtc2V0LXN0 eWxlc2hlZXQtdGV4dC5odG1sOiBSZW1vdmVkLgorICAgICAgICAqIGluc3BlY3Rvci9zdHlsZXMv cmVzb3VyY2VzL2dldC1zZXQtc3R5bGVzaGVldC10ZXh0LmNzczogUmVtb3ZlZC4KKyAgICAgICAg KiBpbnNwZWN0b3Ivc3R5bGVzL3N0eWxlcy1uZXctQVBJLmh0bWw6CisKIDIwMTEtMDMtMTggIEp1 c3RpbiBOb3Zvc2FkICA8anVub3ZAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IEtlbm5ldGggUnVzc2VsbC4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9zdHls ZXMvZ2V0LXNldC1zdHlsZXNoZWV0LXRleHQtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW5z cGVjdG9yL3N0eWxlcy9nZXQtc2V0LXN0eWxlc2hlZXQtdGV4dC1leHBlY3RlZC50eHQKZGVsZXRl ZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDZiNzUzNTlmYjMzM2ZiNzU5ZjdiYTkyYTZhMjRlM2Fl MGQwZGM1NmQuLjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAKLS0tIGEv TGF5b3V0VGVzdHMvaW5zcGVjdG9yL3N0eWxlcy9nZXQtc2V0LXN0eWxlc2hlZXQtdGV4dC1leHBl Y3RlZC50eHQKKysrIC9kZXYvbnVsbApAQCAtMSw0MCArMCwwIEBACi1UZXN0cyB0aGF0IFdlYklu c3BlY3Rvci5DU1NTdHlsZVNoZWV0IG1ldGhvZHMgd29yayBhcyBleHBlY3RlZC4KLQotSW5zcGVj dCBNZQotCi0KLVJ1bm5pbmc6IHRlc3RTZXRUZXh0Ci09PT0gT3JpZ2luYWwgc3R5bGVzaGVldCB0 ZXh0OiA9PT0KLWJvZHkgewotICAgIGZvbnQtc2l6ZTogMTJweDsKLSAgICBmb286IGJhciAhCi0K LSAgICBpbXBvcnRhbnQgLyogIWltcG9ydGFudCBwcm9wZXJ0eSBub3QgcmVjb2duaXplZCBieSBX ZWJDb3JlICovOwotICAgIGhlaWdodDogMTAwJSAhaW1wb3J0YW50OwotICAgIGNvbG9yejogIiFp bXBvcnRhbnQiOwotICAgIGltcG9ydGFudDohaW1wb3J0YW50OwotICAgIGNvbG9yOiAiYmFkY29s b3IiICEgaW1wb3J0YW50IC8qIGdvb2QgcHJvcGVydHkgd2l0aCBzdHJhbmdlIHZhbHVlICovOwot fQotCi0vKiBjb21tZW50IGJlZm9yZSBzZWxlY3RvciAqL2JvZHkubWFpbjEvKiBjb21tZW50IGFm dGVyIHNlbGVjdG9yICovey8qIGNvbW1lbnQgKi9jb2xvcjogI0YwMEJBQTt6b286bW9vIC8qIG5v dCBhbiAhaW1wb3J0YW50IHVucmVjb2duaXplZCBwcm9wZXJ0eSAqL30vKiBjb21tZW50ICovCi0K LWJvZHkubWFpbjJ7YmFja2dyb3VuZDogZ3JlZW4gLyogdmFsdWUgIWltcG9ydGFudCBjb21tZW50 ICovICFpbXBvcnRhbnQgLyogbm8gc2VtaWNvbG9uLCB2ZXJ5ICFpbXBvcnRhbnQgKi99Ci0KLQot UnVubmluZzogdGVzdE5ld0VsZW1lbnRTdHlsZXMKLT09PSBNYXRjaGVkIHJ1bGVzIGZvciBoMSBh ZnRlciBzZXRUZXh0KCkgPT09Ci0KLXJ1bGUKLWgxOiBbdXNlci1hZ2VudF0KLVsnZGlzcGxheSc6 J2Jsb2NrJ10gQFt1bmRlZmluZWQtdW5kZWZpbmVkXSBzdHlsZQotWydmb250LXNpemUnOicyZW0n XSBAW3VuZGVmaW5lZC11bmRlZmluZWRdIHN0eWxlCi1bJy13ZWJraXQtbWFyZ2luLWJlZm9yZSc6 JzAuNjdlbSddIEBbdW5kZWZpbmVkLXVuZGVmaW5lZF0gc3R5bGUKLVsnLXdlYmtpdC1tYXJnaW4t YWZ0ZXInOicwLjY3ZW0nXSBAW3VuZGVmaW5lZC11bmRlZmluZWRdIHN0eWxlCi1bJy13ZWJraXQt bWFyZ2luLXN0YXJ0JzonMHB4J10gQFt1bmRlZmluZWQtdW5kZWZpbmVkXSBzdHlsZQotWyctd2Vi a2l0LW1hcmdpbi1lbmQnOicwcHgnXSBAW3VuZGVmaW5lZC11bmRlZmluZWRdIHN0eWxlCi1bJ2Zv bnQtd2VpZ2h0JzonYm9sZCddIEBbdW5kZWZpbmVkLXVuZGVmaW5lZF0gc3R5bGUKLQotcnVsZQot aDE6IFtdCi1bJ2NvbG9yJzoncmVkJ10gQFsxLTEyXSBhY3RpdmUKLQpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvaW5zcGVjdG9yL3N0eWxlcy9nZXQtc2V0LXN0eWxlc2hlZXQtdGV4dC5odG1sIGIv TGF5b3V0VGVzdHMvaW5zcGVjdG9yL3N0eWxlcy9nZXQtc2V0LXN0eWxlc2hlZXQtdGV4dC5odG1s CmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCBlY2ZjNGU1MGUwNDllYWQwZGNmMDM1MTUz NWExMjc2ZDllZmIyNjEyLi4wMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9zdHlsZXMvZ2V0LXNldC1zdHlsZXNoZWV0LXRl eHQuaHRtbAorKysgL2Rldi9udWxsCkBAIC0xLDExNyArMCwwIEBACi08aHRtbD4KLTxoZWFkPgot Ci08c3R5bGU+Ci0KLS8qIEFuIGlubGluZSBzdHlsZXNoZWV0ICovCi1ib2R5Lm1haW5wYWdlIHsK LSAgICB0ZXh0LWRlY29yYXRpb246IG5vbmU7Ci19Ci08L3N0eWxlPgotCi08bGluayByZWw9InN0 eWxlc2hlZXQiIGhyZWY9InJlc291cmNlcy9nZXQtc2V0LXN0eWxlc2hlZXQtdGV4dC5jc3MiPgot Ci08c2NyaXB0IHNyYz0iLi4vLi4vaHR0cC90ZXN0cy9pbnNwZWN0b3IvaW5zcGVjdG9yLXRlc3Qu anMiPjwvc2NyaXB0PgotPHNjcmlwdCBzcmM9Ii4uLy4uL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2Vs ZW1lbnRzLXRlc3QuanMiPjwvc2NyaXB0PgotPHNjcmlwdD4KLQotZnVuY3Rpb24gdGVzdCgpCi17 Ci0gICAgdmFyIGZvdW5kU3R5bGVTaGVldDsKLQotICAgIENTU0FnZW50LmdldEFsbFN0eWxlU2hl ZXRzKGZpbmRTdHlsZVNoZWV0KTsKLQotICAgIGZ1bmN0aW9uIGZpbmRTdHlsZVNoZWV0KGVycm9y LCBzdHlsZVNoZWV0SW5mb3MpCi0gICAgewotICAgICAgICBmdW5jdGlvbiBjYWxsYmFjayhzdHls ZVNoZWV0KQotICAgICAgICB7Ci0gICAgICAgICAgICBmb3VuZFN0eWxlU2hlZXQgPSBzdHlsZVNo ZWV0OwotICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5ydW5UZXN0U3VpdGUoWyB0ZXN0U2V0VGV4 dCwgdGVzdE5ld0VsZW1lbnRTdHlsZXMgXSk7Ci0gICAgICAgIH0KLQotICAgICAgICBmb3IgKHZh ciBpID0gMDsgaSA8IHN0eWxlU2hlZXRJbmZvcy5sZW5ndGg7ICsraSkgewotICAgICAgICAgICAg aWYgKHN0eWxlU2hlZXRJbmZvc1tpXS5zb3VyY2VVUkwuaW5kZXhPZigiZ2V0LXNldC1zdHlsZXNo ZWV0LXRleHQuY3NzIikgPj0gMCkgewotICAgICAgICAgICAgICAgIGZvdW5kU3R5bGVTaGVldElu Zm8gPSBzdHlsZVNoZWV0SW5mb3NbaV07Ci0gICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLkNT U1N0eWxlU2hlZXQuY3JlYXRlRm9ySWQoZm91bmRTdHlsZVNoZWV0SW5mby5zdHlsZVNoZWV0SWQs IGNhbGxiYWNrKTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgfQotICAgIH0KLQotICAgIGZ1bmN0 aW9uIHRlc3RTZXRUZXh0KG5leHQpCi0gICAgewotICAgICAgICBmdW5jdGlvbiBjYWxsYmFjayhz dWNjZXNzKQotICAgICAgICB7Ci0gICAgICAgICAgICBpZiAoIXN1Y2Nlc3MpIHsKLSAgICAgICAg ICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZEVycm9yKCJGYWlsZWQgdG8gc2V0IHN0eWxlc2hlZXQg dGV4dCIpOwotICAgICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgICAgIH0KLQotICAgICAg ICAgICAgSW5zcGVjdG9yVGVzdC5ydW5BZnRlclBlbmRpbmdEaXNwYXRjaGVzKG5leHQpOwotICAg ICAgICB9Ci0KLSAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoIj09PSBPcmlnaW5hbCBz dHlsZXNoZWV0IHRleHQ6ID09PSIpOwotICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdChm b3VuZFN0eWxlU2hlZXQuZ2V0VGV4dCgpKTsKLSAgICAgICAgZm91bmRTdHlsZVNoZWV0LnNldFRl eHQoImgxIHsgY29sb3I6IHJlZDsgfSIsIGNhbGxiYWNrKTsKLSAgICB9Ci0KLSAgICBmdW5jdGlv biB0ZXN0TmV3RWxlbWVudFN0eWxlcygpCi0gICAgewotICAgICAgICBmdW5jdGlvbiBjYWxsYmFj ayhlcnJvciwgc3R5bGVzKQotICAgICAgICB7Ci0gICAgICAgICAgICBpZiAoZXJyb3IpIHsKLSAg ICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZEVycm9yKCJlcnJvcjogIiArIGVycm9yKTsK LSAgICAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgIElu c3BlY3RvclRlc3QuYWRkUmVzdWx0KCI9PT0gTWF0Y2hlZCBydWxlcyBmb3IgaDEgYWZ0ZXIgc2V0 VGV4dCgpID09PSIpOwotICAgICAgICAgICAgZHVtcFJ1bGVzQXJyYXkoc3R5bGVzLm1hdGNoZWRD U1NSdWxlcyk7Ci0gICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmNvbXBsZXRlVGVzdCgpOwotICAg ICAgICB9Ci0KLSAgICAgICAgZnVuY3Rpb24gbm9kZUNhbGxiYWNrKG5vZGUpCi0gICAgICAgIHsK LSAgICAgICAgICAgIENTU0FnZW50LmdldFN0eWxlc0Zvck5vZGUobm9kZS5pZCwgY2FsbGJhY2sp OwotICAgICAgICB9Ci0KLSAgICAgICAgSW5zcGVjdG9yVGVzdC5zZWxlY3ROb2RlV2l0aElkKCJp bnNwZWN0ZWQiLCBub2RlQ2FsbGJhY2spOwotICAgIH0KLQotCi0gICAgLy8gRGF0YSBkdW1waW5n Ci0KLSAgICBmdW5jdGlvbiBkdW1wUnVsZXNBcnJheShydWxlcykKLSAgICB7Ci0gICAgICAgIGlm ICghcnVsZXMpCi0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIGZvciAodmFyIGkgPSAwOyBp IDwgcnVsZXMubGVuZ3RoOyArK2kpCi0gICAgICAgICAgICBkdW1wUnVsZU9yU3R5bGUocnVsZXNb aV0pOwotICAgIH0KLQotICAgIGZ1bmN0aW9uIGR1bXBSdWxlT3JTdHlsZShydWxlT3JTdHlsZSkK LSAgICB7Ci0gICAgICAgIGlmICghcnVsZU9yU3R5bGUpCi0gICAgICAgICAgICByZXR1cm47Ci0g ICAgICAgIHZhciBpc1J1bGUgPSAhIShydWxlT3JTdHlsZS5zdHlsZSk7Ci0gICAgICAgIHZhciBz dHlsZSA9IGlzUnVsZSA/IHJ1bGVPclN0eWxlLnN0eWxlIDogcnVsZU9yU3R5bGU7Ci0gICAgICAg IEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KCIiKTsKLSAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRS ZXN1bHQoaXNSdWxlID8gInJ1bGUiIDogInN0eWxlIik7Ci0gICAgICAgIEluc3BlY3RvclRlc3Qu YWRkUmVzdWx0KChpc1J1bGUgPyAocnVsZU9yU3R5bGUuc2VsZWN0b3JUZXh0ICsgIjogWyIgKyBy dWxlT3JTdHlsZS5vcmlnaW4gKyAiXSIpIDogInJhdyBzdHlsZSIpKTsKLSAgICAgICAgZm9yICh2 YXIgaSA9IDA7IGkgPCBzdHlsZS5jc3NQcm9wZXJ0aWVzLmxlbmd0aDsgKytpKSB7Ci0gICAgICAg ICAgICB2YXIgcHJvcGVydHkgPSBzdHlsZS5jc3NQcm9wZXJ0aWVzW2ldOwotICAgICAgICAgICAg aWYgKHByb3BlcnR5LnN0YXR1cyAhPT0gImRpc2FibGVkIikKLSAgICAgICAgICAgICAgICBJbnNw ZWN0b3JUZXN0LmFkZFJlc3VsdCgiWyciICsgcHJvcGVydHkubmFtZSArICInOiciICsgcHJvcGVy dHkudmFsdWUgKyAiJyIgKyAocHJvcGVydHkucHJpb3JpdHkgPT09ICJpbXBvcnRhbnQiID8gIiBp cy1pbXBvcnRhbnQiIDogIiIpICsgKCgicGFyc2VkT2siIGluIHByb3BlcnR5KSA/ICIgbm9uLXBh cnNlZCIgOiAiIikgKyJdIEBbIiArIHByb3BlcnR5LnN0YXJ0T2Zmc2V0ICsgIi0iICsgcHJvcGVy dHkuZW5kT2Zmc2V0ICsgIl0gIiArIChwcm9wZXJ0eS5zdGF0dXMgfHwgInN0eWxlIikpOwotICAg ICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KCJb dGV4dD0nIiArIHByb3BlcnR5LnRleHQgKyAiJ10gIiArIHByb3BlcnR5LnN0YXR1cyk7Ci0gICAg ICAgIH0KLSAgICB9Ci19Ci08L3NjcmlwdD4KLTwvaGVhZD4KLQotPGJvZHkgb25sb2FkPSJydW5U ZXN0KCkiPgotPHA+Ci1UZXN0cyB0aGF0IFdlYkluc3BlY3Rvci5DU1NTdHlsZVNoZWV0IG1ldGhv ZHMgd29yayBhcyBleHBlY3RlZC4KLTwvcD4KLTxoMSBpZD0iaW5zcGVjdGVkIj5JbnNwZWN0IE1l PC9oMT4KLTwvYm9keT4KLTwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rv ci9zdHlsZXMvcmVzb3VyY2VzL2dldC1zZXQtc3R5bGVzaGVldC10ZXh0LmNzcyBiL0xheW91dFRl c3RzL2luc3BlY3Rvci9zdHlsZXMvcmVzb3VyY2VzL2dldC1zZXQtc3R5bGVzaGVldC10ZXh0LmNz cwpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggNDUyMTBlM2ZiZWFmZjUyN2M1ZGQ3MjAx OWI1NzU3YWE1OTM4NDNiNi4uMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3Ivc3R5bGVzL3Jlc291cmNlcy9nZXQtc2V0LXN0 eWxlc2hlZXQtdGV4dC5jc3MKKysrIC9kZXYvbnVsbApAQCAtMSwxNCArMCwwIEBACi1ib2R5IHsK LSAgICBmb250LXNpemU6IDEycHg7Ci0gICAgZm9vOiBiYXIgIQotCi0gICAgaW1wb3J0YW50IC8q ICFpbXBvcnRhbnQgcHJvcGVydHkgbm90IHJlY29nbml6ZWQgYnkgV2ViQ29yZSAqLzsKLSAgICBo ZWlnaHQ6IDEwMCUgIWltcG9ydGFudDsKLSAgICBjb2xvcno6ICIhaW1wb3J0YW50IjsKLSAgICBp bXBvcnRhbnQ6IWltcG9ydGFudDsKLSAgICBjb2xvcjogImJhZGNvbG9yIiAhIGltcG9ydGFudCAv KiBnb29kIHByb3BlcnR5IHdpdGggc3RyYW5nZSB2YWx1ZSAqLzsKLX0KLQotLyogY29tbWVudCBi ZWZvcmUgc2VsZWN0b3IgKi9ib2R5Lm1haW4xLyogY29tbWVudCBhZnRlciBzZWxlY3RvciAqL3sv KiBjb21tZW50ICovY29sb3I6ICNGMDBCQUE7em9vOm1vbyAvKiBub3QgYW4gIWltcG9ydGFudCB1 bnJlY29nbml6ZWQgcHJvcGVydHkgKi99LyogY29tbWVudCAqLwotCi1ib2R5Lm1haW4ye2JhY2tn cm91bmQ6IGdyZWVuIC8qIHZhbHVlICFpbXBvcnRhbnQgY29tbWVudCAqLyAhaW1wb3J0YW50IC8q IG5vIHNlbWljb2xvbiwgdmVyeSAhaW1wb3J0YW50ICovfQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvaW5zcGVjdG9yL3N0eWxlcy9zdHlsZXMtbmV3LUFQSS5odG1sIGIvTGF5b3V0VGVzdHMvaW5z cGVjdG9yL3N0eWxlcy9zdHlsZXMtbmV3LUFQSS5odG1sCmluZGV4IDZjOTI1MTI1NWZkNWU0MzBl NjA5YjVkZWJkZDcxOTY2YmZkY2UwNTkuLjJmZTYyYjJlNzY3ZjRhOTNmMDg3ZTEzZmEzYTI3Yjlj ZDc3YWIxY2YgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9zdHlsZXMvc3R5bGVz LW5ldy1BUEkuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3Ivc3R5bGVzL3N0eWxlcy1u ZXctQVBJLmh0bWwKQEAgLTEwMiw3ICsxMDIsNyBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICAgICAg ICAgICAgICBsb2FkQW5kRHVtcFN0eWxlU2hlZXQuYmluZChudWxsLCBzdHlsZVNoZWV0LnN0eWxl U2hlZXRJZCwgdGVzdF9jaGFuZ2VTZWxlY3RvcikpOwogICAgICAgICB9CiAKLSAgICAgICAgZnVu Y3Rpb24gc3R5bGVTaGVldEluZm9zTG9hZGVkKGVycm9yLCBpbmZvcykKKyAgICAgICAgZnVuY3Rp b24gc3R5bGVTaGVldElkc0xvYWRlZChlcnJvciwgaWRzKQogICAgICAgICB7CiAgICAgICAgICAg ICBpZiAoZXJyb3IpIHsKICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdCgi ZXJyb3I6ICIgKyBlcnJvcik7CkBAIC0xMTAsMTAgKzExMCwxMCBAQCBmdW5jdGlvbiB0ZXN0KCkK ICAgICAgICAgICAgIH0KICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KCIiKTsK ICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KCI9PT0gQWxsIHN0eWxlc2hlZXRz ID09PSIpOwotICAgICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBpbmZvcy5sZW5ndGg7ICsr aSkKLSAgICAgICAgICAgICAgICBsb2FkQW5kRHVtcFN0eWxlU2hlZXQoaW5mb3NbaV0uc3R5bGVT aGVldElkLCAoaSA8IGluZm9zLmxlbmd0aCAtIDEpID8gbnVsbCA6IHBhdGNoU3R5bGVTaGVldCk7 CisgICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGlkcy5sZW5ndGg7ICsraSkKKyAgICAg ICAgICAgICAgICBsb2FkQW5kRHVtcFN0eWxlU2hlZXQoaWRzW2ldLCAoaSA8IGlkcy5sZW5ndGgg LSAxKSA/IG51bGwgOiBwYXRjaFN0eWxlU2hlZXQpOwogICAgICAgICB9Ci0gICAgICAgIENTU0Fn ZW50LmdldEFsbFN0eWxlU2hlZXRzKHN0eWxlU2hlZXRJbmZvc0xvYWRlZCk7CisgICAgICAgIENT U0FnZW50LmdldEFsbFN0eWxlcyhzdHlsZVNoZWV0SWRzTG9hZGVkKTsKICAgICB9CiAKICAgICBm dW5jdGlvbiB0ZXN0X2NoYW5nZVNlbGVjdG9yKHN0eWxlU2hlZXQpCkBAIC0yOTYsMTQgKzI5Niwx MyBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICBmdW5jdGlvbiBsb2FkQW5kRHVtcFN0eWxlU2hlZXQo c3R5bGVTaGVldElkLCBjb250aW51YXRpb24sIGVycm9yKQogICAgIHsKICAgICAgICAgaWYgKGVy cm9yKSB7Ci0gICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZEVycm9yKCJlcnJvcjogIiArIGVy cm9yKTsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVjb3JkKCJlcnJvcjogIiArIGVy cm9yKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQotCiAgICAgICAgIGZ1bmN0aW9u IHN0eWxlU2hlZXRMb2FkZWQoZXJyb3IsIHN0eWxlU2hlZXQpCiAgICAgICAgIHsKICAgICAgICAg ICAgIGlmIChlcnJvcikgewotICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYWRkRXJyb3Io ImVycm9yOiAiICsgZXJyb3IpOworICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVj b3JkKCJlcnJvcjogIiArIGVycm9yKTsKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAg ICAgICB9CiAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdCgiIik7CkBAIC0zMjEs NyArMzIwLDcgQEAgZnVuY3Rpb24gdGVzdCgpCiAvKgogQ292ZXJlZCBBUEkgbWV0aG9kczoKICAt IGdldFN0eWxlc0Zvck5vZGUKLSAtIGdldEFsbFN0eWxlU2hlZXRzCisgLSBnZXRBbGxTdHlsZXMK ICAtIGdldFN0eWxlU2hlZXQKICAtIHNldFN0eWxlU2hlZXRUZXh0CiAgLSBzZXRTdHlsZURhdGEK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlODg4YTI5OWYzMDliY2MwYzExNjBjN2FhOTZhY2QyYWRhNmU2YzQxLi5l M2YxZDIxYjQzNTQ0ZjdmODc4ZWY4ZmRjNjNjNTM5YWVkMGNjNmYyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMzAgQEAKKzIwMTEtMDMtMTggIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RA Z21haWwuY29tPgorCisgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHI4MTQ4Ny4KKyAg ICAgICAgaHR0cDovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvODE0ODcKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU2NjYyCisKKyAgICAgICAgIkJy ZWFrcyBpbnNwZWN0b3Ivc3R5bGVzL3N0eWxlcy1hZGQtYmxhbmstcHJvcGVydHkuaHRtbCIKKyAg ICAgICAgKFJlcXVlc3RlZCBieSBhcGF2bG92IG9uICN3ZWJraXQpLgorCisgICAgICAgICogaW5z cGVjdG9yL0luc3BlY3Rvci5qc29uOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JDU1NB Z2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDU1NBZ2VudDo6Z2V0QWxsU3R5 bGVzKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yQ1NTQWdlbnQuaDoKKyAgICAgICAg KiBpbnNwZWN0b3IvSW5zcGVjdG9yU3R5bGVTaGVldC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJ bnNwZWN0b3JTdHlsZVNoZWV0OjpidWlsZE9iamVjdEZvclN0eWxlU2hlZXQpOgorICAgICAgICAq IGluc3BlY3Rvci9JbnNwZWN0b3JTdHlsZVNoZWV0Lmg6CisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9BdWRpdFJ1bGVzLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkF1ZGl0UnVsZXMu VW51c2VkQ3NzUnVsZS5wcm90b3R5cGUuZG9SdW4uc3R5bGVTaGVldENhbGxiYWNrKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5BdWRpdFJ1bGVzLlVudXNlZENzc1J1bGUucHJvdG90eXBlLmRvUnVu LmFsbFN0eWxlc0NhbGxiYWNrKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5BdWRpdFJ1bGVzLlVu dXNlZENzc1J1bGUucHJvdG90eXBlLmRvUnVuKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQt ZW5kL0NTU1N0eWxlTW9kZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ1NTU3R5bGVNb2Rl bC5wcm90b3R5cGUuX3N0eWxlU2hlZXRDaGFuZ2VkLmNhbGxiYWNrKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5DU1NTdHlsZU1vZGVsLnByb3RvdHlwZS5fc3R5bGVTaGVldENoYW5nZWQpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkNTU1N0eWxlTW9kZWwucHJvdG90eXBlLl9vblJldmVydCk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuQ1NTU3R5bGVTaGVldCk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuQ1NTU3R5bGVTaGVldC5wcm90b3R5cGUuc2V0VGV4dCk6CisKIDIwMTEtMDMtMTggIEp1c3Rp biBOb3Zvc2FkICA8anVub3ZAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtl bm5ldGggUnVzc2VsbC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3IuanNvbiBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgppbmRl eCBiMzdmMmJmMzJhYWFkMWZlM2ZhM2E4MjE4NDM1NGQ5Mjk0M2FlOWI2Li43YWU1NjJhYzZkYzlm MzYwYzZjOGQ4YzJlOWVhMDc3OWI0YzE4M2JmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3Rvci5qc29uCkBAIC03NjksOSArNzY5LDkgQEAKICAgICAgICAgICAgICAgICBdCiAgICAg ICAgICAgICB9LAogICAgICAgICAgICAgewotICAgICAgICAgICAgICAgICJuYW1lIjogImdldEFs bFN0eWxlU2hlZXRzIiwKKyAgICAgICAgICAgICAgICAibmFtZSI6ICJnZXRBbGxTdHlsZXMiLAog ICAgICAgICAgICAgICAgICJyZXR1cm5zIjogWwotICAgICAgICAgICAgICAgICAgICB7ICJuYW1l IjogInN0eWxlU2hlZXRJbmZvcyIsICIkcmVmIjogWyJDU1NTdHlsZVNoZWV0SW5mbyJdIH0KKyAg ICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJzdHlsZVNoZWV0SWRzIiwgInR5cGUiOiBbInN0 cmluZyJdIH0KICAgICAgICAgICAgICAgICBdCiAgICAgICAgICAgICB9LAogICAgICAgICAgICAg ewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNTU0FnZW50 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDU1NBZ2VudC5jcHAKaW5k ZXggZDE0NGZlMTNmMTg4NjdmNTRiNTA0YzdkNzA3YjMwMmE4OWM3YjVhYy4uNGUyOGUwZTIzOTAy YTIyMDRiZDRiMTgzNDI3ODU1ZGQzMjA5N2E0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3RvckNTU0FnZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yQ1NTQWdlbnQuY3BwCkBAIC0xMDQsMjEgKzEwNCwxNyBAQAogLy8gICAg c2VsZWN0b3JSYW5nZTogeyBzdGFydDogPG51bWJlcj4sIGVuZDogPG51bWJlcj4gfSAvLyBPcHRp b25hbCAtIGZvciBzb3VyY2UtYmFzZWQgcnVsZXMgb25seQogLy8gfQogLy8KLS8vIGNzc1N0eWxl U2hlZXRJbmZvID0gewotLy8gICAgc3R5bGVTaGVldElkIDogPG51bWJlcj4KLS8vICAgIHNvdXJj ZVVSTCAgICA6IDxzdHJpbmc+Ci0vLyAgICB0aXRsZSAgICAgICAgOiA8c3RyaW5nPgotLy8gICAg ZGlzYWJsZWQgICAgIDogPGJvb2xlYW4+Ci0vLyB9Ci0vLwogLy8gY3NzU3R5bGVTaGVldCA9IHsK LS8vICAgIHN0eWxlU2hlZXRJZCA6IDxudW1iZXI+Ci0vLyAgICBydWxlcyAgICAgICAgOiBbCi0v LyAgICAgICAgICAgICAgICAgICAgICAgI2Nzc1J1bGUsCi0vLyAgICAgICAgICAgICAgICAgICAg ICAgLi4uCi0vLyAgICAgICAgICAgICAgICAgICAgICAgI2Nzc1J1bGUKLS8vICAgICAgICAgICAg ICAgICAgIF0KLS8vICAgIHRleHQgICAgICAgICA6IDxzdHJpbmc+IC8vIE9wdGlvbmFsIC0gd2hl bmV2ZXIgdGhlIHRleHQgaXMgYXZhaWxhYmxlIGZvciBhIHRleHQtYmFzZWQgc3R5bGVzaGVldAor Ly8gICAgc3R5bGVTaGVldElkICAgOiA8bnVtYmVyPgorLy8gICAgc291cmNlVVJMICAgICAgOiA8 c3RyaW5nPgorLy8gICAgdGl0bGUgICAgICAgICAgOiA8c3RyaW5nPgorLy8gICAgZGlzYWJsZWQg ICAgICAgOiA8Ym9vbGVhbj4KKy8vICAgIHJ1bGVzICAgICAgICAgIDogWworLy8gICAgICAgICAg ICAgICAgICAgICAgICAgI2Nzc1J1bGUsCisvLyAgICAgICAgICAgICAgICAgICAgICAgICAuLi4K Ky8vICAgICAgICAgICAgICAgICAgICAgICAgICNjc3NSdWxlCisvLyAgICAgICAgICAgICAgICAg ICAgIF0KKy8vICAgIHRleHQgICAgICAgICAgIDogPHN0cmluZz4gLy8gT3B0aW9uYWwgLSB3aGVu ZXZlciB0aGUgdGV4dCBpcyBhdmFpbGFibGUgZm9yIGEgdGV4dC1iYXNlZCBzdHlsZXNoZWV0CiAv LyB9CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKQEAgLTI1NCw3ICsyNTAsNyBAQCB2b2lkIEluc3Bl Y3RvckNTU0FnZW50OjpnZXRDb21wdXRlZFN0eWxlRm9yTm9kZShFcnJvclN0cmluZyogZXJyb3JT dHJpbmcsIGxvbmcgbgogICAgICpzdHlsZSA9IGluc3BlY3RvclN0eWxlLT5idWlsZE9iamVjdEZv clN0eWxlKCk7CiB9CiAKLXZvaWQgSW5zcGVjdG9yQ1NTQWdlbnQ6OmdldEFsbFN0eWxlU2hlZXRz KEVycm9yU3RyaW5nKiwgUmVmUHRyPEluc3BlY3RvckFycmF5Piogc3R5bGVJbmZvcykKK3ZvaWQg SW5zcGVjdG9yQ1NTQWdlbnQ6OmdldEFsbFN0eWxlcyhFcnJvclN0cmluZyosIFJlZlB0cjxJbnNw ZWN0b3JBcnJheT4qIHN0eWxlcykKIHsKICAgICBWZWN0b3I8RG9jdW1lbnQqPiBkb2N1bWVudHMg PSBtX2RvbUFnZW50LT5kb2N1bWVudHMoKTsKICAgICBmb3IgKFZlY3RvcjxEb2N1bWVudCo+Ojpp dGVyYXRvciBpdCA9IGRvY3VtZW50cy5iZWdpbigpOyBpdCAhPSBkb2N1bWVudHMuZW5kKCk7ICsr aXQpIHsKQEAgLTI2Myw3ICsyNTksNyBAQCB2b2lkIEluc3BlY3RvckNTU0FnZW50OjpnZXRBbGxT dHlsZVNoZWV0cyhFcnJvclN0cmluZyosIFJlZlB0cjxJbnNwZWN0b3JBcnJheT4qCiAgICAgICAg ICAgICBTdHlsZVNoZWV0KiBzdHlsZVNoZWV0ID0gbGlzdC0+aXRlbShpKTsKICAgICAgICAgICAg IGlmIChzdHlsZVNoZWV0LT5pc0NTU1N0eWxlU2hlZXQoKSkgewogICAgICAgICAgICAgICAgIElu c3BlY3RvclN0eWxlU2hlZXQqIGluc3BlY3RvclN0eWxlU2hlZXQgPSBiaW5kU3R5bGVTaGVldChz dGF0aWNfY2FzdDxDU1NTdHlsZVNoZWV0Kj4oc3R5bGVTaGVldCkpOwotICAgICAgICAgICAgICAg ICgqc3R5bGVJbmZvcyktPnB1c2hPYmplY3QoaW5zcGVjdG9yU3R5bGVTaGVldC0+YnVpbGRPYmpl Y3RGb3JTdHlsZVNoZWV0SW5mbygpKTsKKyAgICAgICAgICAgICAgICAoKnN0eWxlcyktPnB1c2hT dHJpbmcoaW5zcGVjdG9yU3R5bGVTaGVldC0+aWQoKSk7CiAgICAgICAgICAgICB9CiAgICAgICAg IH0KICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y Q1NTQWdlbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDU1NBZ2VudC5o CmluZGV4IGU5YzVjYWJkNzNkMTJjMWIzNmYzMTAzYTE5NzhjMzYyOTRkOWYwYjQuLjk1YTY0ZGY1 MDUyZWZiZTMwOWM1ODg2MjZmNWZkMWE1NWE5YjE1ZWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDU1NBZ2VudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JDU1NBZ2VudC5oCkBAIC02NCw3ICs2NCw3IEBAIHB1YmxpYzoKICAg ICB2b2lkIGdldFN0eWxlc0Zvck5vZGUoRXJyb3JTdHJpbmcqLCBsb25nIG5vZGVJZCwgUmVmUHRy PEluc3BlY3Rvck9iamVjdD4qIHJlc3VsdCk7CiAgICAgdm9pZCBnZXRJbmxpbmVTdHlsZUZvck5v ZGUoRXJyb3JTdHJpbmcqLCBsb25nIG5vZGVJZCwgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4qIHN0 eWxlKTsKICAgICB2b2lkIGdldENvbXB1dGVkU3R5bGVGb3JOb2RlKEVycm9yU3RyaW5nKiwgbG9u ZyBub2RlSWQsIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+KiBzdHlsZSk7Ci0gICAgdm9pZCBnZXRB bGxTdHlsZVNoZWV0cyhFcnJvclN0cmluZyosIFJlZlB0cjxJbnNwZWN0b3JBcnJheT4qIHN0eWxl U2hlZXRJbmZvcyk7CisgICAgdm9pZCBnZXRBbGxTdHlsZXMoRXJyb3JTdHJpbmcqLCBSZWZQdHI8 SW5zcGVjdG9yQXJyYXk+KiBzdHlsZXMpOwogICAgIHZvaWQgZ2V0U3R5bGVTaGVldChFcnJvclN0 cmluZyosIGNvbnN0IFN0cmluZyYgc3R5bGVTaGVldElkLCBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0 PiogcmVzdWx0KTsKICAgICB2b2lkIGdldFN0eWxlU2hlZXRUZXh0KEVycm9yU3RyaW5nKiwgY29u c3QgU3RyaW5nJiBzdHlsZVNoZWV0SWQsIFN0cmluZyogdXJsLCBTdHJpbmcqIHJlc3VsdCk7CiAg ICAgdm9pZCBzZXRTdHlsZVNoZWV0VGV4dChFcnJvclN0cmluZyosIGNvbnN0IFN0cmluZyYgc3R5 bGVTaGVldElkLCBjb25zdCBTdHJpbmcmIHRleHQsIGJvb2wqIHN1Y2Nlc3MpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclN0eWxlU2hlZXQuY3BwIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclN0eWxlU2hlZXQuY3BwCmluZGV4IDEzNDJk ZDVkOTZjOWJmOTdlZDM1N2YzZmExZWI4MTg4ZjU0OWVhMjMuLjc3Y2NkZTAxNGE2NDA3MDkxYWMy MjRjNDI3YjgyMzIwMjA2NWM3ODAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JTdHlsZVNoZWV0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yU3R5bGVTaGVldC5jcHAKQEAgLTcwOCw3ICs3MDgsOSBAQCBQYXNzUmVmUHRyPElu c3BlY3Rvck9iamVjdD4gSW5zcGVjdG9yU3R5bGVTaGVldDo6YnVpbGRPYmplY3RGb3JTdHlsZVNo ZWV0KCkKICAgICAgICAgcmV0dXJuIDA7CiAKICAgICBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBy ZXN1bHQgPSBJbnNwZWN0b3JPYmplY3Q6OmNyZWF0ZSgpOwotICAgIHJlc3VsdC0+c2V0U3RyaW5n KCJzdHlsZVNoZWV0SWQiLCBpZCgpKTsKKyAgICByZXN1bHQtPnNldEJvb2xlYW4oImRpc2FibGVk Iiwgc3R5bGVTaGVldC0+ZGlzYWJsZWQoKSk7CisgICAgcmVzdWx0LT5zZXRTdHJpbmcoInNvdXJj ZVVSTCIsIGZpbmFsVVJMKCkpOworICAgIHJlc3VsdC0+c2V0U3RyaW5nKCJ0aXRsZSIsIHN0eWxl U2hlZXQtPnRpdGxlKCkpOwogICAgIFJlZlB0cjxDU1NSdWxlTGlzdD4gY3NzUnVsZUxpc3QgPSBD U1NSdWxlTGlzdDo6Y3JlYXRlKHN0eWxlU2hlZXQsIHRydWUpOwogICAgIFJlZlB0cjxJbnNwZWN0 b3JBcnJheT4gY3NzUnVsZXMgPSBidWlsZEFycmF5Rm9yUnVsZUxpc3QoY3NzUnVsZUxpc3QuZ2V0 KCkpOwogICAgIHJlc3VsdC0+c2V0QXJyYXkoInJ1bGVzIiwgY3NzUnVsZXMucmVsZWFzZSgpKTsK QEAgLTcxOCwyMCArNzIwLDggQEAgUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IEluc3BlY3Rv clN0eWxlU2hlZXQ6OmJ1aWxkT2JqZWN0Rm9yU3R5bGVTaGVldCgpCiAgICAgaWYgKHN1Y2Nlc3Mp CiAgICAgICAgIHJlc3VsdC0+c2V0U3RyaW5nKCJ0ZXh0Iiwgc3R5bGVTaGVldFRleHQpOwogCi0g ICAgcmV0dXJuIHJlc3VsdC5yZWxlYXNlKCk7Ci19Ci0KLVBhc3NSZWZQdHI8SW5zcGVjdG9yT2Jq ZWN0PiBJbnNwZWN0b3JTdHlsZVNoZWV0OjpidWlsZE9iamVjdEZvclN0eWxlU2hlZXRJbmZvKCkK LXsKLSAgICBDU1NTdHlsZVNoZWV0KiBzdHlsZVNoZWV0ID0gcGFnZVN0eWxlU2hlZXQoKTsKLSAg ICBpZiAoIXN0eWxlU2hlZXQpCi0gICAgICAgIHJldHVybiAwOwotCi0gICAgUmVmUHRyPEluc3Bl Y3Rvck9iamVjdD4gcmVzdWx0ID0gSW5zcGVjdG9yT2JqZWN0OjpjcmVhdGUoKTsKICAgICByZXN1 bHQtPnNldFN0cmluZygic3R5bGVTaGVldElkIiwgaWQoKSk7Ci0gICAgcmVzdWx0LT5zZXRCb29s ZWFuKCJkaXNhYmxlZCIsIHN0eWxlU2hlZXQtPmRpc2FibGVkKCkpOwotICAgIHJlc3VsdC0+c2V0 U3RyaW5nKCJzb3VyY2VVUkwiLCBmaW5hbFVSTCgpKTsKLSAgICByZXN1bHQtPnNldFN0cmluZygi dGl0bGUiLCBzdHlsZVNoZWV0LT50aXRsZSgpKTsKKwogICAgIHJldHVybiByZXN1bHQucmVsZWFz ZSgpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y U3R5bGVTaGVldC5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclN0eWxlU2hl ZXQuaAppbmRleCAzMDQ4YjFiOGE1MzcxMmY5ZjgwM2U4NGVhNjk1NDQ2OTlhYzYyODUyLi45MjMx OGNiZmMwNWU1ODFlNzRlZDc5YjNjNmQ5YWI1ZDY1Yjc1OTY0IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yU3R5bGVTaGVldC5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JTdHlsZVNoZWV0LmgKQEAgLTE2OCw3ICsxNjgsNiBAQCBw dWJsaWM6CiAgICAgQ1NTU3R5bGVSdWxlKiBhZGRSdWxlKGNvbnN0IFN0cmluZyYgc2VsZWN0b3Ip OwogICAgIENTU1N0eWxlUnVsZSogcnVsZUZvcklkKGNvbnN0IEluc3BlY3RvckNTU0lkJikgY29u c3Q7CiAgICAgUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGJ1aWxkT2JqZWN0Rm9yU3R5bGVT aGVldCgpOwotICAgIFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBidWlsZE9iamVjdEZvclN0 eWxlU2hlZXRJbmZvKCk7CiAgICAgUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGJ1aWxkT2Jq ZWN0Rm9yUnVsZShDU1NTdHlsZVJ1bGUqKTsKICAgICBQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVj dD4gYnVpbGRPYmplY3RGb3JTdHlsZShDU1NTdHlsZURlY2xhcmF0aW9uKik7CiAgICAgYm9vbCBz ZXRQcm9wZXJ0eVRleHQoY29uc3QgSW5zcGVjdG9yQ1NTSWQmLCB1bnNpZ25lZCBwcm9wZXJ0eUlu ZGV4LCBjb25zdCBTdHJpbmcmIHRleHQsIGJvb2wgb3ZlcndyaXRlKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQXVkaXRSdWxlcy5qcyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQXVkaXRSdWxlcy5qcwppbmRleCBmM2UyOGQ4ZjBk MjA4MmY2MWE5OTliYzRjODIwYWI3ZWNkMmQ1ZDJmLi5iNjE0MjU2ZWFlMTU5Y2E4YzkyMDFkYTdi ZmUwYjRlOTNmYmQyYzMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0F1ZGl0UnVsZXMuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9BdWRpdFJ1bGVzLmpzCkBAIC0zNzcsMjggKzM3NywyNCBAQCBXZWJJbnNwZWN0b3IuQXVk aXRSdWxlcy5VbnVzZWRDc3NSdWxlLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIFdlYkluc3Bl Y3Rvci5BdWRpdFJ1bGVzLmV2YWx1YXRlSW5UYXJnZXRXaW5kb3cocm91dGluZSwgW3NlbGVjdG9y c10sIHNlbGVjdG9yc0NhbGxiYWNrLmJpbmQobnVsbCwgY2FsbGJhY2ssIHN0eWxlU2hlZXRzLCB0 ZXN0ZWRTZWxlY3RvcnMpKTsKICAgICAgICAgfQogCi0gICAgICAgIGZ1bmN0aW9uIHN0eWxlU2hl ZXRDYWxsYmFjayhzdHlsZVNoZWV0cywgc291cmNlVVJMLCBjb250aW51YXRpb24sIHN0eWxlU2hl ZXQpCisgICAgICAgIGZ1bmN0aW9uIHN0eWxlU2hlZXRDYWxsYmFjayhzdHlsZVNoZWV0cywgY29u dGludWF0aW9uLCBzdHlsZVNoZWV0KQogICAgICAgICB7Ci0gICAgICAgICAgICBpZiAoc3R5bGVT aGVldCkgewotICAgICAgICAgICAgICAgIHN0eWxlU2hlZXQuc291cmNlVVJMID0gc291cmNlVVJM OworICAgICAgICAgICAgaWYgKHN0eWxlU2hlZXQpCiAgICAgICAgICAgICAgICAgc3R5bGVTaGVl dHMucHVzaChzdHlsZVNoZWV0KTsKLSAgICAgICAgICAgIH0KICAgICAgICAgICAgIGlmIChjb250 aW51YXRpb24pCiAgICAgICAgICAgICAgICAgY29udGludWF0aW9uKHN0eWxlU2hlZXRzKTsKICAg ICAgICAgfQogCi0gICAgICAgIGZ1bmN0aW9uIGFsbFN0eWxlc0NhbGxiYWNrKGVycm9yLCBzdHls ZVNoZWV0SW5mb3MpCisgICAgICAgIGZ1bmN0aW9uIGFsbFN0eWxlc0NhbGxiYWNrKGVycm9yLCBz dHlsZVNoZWV0SWRzKQogICAgICAgICB7Ci0gICAgICAgICAgICBpZiAoZXJyb3IgfHwgIXN0eWxl U2hlZXRJbmZvcyB8fCAhc3R5bGVTaGVldEluZm9zLmxlbmd0aCkKKyAgICAgICAgICAgIGlmIChl cnJvciB8fCAhc3R5bGVTaGVldElkcyB8fCAhc3R5bGVTaGVldElkcy5sZW5ndGgpCiAgICAgICAg ICAgICAgICAgcmV0dXJuIGV2YWxDYWxsYmFjayhbXSk7CiAgICAgICAgICAgICB2YXIgc3R5bGVT aGVldHMgPSBbXTsKLSAgICAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgc3R5bGVTaGVldElu Zm9zLmxlbmd0aDsgKytpKSB7Ci0gICAgICAgICAgICAgICAgdmFyIGluZm8gPSBzdHlsZVNoZWV0 SW5mb3NbaV07Ci0gICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLkNTU1N0eWxlU2hlZXQuY3Jl YXRlRm9ySWQoaW5mby5zdHlsZVNoZWV0SWQsIHN0eWxlU2hlZXRDYWxsYmFjay5iaW5kKG51bGws IHN0eWxlU2hlZXRzLCBpbmZvLnNvdXJjZVVSTCwgaSA9PSBzdHlsZVNoZWV0SW5mb3MubGVuZ3Ro IC0gMSA/IGV2YWxDYWxsYmFjayA6IG51bGwpKTsKLSAgICAgICAgICAgIH0KKyAgICAgICAgICAg IGZvciAodmFyIGkgPSAwOyBpIDwgc3R5bGVTaGVldElkcy5sZW5ndGg7ICsraSkKKyAgICAgICAg ICAgICAgICBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVTaGVldC5jcmVhdGVGb3JJZChzdHlsZVNoZWV0 SWRzW2ldLCBzdHlsZVNoZWV0Q2FsbGJhY2suYmluZChudWxsLCBzdHlsZVNoZWV0cywgaSA9PSBz dHlsZVNoZWV0SWRzLmxlbmd0aCAtIDEgPyBldmFsQ2FsbGJhY2sgOiBudWxsKSk7CiAgICAgICAg IH0KIAotICAgICAgICBDU1NBZ2VudC5nZXRBbGxTdHlsZVNoZWV0cyhhbGxTdHlsZXNDYWxsYmFj ayk7CisgICAgICAgIENTU0FnZW50LmdldEFsbFN0eWxlcyhhbGxTdHlsZXNDYWxsYmFjayk7CiAg ICAgfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0NTU1N0eWxlTW9kZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NT U1N0eWxlTW9kZWwuanMKaW5kZXggN2U0ZWRlNDUzMzhjZDM4Yzk0NDE0NDk0MDRkYTU2MGI5MGU1 NmEyYS4uZmJhZjViY2M4ZTUwN2I2NzQ0ZTIxMGVlNmY3ODMxMWJlNmE3ODU3NiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DU1NTdHlsZU1vZGVsLmpzCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ1NTU3R5bGVNb2RlbC5qcwpA QCAtMTY4LDEwICsxNjgsOCBAQCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVNb2RlbC5wcm90b3R5cGUg PSB7CiAgICAgICAgICAgICBpZiAoZXJyb3IpCiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAg ICAgICAgICAgdmFyIHJlc291cmNlID0gV2ViSW5zcGVjdG9yLnJlc291cmNlRm9yVVJMKGhyZWYp OwotICAgICAgICAgICAgaWYgKHJlc291cmNlICYmIHJlc291cmNlLnR5cGUgPT09IFdlYkluc3Bl Y3Rvci5SZXNvdXJjZS5UeXBlLlN0eWxlc2hlZXQpIHsKKyAgICAgICAgICAgIGlmIChyZXNvdXJj ZSAmJiByZXNvdXJjZS50eXBlID09PSBXZWJJbnNwZWN0b3IuUmVzb3VyY2UuVHlwZS5TdHlsZXNo ZWV0KQogICAgICAgICAgICAgICAgIHJlc291cmNlLnNldENvbnRlbnQoY29udGVudCwgdGhpcy5f b25SZXZlcnQuYmluZCh0aGlzLCBzdHlsZVNoZWV0SWQpKTsKLSAgICAgICAgICAgICAgICB0aGlz LmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycygic3R5bGVzaGVldCBjaGFuZ2VkIik7Ci0gICAgICAg ICAgICB9CiAgICAgICAgIH0KICAgICAgICAgQ1NTQWdlbnQuZ2V0U3R5bGVTaGVldFRleHQoc3R5 bGVTaGVldElkLCBjYWxsYmFjay5iaW5kKHRoaXMpKTsKICAgICB9LApAQCAtMTgzLDYgKzE4MSw3 IEBAIFdlYkluc3BlY3Rvci5DU1NTdHlsZU1vZGVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAg IGlmIChlcnJvcikKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB0aGlzLl9z dHlsZVNoZWV0Q2hhbmdlZChzdHlsZVNoZWV0SWQsIHRydWUpOworICAgICAgICAgICAgdGhpcy5k aXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoInN0eWxlc2hlZXQgY2hhbmdlZCIpOwogICAgICAgICB9 CiAgICAgICAgIENTU0FnZW50LnNldFN0eWxlU2hlZXRUZXh0KHN0eWxlU2hlZXRJZCwgY29udGVu dFRvUmV2ZXJ0VG8sIGNhbGxiYWNrLmJpbmQodGhpcykpOwogICAgIH0KQEAgLTUzOCw2ICs1Mzcs OSBAQCBXZWJJbnNwZWN0b3IuQ1NTUHJvcGVydHkucHJvdG90eXBlID0gewogV2ViSW5zcGVjdG9y LkNTU1N0eWxlU2hlZXQgPSBmdW5jdGlvbihwYXlsb2FkKQogewogICAgIHRoaXMuaWQgPSBwYXls b2FkLnN0eWxlU2hlZXRJZDsKKyAgICB0aGlzLnNvdXJjZVVSTCA9IHBheWxvYWQuc291cmNlVVJM OworICAgIHRoaXMudGl0bGUgPSBwYXlsb2FkLnRpdGxlOworICAgIHRoaXMuZGlzYWJsZWQgPSBw YXlsb2FkLmRpc2FibGVkOwogICAgIHRoaXMucnVsZXMgPSBbXTsKICAgICB0aGlzLnN0eWxlcyA9 IHt9OwogICAgIGZvciAodmFyIGkgPSAwOyBpIDwgcGF5bG9hZC5ydWxlcy5sZW5ndGg7ICsraSkg ewpAQCAtNTcwLDEyICs1NzIsMTQgQEAgV2ViSW5zcGVjdG9yLkNTU1N0eWxlU2hlZXQucHJvdG90 eXBlID0gewogCiAgICAgc2V0VGV4dDogZnVuY3Rpb24obmV3VGV4dCwgdXNlckNhbGxiYWNrKQog ICAgIHsKLSAgICAgICAgZnVuY3Rpb24gY2FsbGJhY2soZXJyb3IsIGlzQ2hhbmdlU3VjY2Vzc2Z1 bCkKKyAgICAgICAgZnVuY3Rpb24gY2FsbGJhY2soZXJyb3IsIHN0eWxlU2hlZXRQYXlsb2FkKQog ICAgICAgICB7Ci0gICAgICAgICAgICBpZiAodXNlckNhbGxiYWNrKQotICAgICAgICAgICAgICAg IHVzZXJDYWxsYmFjayhpc0NoYW5nZVN1Y2Nlc3NmdWwpOwotICAgICAgICAgICAgaWYgKGlzQ2hh bmdlU3VjY2Vzc2Z1bCkKKyAgICAgICAgICAgIGlmIChlcnJvcikKKyAgICAgICAgICAgICAgICB1 c2VyQ2FsbGJhY2sobnVsbCk7CisgICAgICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgICAgICB1 c2VyQ2FsbGJhY2sobmV3IFdlYkluc3BlY3Rvci5DU1NTdHlsZVNoZWV0KHN0eWxlU2hlZXRQYXls b2FkKSk7CiAgICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmNzc01vZGVsLl9zdHlsZVNoZWV0 Q2hhbmdlZCh0aGlzLmlkLCB0cnVlKTsKKyAgICAgICAgICAgIH0KICAgICAgICAgfQogCiAgICAg ICAgIENTU0FnZW50LnNldFN0eWxlU2hlZXRUZXh0KHRoaXMuaWQsIG5ld1RleHQsIGNhbGxiYWNr LmJpbmQodGhpcykpOwo=