50084 2010-11-25 08:11:58 -0800 REGRESSION(r72727): Broke dom-breakpoints test on chromium win (Requested by podivilov on #webkit). 2010-11-25 08:37:56 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 50017 1 webkit.review.bot webkit.review.bot commit-queue podivilov yurys oldest_to_newest 313775 0 webkit.review.bot 2010-11-25 08:11:58 -0800 http://trac.webkit.org/changeset/72727 broke the build: Broke dom-breakpoints test on chromium win (Requested by podivilov 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 313776 1 74880 webkit.review.bot 2010-11-25 08:12:21 -0800 Created attachment 74880 ROLLOUT of r72727 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. 313785 2 74880 commit-queue 2010-11-25 08:37:51 -0800 Comment on attachment 74880 ROLLOUT of r72727 Clearing flags on attachment: 74880 Committed r72733: <http://trac.webkit.org/changeset/72733> 313786 3 commit-queue 2010-11-25 08:37:56 -0800 All reviewed patches have been landed. Closing bug. 74880 2010-11-25 08:12:21 -0800 2010-11-25 08:37:51 -0800 ROLLOUT of r72727 bug-50084-20101125161216.patch text/plain 23115 webkit.review.bot ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ODAwNzIyZDYzMjA3ZGNjNTMzYzc1NDJmMDcwN2VhNjhjYjQ3ZDlkMy4uMGQyNzZhNGQyMjU2NTQz YjIzZjYyZGJkNmMyOTZhYThhMGI0MTNjZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSw1MSBAQAorMjAxMC0xMS0yNSAgU2hl cmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CisKKyAgICAgICAgVW5yZXZp ZXdlZCwgcm9sbGluZyBvdXQgcjcyNzI3LgorICAgICAgICBodHRwOi8vdHJhYy53ZWJraXQub3Jn L2NoYW5nZXNldC83MjcyNworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NTAwODQKKworICAgICAgICBCcm9rZSBkb20tYnJlYWtwb2ludHMgdGVzdCBvbiBj aHJvbWl1bSB3aW4gKFJlcXVlc3RlZCBieQorICAgICAgICBwb2Rpdmlsb3Ygb24gI3dlYmtpdCku CisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjpzZXROYXRpdmVCcmVha3BvaW50KToKKyAg ICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6SW5zcGVjdG9yRE9NQWdlbnQ6Okluc3BlY3RvckRPTUFnZW50KToKKyAgICAgICAgKFdlYkNv cmU6Okluc3BlY3RvckRPTUFnZW50OjpkaXNjYXJkQmluZGluZ3MpOgorICAgICAgICAoV2ViQ29y ZTo6SW5zcGVjdG9yRE9NQWdlbnQ6OnNldERPTUJyZWFrcG9pbnQpOgorICAgICAgICAoV2ViQ29y ZTo6SW5zcGVjdG9yRE9NQWdlbnQ6OnJlbW92ZURPTUJyZWFrcG9pbnQpOgorICAgICAgICAoV2Vi Q29yZTo6SW5zcGVjdG9yRE9NQWdlbnQ6OmRlc2NyaXB0aW9uRm9yRE9NRXZlbnQpOgorICAgICAg ICAoV2ViQ29yZTo6SW5zcGVjdG9yRE9NQWdlbnQ6OnJlbW92ZUJyZWFrcG9pbnRzRm9yTm9kZSk6 CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JET01BZ2VudDo6Y3JlYXRlQnJlYWtwb2ludElk KToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuaDoKKyAgICAgICAgKiBp bnNwZWN0b3IvZnJvbnQtZW5kL0JyZWFrcG9pbnRNYW5hZ2VyLmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkJyZWFrcG9pbnRNYW5hZ2VyLnByb3RvdHlwZS5yZXNldCk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuQnJlYWtwb2ludE1hbmFnZXIucHJvdG90eXBlLmNyZWF0ZURPTUJyZWFrcG9pbnQp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnRNYW5hZ2VyLnByb3RvdHlwZS5fdXBk YXRlTmF0aXZlQnJlYWtwb2ludHNJblNldHRpbmdzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5C cmVha3BvaW50TWFuYWdlci5wcm90b3R5cGUucmVzdG9yZUJyZWFrcG9pbnRzKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5CcmVha3BvaW50TWFuYWdlci5wcm90b3R5cGUucmVzdG9yZURPTUJyZWFr cG9pbnRzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5ET01CcmVha3BvaW50KToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5ET01CcmVha3BvaW50LnByb3RvdHlwZS5wb3B1bGF0ZUxhYmVsRWxlbWVu dCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRXZlbnRMaXN0ZW5lckJyZWFrcG9pbnQpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlhIUkJyZWFrcG9pbnQpOgorICAgICAgICAqIGluc3BlY3Rvci9m cm9udC1lbmQvQnJlYWtwb2ludHNTaWRlYmFyUGFuZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5CcmVha3BvaW50c1NpZGViYXJQYW5lKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5CcmVha3Bv aW50c1NpZGViYXJQYW5lLnByb3RvdHlwZS5yZXNldCk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu RXZlbnRMaXN0ZW5lckJyZWFrcG9pbnRzU2lkZWJhclBhbmUpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkV2ZW50TGlzdGVuZXJCcmVha3BvaW50c1NpZGViYXJQYW5lLnByb3RvdHlwZS5yZXNldCk6 CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9ET01BZ2VudC5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5ET01BZ2VudC5wcm90b3R5cGUuX3NldERvY3VtZW50KToKKyAgICAgICAgKiBp bnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuRWxlbWVudHNQYW5lbC5wcm90b3R5cGUucmVzZXQpOgorICAgICAgICAqIGluc3BlY3Rvci9m cm9udC1lbmQvRWxlbWVudHNUcmVlT3V0bGluZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5F bGVtZW50c1RyZWVFbGVtZW50LnByb3RvdHlwZS5fcG9wdWxhdGVUYWdDb250ZXh0TWVudS5oYW5k bGVyRnVuY3Rpb24pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkVsZW1lbnRzVHJlZUVsZW1lbnQu cHJvdG90eXBlLl9wb3B1bGF0ZVRhZ0NvbnRleHRNZW51KToKKyAgICAgICAgKiBpbnNwZWN0b3Iv ZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRz UGFuZWwucHJvdG90eXBlLnJlc2V0KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2lu c3BlY3Rvci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5yZXNldCk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuZGlkQ29tbWl0TG9hZCk6CisKIDIwMTAtMTEtMjUgIEhhbnMgV2VubmJvcmcgIDxo YW5zQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBKZXJlbXkgT3Jsb3cuCmRp ZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcCBiL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwCmluZGV4IDIyNDQ3N2RiMjFm YzA3MjMwYjMzNjZlOWJkMDI0NGU0NDk3NjNhOGUuLjI0M2I3YWMzYTRjMzFhNjE3MDJmMzkwMjdm M2M2YmY2MmJjOWI4Y2IgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNv bnRyb2xsZXIuY3BwCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIu Y3BwCkBAIC0xNDI2LDEzICsxNDI2LDE1IEBAIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6c2V0 TmF0aXZlQnJlYWtwb2ludChQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gYnJlYWtwCiAgICAg fSBlbHNlIGlmICh0eXBlID09IGRvbU5hdGl2ZUJyZWFrcG9pbnRUeXBlKSB7CiAgICAgICAgIGlm ICghbV9kb21BZ2VudCkKICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgU3RyaW5nIHBhdGg7 Ci0gICAgICAgIGlmICghY29uZGl0aW9uLT5nZXRTdHJpbmcoInBhdGgiLCAmcGF0aCkpCisgICAg ICAgIGRvdWJsZSBub2RlSWROdW1iZXI7CisgICAgICAgIGlmICghY29uZGl0aW9uLT5nZXROdW1i ZXIoIm5vZGVJZCIsICZub2RlSWROdW1iZXIpKQogICAgICAgICAgICAgcmV0dXJuOwotICAgICAg ICBkb3VibGUgZG9tQnJlYWtwb2ludFR5cGU7Ci0gICAgICAgIGlmICghY29uZGl0aW9uLT5nZXRO dW1iZXIoInR5cGUiLCAmZG9tQnJlYWtwb2ludFR5cGUpKQorICAgICAgICBkb3VibGUgZG9tQnJl YWtwb2ludFR5cGVOdW1iZXI7CisgICAgICAgIGlmICghY29uZGl0aW9uLT5nZXROdW1iZXIoInR5 cGUiLCAmZG9tQnJlYWtwb2ludFR5cGVOdW1iZXIpKQogICAgICAgICAgICAgcmV0dXJuOwotICAg ICAgICAqYnJlYWtwb2ludElkID0gbV9kb21BZ2VudC0+c2V0RE9NQnJlYWtwb2ludChwYXRoLCBz dGF0aWNfY2FzdDxsb25nPihkb21CcmVha3BvaW50VHlwZSkpOworICAgICAgICBsb25nIG5vZGVJ ZCA9IChsb25nKSBub2RlSWROdW1iZXI7CisgICAgICAgIGxvbmcgZG9tQnJlYWtwb2ludFR5cGUg PSAobG9uZykgZG9tQnJlYWtwb2ludFR5cGVOdW1iZXI7CisgICAgICAgICpicmVha3BvaW50SWQg PSBtX2RvbUFnZW50LT5zZXRET01CcmVha3BvaW50KG5vZGVJZCwgZG9tQnJlYWtwb2ludFR5cGUp OwogICAgICAgICBpZiAoIWJyZWFrcG9pbnRJZC0+aXNFbXB0eSgpKQogICAgICAgICAgICAgbV9u YXRpdmVCcmVha3BvaW50cy5zZXQoKmJyZWFrcG9pbnRJZCwgdHlwZSk7CiAgICAgfQpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwIGIvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwCmluZGV4IDQxZWI5MGE5NjcyNGFlNzgyMzli ODY1NTgxOTlkNTEwZDIxMTEzODUuLjg5NGU0YjIxMjZmNGYyYTAwOGJkMjcyNDliMzI1ODUxMDFj MTI3YTkgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNw cAorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHAKQEAgLTIyMyw3 ICsyMjMsNiBAQCBJbnNwZWN0b3JET01BZ2VudDo6SW5zcGVjdG9yRE9NQWdlbnQoSW5zcGVjdG9y Q1NTU3RvcmUqIGNzc1N0b3JlLCBJbnNwZWN0b3JGcm9udAogICAgICwgbV9kb21MaXN0ZW5lcigw KQogICAgICwgbV9sYXN0Tm9kZUlkKDEpCiAgICAgLCBtX21hdGNoSm9ic1RpbWVyKHRoaXMsICZJ bnNwZWN0b3JET01BZ2VudDo6b25NYXRjaEpvYnNUaW1lcikKLSAgICAsIG1fbGFzdEJyZWFrcG9p bnRJZCgwKQogewogfQogCkBAIC0zOTksOCArMzk4LDYgQEAgdm9pZCBJbnNwZWN0b3JET01BZ2Vu dDo6ZGlzY2FyZEJpbmRpbmdzKCkKICAgICBtX2NoaWxkcmVuUmVxdWVzdGVkLmNsZWFyKCk7CiAg ICAgbV9pbnNwZWN0ZWROb2Rlcy5jbGVhcigpOwogICAgIG1fYnJlYWtwb2ludHMuY2xlYXIoKTsK LSAgICBtX2lkVG9CcmVha3BvaW50LmNsZWFyKCk7Ci0gICAgbV9icmVha3BvaW50VG9JZC5jbGVh cigpOwogfQogCiBOb2RlKiBJbnNwZWN0b3JET01BZ2VudDo6bm9kZUZvcklkKGxvbmcgaWQpCkBA IC03NjUsNDAgKzc2MiwzNiBAQCB2b2lkIEluc3BlY3RvckRPTUFnZW50OjpzZWFyY2hDYW5jZWxl ZCgpCiAgICAgbV9zZWFyY2hSZXN1bHRzLmNsZWFyKCk7CiB9CiAKLVN0cmluZyBJbnNwZWN0b3JE T01BZ2VudDo6c2V0RE9NQnJlYWtwb2ludChjb25zdCBTdHJpbmcmIHBhdGgsIGxvbmcgdHlwZSkK K1N0cmluZyBJbnNwZWN0b3JET01BZ2VudDo6c2V0RE9NQnJlYWtwb2ludChsb25nIG5vZGVJZCwg bG9uZyB0eXBlKQogewotICAgIE5vZGUqIG5vZGUgPSBub2RlRm9yUGF0aChwYXRoKTsKKyAgICBO b2RlKiBub2RlID0gbm9kZUZvcklkKG5vZGVJZCk7CiAgICAgaWYgKCFub2RlKQogICAgICAgICBy ZXR1cm4gIiI7CiAKLSAgICB1aW50MzJfdCByb290Qml0ID0gMSA8PCB0eXBlOwotICAgIHVpbnQz Ml90IG1hc2sgPSBtX2JyZWFrcG9pbnRzLmdldChub2RlKTsKLSAgICBpZiAobWFzayAmIHJvb3RC aXQpCisgICAgU3RyaW5nIGJyZWFrcG9pbnRJZCA9IGNyZWF0ZUJyZWFrcG9pbnRJZChub2RlSWQs IHR5cGUpOworICAgIGlmIChtX2lkVG9CcmVha3BvaW50LmNvbnRhaW5zKGJyZWFrcG9pbnRJZCkp CiAgICAgICAgIHJldHVybiAiIjsKIAotICAgIG1fYnJlYWtwb2ludHMuc2V0KG5vZGUsIG1hc2sg fCByb290Qml0KTsKKyAgICBtX2lkVG9CcmVha3BvaW50LnNldChicmVha3BvaW50SWQsIHN0ZDo6 bWFrZV9wYWlyKG5vZGVJZCwgdHlwZSkpOworCisgICAgdWludDMyX3Qgcm9vdEJpdCA9IDEgPDwg dHlwZTsKKyAgICBtX2JyZWFrcG9pbnRzLnNldChub2RlLCBtX2JyZWFrcG9pbnRzLmdldChub2Rl KSB8IHJvb3RCaXQpOwogICAgIGlmIChyb290Qml0ICYgaW5oZXJpdGFibGVET01CcmVha3BvaW50 VHlwZXNNYXNrKSB7CiAgICAgICAgIGZvciAoTm9kZSogY2hpbGQgPSBpbm5lckZpcnN0Q2hpbGQo bm9kZSk7IGNoaWxkOyBjaGlsZCA9IGlubmVyTmV4dFNpYmxpbmcoY2hpbGQpKQogICAgICAgICAg ICAgdXBkYXRlU3VidHJlZUJyZWFrcG9pbnRzKGNoaWxkLCByb290Qml0LCB0cnVlKTsKICAgICB9 CiAKLSAgICBTdHJpbmcgYnJlYWtwb2ludElkID0gbWFrZVN0cmluZygiZG9tOiIsIFN0cmluZzo6 bnVtYmVyKCsrbV9sYXN0QnJlYWtwb2ludElkKSk7Ci0gICAgQnJlYWtwb2ludCBicmVha3BvaW50 KG5vZGUsIHR5cGUpOwotICAgIG1faWRUb0JyZWFrcG9pbnQuc2V0KGJyZWFrcG9pbnRJZCwgYnJl YWtwb2ludCk7Ci0gICAgbV9icmVha3BvaW50VG9JZC5zZXQoYnJlYWtwb2ludCwgYnJlYWtwb2lu dElkKTsKICAgICByZXR1cm4gYnJlYWtwb2ludElkOwogfQogCiB2b2lkIEluc3BlY3RvckRPTUFn ZW50OjpyZW1vdmVET01CcmVha3BvaW50KGNvbnN0IFN0cmluZyYgYnJlYWtwb2ludElkKQogewot ICAgIEhhc2hNYXA8U3RyaW5nLCBCcmVha3BvaW50Pjo6aXRlcmF0b3IgaXQgPSBtX2lkVG9CcmVh a3BvaW50LmZpbmQoYnJlYWtwb2ludElkKTsKLSAgICBpZiAoaXQgPT0gbV9pZFRvQnJlYWtwb2lu dC5lbmQoKSkKKyAgICBCcmVha3BvaW50IGJyZWFrcG9pbnQgPSBtX2lkVG9CcmVha3BvaW50LnRh a2UoYnJlYWtwb2ludElkKTsKKworICAgIE5vZGUqIG5vZGUgPSBub2RlRm9ySWQoYnJlYWtwb2lu dC5maXJzdCk7CisgICAgaWYgKCFub2RlKQogICAgICAgICByZXR1cm47Ci0gICAgQnJlYWtwb2lu dCBicmVha3BvaW50ID0gaXQtPnNlY29uZDsKLSAgICBtX2lkVG9CcmVha3BvaW50LnJlbW92ZShp dCk7Ci0gICAgbV9icmVha3BvaW50VG9JZC5yZW1vdmUoYnJlYWtwb2ludCk7CiAKLSAgICBOb2Rl KiBub2RlID0gYnJlYWtwb2ludC5maXJzdDsKICAgICB1aW50MzJfdCByb290Qml0ID0gMSA8PCBi cmVha3BvaW50LnNlY29uZDsKICAgICB1aW50MzJfdCBtYXNrID0gbV9icmVha3BvaW50cy5nZXQo bm9kZSkgJiB+cm9vdEJpdDsKICAgICBpZiAobWFzaykKQEAgLTg2OSw4ICs4NjIsOSBAQCBQYXNz UmVmUHRyPEluc3BlY3RvclZhbHVlPiBJbnNwZWN0b3JET01BZ2VudDo6ZGVzY3JpcHRpb25Gb3JE T01FdmVudChOb2RlKiB0YXJnZQogICAgICAgICAgICAgZGVzY3JpcHRpb24tPnNldEJvb2xlYW4o Imluc2VydGlvbiIsIGluc2VydGlvbik7CiAgICAgfQogCi0gICAgU3RyaW5nIGJyZWFrcG9pbnRJ ZCA9IG1fYnJlYWtwb2ludFRvSWQuZ2V0KEJyZWFrcG9pbnQoYnJlYWtwb2ludE93bmVyLCBicmVh a3BvaW50VHlwZSkpOwotICAgIGRlc2NyaXB0aW9uLT5zZXRTdHJpbmcoImJyZWFrcG9pbnRJZCIs IGJyZWFrcG9pbnRJZCk7CisgICAgbG9uZyBicmVha3BvaW50T3duZXJOb2RlSWQgPSBtX2RvY3Vt ZW50Tm9kZVRvSWRNYXAuZ2V0KGJyZWFrcG9pbnRPd25lcik7CisgICAgQVNTRVJUKGJyZWFrcG9p bnRPd25lck5vZGVJZCk7CisgICAgZGVzY3JpcHRpb24tPnNldFN0cmluZygiYnJlYWtwb2ludElk IiwgY3JlYXRlQnJlYWtwb2ludElkKGJyZWFrcG9pbnRPd25lck5vZGVJZCwgYnJlYWtwb2ludFR5 cGUpKTsKIAogICAgIHJldHVybiBkZXNjcmlwdGlvbjsKIH0KQEAgLTExOTMsMTUgKzExODcsMjAg QEAgdm9pZCBJbnNwZWN0b3JET01BZ2VudDo6cmVtb3ZlQnJlYWtwb2ludHNGb3JOb2RlKE5vZGUq IG5vZGUpCiAgICAgdWludDMyX3QgbWFzayA9IG1fYnJlYWtwb2ludHMudGFrZShub2RlKTsKICAg ICBpZiAoIW1hc2spCiAgICAgICAgIHJldHVybjsKKyAgICBsb25nIG5vZGVJZCA9IG1fZG9jdW1l bnROb2RlVG9JZE1hcC5nZXQobm9kZSk7CisgICAgaWYgKCFub2RlSWQpCisgICAgICAgIHJldHVy bjsKICAgICBmb3IgKGludCB0eXBlID0gMDsgdHlwZSA8IERPTUJyZWFrcG9pbnRUeXBlc0NvdW50 OyArK3R5cGUpIHsKLSAgICAgICAgaWYgKG1hc2sgJiAoMSA8PCB0eXBlKSkgewotICAgICAgICAg ICAgQnJlYWtwb2ludCBicmVha3BvaW50KG5vZGUsIHR5cGUpOwotICAgICAgICAgICAgU3RyaW5n IGJyZWFrcG9pbnRJZCA9IG1fYnJlYWtwb2ludFRvSWQudGFrZShicmVha3BvaW50KTsKLSAgICAg ICAgICAgIG1faWRUb0JyZWFrcG9pbnQucmVtb3ZlKGJyZWFrcG9pbnRJZCk7Ci0gICAgICAgIH0K KyAgICAgICAgaWYgKG1hc2sgJiYgKDEgPDwgdHlwZSkpCisgICAgICAgICAgICBtX2lkVG9CcmVh a3BvaW50LnJlbW92ZShjcmVhdGVCcmVha3BvaW50SWQobm9kZUlkLCB0eXBlKSk7CiAgICAgfQog fQogCitTdHJpbmcgSW5zcGVjdG9yRE9NQWdlbnQ6OmNyZWF0ZUJyZWFrcG9pbnRJZChsb25nIG5v ZGVJZCwgbG9uZyB0eXBlKQoreworICAgIHJldHVybiBtYWtlU3RyaW5nKCJkb206IiwgU3RyaW5n OjpudW1iZXIobm9kZUlkKSwgJzonLCBTdHJpbmc6Om51bWJlcih0eXBlKSk7Cit9CisKIHZvaWQg SW5zcGVjdG9yRE9NQWdlbnQ6OmdldFN0eWxlcyhsb25nIG5vZGVJZCwgYm9vbCBhdXRob3JPbmx5 LCBSZWZQdHI8SW5zcGVjdG9yVmFsdWU+KiBzdHlsZXMpCiB7CiAgICAgTm9kZSogbm9kZSA9IG5v ZGVGb3JJZChub2RlSWQpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y RE9NQWdlbnQuaCBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmgKaW5kZXgg NjY1NTQ3NjZlYjAwZTNiNGFiY2U1ZGRjMzBlZGRlMjUyNWU3YmQzYS4uODRjYTAyNzAwOTIyMjY4 YTdkZGMzYTI3N2VjZmEyODJjNzZjNWZjZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yRE9NQWdlbnQuaAorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01B Z2VudC5oCkBAIC0xNTgsNyArMTU4LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiAgICAgICAg IFN0cmluZyBkb2N1bWVudFVSTFN0cmluZyhEb2N1bWVudCogZG9jdW1lbnQpIGNvbnN0OwogCi0g ICAgICAgIFN0cmluZyBzZXRET01CcmVha3BvaW50KGNvbnN0IFN0cmluZyYgcGF0aCwgbG9uZyB0 eXBlKTsKKyAgICAgICAgU3RyaW5nIHNldERPTUJyZWFrcG9pbnQobG9uZyBub2RlSWQsIGxvbmcg dHlwZSk7CiAgICAgICAgIHZvaWQgcmVtb3ZlRE9NQnJlYWtwb2ludChjb25zdCBTdHJpbmcmIGJy ZWFrcG9pbnRJZCk7CiAKICAgICBwcml2YXRlOgpAQCAtMTc4LDYgKzE3OCw3IEBAIG5hbWVzcGFj ZSBXZWJDb3JlIHsKICAgICAgICAgdm9pZCB1cGRhdGVTdWJ0cmVlQnJlYWtwb2ludHMoTm9kZSog cm9vdCwgdWludDMyX3Qgcm9vdE1hc2ssIGJvb2wgdmFsdWUpOwogICAgICAgICB2b2lkIHJlbW92 ZUJyZWFrcG9pbnRzRm9yTm9kZShOb2RlKiBub2RlKTsKICAgICAgICAgUGFzc1JlZlB0cjxJbnNw ZWN0b3JWYWx1ZT4gZGVzY3JpcHRpb25Gb3JET01FdmVudChOb2RlKiB0YXJnZXQsIGxvbmcgYnJl YWtwb2ludFR5cGUsIGJvb2wgaW5zZXJ0aW9uKTsKKyAgICAgICAgU3RyaW5nIGNyZWF0ZUJyZWFr cG9pbnRJZChsb25nIG5vZGVJZCwgbG9uZyB0eXBlKTsKIAogICAgICAgICBQYXNzUmVmUHRyPElu c3BlY3Rvck9iamVjdD4gYnVpbGRPYmplY3RGb3JBdHRyaWJ1dGVTdHlsZXMoRWxlbWVudCogZWxl bWVudCk7CiAgICAgICAgIFBhc3NSZWZQdHI8SW5zcGVjdG9yQXJyYXk+IGJ1aWxkQXJyYXlGb3JD U1NSdWxlcyhEb2N1bWVudCogb3duZXJEb2N1bWVudCwgQ1NTUnVsZUxpc3QqKTsKQEAgLTIzMiwx MCArMjMzLDggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBIYXNoU2V0PFJlZlB0cjxO b2RlPiA+IG1fc2VhcmNoUmVzdWx0czsKICAgICAgICAgVmVjdG9yPGxvbmc+IG1faW5zcGVjdGVk Tm9kZXM7CiAgICAgICAgIEhhc2hNYXA8Tm9kZSosIHVpbnQzMl90PiBtX2JyZWFrcG9pbnRzOwot ICAgICAgICB0eXBlZGVmIHBhaXI8Tm9kZSosIGxvbmc+IEJyZWFrcG9pbnQ7CisgICAgICAgIHR5 cGVkZWYgcGFpcjxsb25nLCBsb25nPiBCcmVha3BvaW50OwogICAgICAgICBIYXNoTWFwPFN0cmlu ZywgQnJlYWtwb2ludD4gbV9pZFRvQnJlYWtwb2ludDsKLSAgICAgICAgSGFzaE1hcDxCcmVha3Bv aW50LCBTdHJpbmc+IG1fYnJlYWtwb2ludFRvSWQ7Ci0gICAgICAgIHVuc2lnbmVkIGludCBtX2xh c3RCcmVha3BvaW50SWQ7CiAgICAgfTsKIAogI2VuZGlmCmRpZmYgLS1naXQgYS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvQnJlYWtwb2ludE1hbmFnZXIuanMgYi9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvQnJlYWtwb2ludE1hbmFnZXIuanMKaW5kZXggZDEyMDAzM2Q3NjFiNGJlOTIz NzI0M2RhMTQzYjcxMzQ5NGMwOTAxOC4uM2Q1MTA5MjM4NDY2ZWNhNTdhZDU2YWNjMzBlMTU3MTEz Nzg0Y2Y0OCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0JyZWFrcG9p bnRNYW5hZ2VyLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9CcmVha3BvaW50 TWFuYWdlci5qcwpAQCAtODgsNyArODgsNiBAQCBXZWJJbnNwZWN0b3IuQnJlYWtwb2ludE1hbmFn ZXIucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9icmVha3BvaW50cyA9IHt9OwogICAgICAg ICBkZWxldGUgdGhpcy5fb25lVGltZUJyZWFrcG9pbnQ7CiAgICAgICAgIHRoaXMuX25hdGl2ZUJy ZWFrcG9pbnRzID0ge307Ci0gICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKCJy ZXNldCIpOwogICAgIH0sCiAKICAgICBfc2V0QnJlYWtwb2ludDogZnVuY3Rpb24oc291cmNlSUQs IHVybCwgbGluZSwgZW5hYmxlZCwgY29uZGl0aW9uKQpAQCAtMTI5LDE3ICsxMjgsMTYgQEAgV2Vi SW5zcGVjdG9yLkJyZWFrcG9pbnRNYW5hZ2VyLnByb3RvdHlwZSA9IHsKICAgICAgICAgSW5zcGVj dG9yQmFja2VuZC5zZXRCcmVha3BvaW50KGJyZWFrcG9pbnQuc291cmNlSUQsIGJyZWFrcG9pbnQu bGluZSwgYnJlYWtwb2ludC5lbmFibGVkLCBicmVha3BvaW50LmNvbmRpdGlvbiwgZGlkU2V0QnJl YWtwb2ludC5iaW5kKHRoaXMpKTsKICAgICB9LAogCi0gICAgY3JlYXRlRE9NQnJlYWtwb2ludDog ZnVuY3Rpb24ocGF0aCwgZG9tRXZlbnRUeXBlLCBkaXNhYmxlZCkKKyAgICBjcmVhdGVET01CcmVh a3BvaW50OiBmdW5jdGlvbihub2RlSWQsIGRvbUV2ZW50VHlwZSwgZGlzYWJsZWQpCiAgICAgewot ICAgICAgICB2YXIgZnJvbnRlbmRJZCA9ICJkb206IiArIHBhdGggKyAiOiIgKyBkb21FdmVudFR5 cGU7CisgICAgICAgIHZhciBmcm9udGVuZElkID0gImRvbToiICsgbm9kZUlkICsgIjoiICsgZG9t RXZlbnRUeXBlOwogICAgICAgICBpZiAoZnJvbnRlbmRJZCBpbiB0aGlzLl9uYXRpdmVCcmVha3Bv aW50cykKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICB2YXIgYnJlYWtwb2ludCA9IG5l dyBXZWJJbnNwZWN0b3IuRE9NQnJlYWtwb2ludCh0aGlzLCBmcm9udGVuZElkLCBwYXRoLCBkb21F dmVudFR5cGUpOworICAgICAgICB2YXIgYnJlYWtwb2ludCA9IG5ldyBXZWJJbnNwZWN0b3IuRE9N QnJlYWtwb2ludCh0aGlzLCBmcm9udGVuZElkLCBub2RlSWQsIGRvbUV2ZW50VHlwZSk7CiAgICAg ICAgIHRoaXMuX25hdGl2ZUJyZWFrcG9pbnRzW2Zyb250ZW5kSWRdID0gYnJlYWtwb2ludDsKICAg ICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoImRvbS1icmVha3BvaW50LWFkZGVk IiwgYnJlYWtwb2ludCk7CiAgICAgICAgIGJyZWFrcG9pbnQuZW5hYmxlZCA9ICFkaXNhYmxlZDsK LSAgICAgICAgSW5zcGVjdG9yQmFja2VuZC5wdXNoTm9kZUJ5UGF0aFRvRnJvbnRlbmQocGF0aCwg YnJlYWtwb2ludC5zZXROb2RlSWQuYmluZChicmVha3BvaW50KSk7CiAgICAgICAgIHJldHVybiBi cmVha3BvaW50OwogICAgIH0sCiAKQEAgLTIyNCw3ICsyMjIsOCBAQCBXZWJJbnNwZWN0b3IuQnJl YWtwb2ludE1hbmFnZXIucHJvdG90eXBlID0gewogICAgICAgICB2YXIgcGVyc2lzdGVudEJyZWFr cG9pbnRzID0gW107CiAgICAgICAgIGZvciAodmFyIGlkIGluIHRoaXMuX25hdGl2ZUJyZWFrcG9p bnRzKSB7CiAgICAgICAgICAgICB2YXIgYnJlYWtwb2ludCA9IHRoaXMuX25hdGl2ZUJyZWFrcG9p bnRzW2lkXTsKLSAgICAgICAgICAgIHBlcnNpc3RlbnRCcmVha3BvaW50cy5wdXNoKHsgdHlwZTog YnJlYWtwb2ludC5fdHlwZSwgZW5hYmxlZDogYnJlYWtwb2ludC5lbmFibGVkLCBjb25kaXRpb246 IGJyZWFrcG9pbnQuX2NvbmRpdGlvbiB9KTsKKyAgICAgICAgICAgIGlmIChicmVha3BvaW50Ll9w ZXJzaXN0ZW50Q29uZGl0aW9uKQorICAgICAgICAgICAgICAgIHBlcnNpc3RlbnRCcmVha3BvaW50 cy5wdXNoKHsgdHlwZTogYnJlYWtwb2ludC5fdHlwZSwgZW5hYmxlZDogYnJlYWtwb2ludC5lbmFi bGVkLCBjb25kaXRpb246IGJyZWFrcG9pbnQuX3BlcnNpc3RlbnRDb25kaXRpb24gfSk7CiAgICAg ICAgIH0KICAgICAgICAgV2ViSW5zcGVjdG9yLnNldHRpbmdzLm5hdGl2ZUJyZWFrcG9pbnRzID0g cGVyc2lzdGVudEJyZWFrcG9pbnRzOwogICAgIH0sCkBAIC0yNjUsMTQgKzI2NCw0MSBAQCBXZWJJ bnNwZWN0b3IuQnJlYWtwb2ludE1hbmFnZXIucHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAg dmFyIGJyZWFrcG9pbnRzID0gdGhpcy5fcGVyc2lzdGVudEJyZWFrcG9pbnRzKCk7CiAgICAgICAg IGZvciAodmFyIGkgPSAwOyBpIDwgYnJlYWtwb2ludHMubGVuZ3RoOyArK2kpIHsKLSAgICAgICAg ICAgIHZhciB0eXBlID0gYnJlYWtwb2ludHNbaV0udHlwZTsKLSAgICAgICAgICAgIHZhciBjb25k aXRpb24gPSBicmVha3BvaW50c1tpXS5jb25kaXRpb247Ci0gICAgICAgICAgICBpZiAodHlwZSA9 PT0gIkRPTSIpCi0gICAgICAgICAgICAgICAgdGhpcy5jcmVhdGVET01CcmVha3BvaW50KGNvbmRp dGlvbi5wYXRoLCBjb25kaXRpb24udHlwZSwgIWJyZWFrcG9pbnRzW2ldLmVuYWJsZWQpOwotICAg ICAgICAgICAgZWxzZSBpZiAodHlwZSA9PT0gIkV2ZW50TGlzdGVuZXIiKQotICAgICAgICAgICAg ICAgIHRoaXMuY3JlYXRlRXZlbnRMaXN0ZW5lckJyZWFrcG9pbnQoY29uZGl0aW9uLmV2ZW50TmFt ZSk7Ci0gICAgICAgICAgICBlbHNlIGlmICh0eXBlID09PSAiWEhSIikKLSAgICAgICAgICAgICAg ICB0aGlzLmNyZWF0ZVhIUkJyZWFrcG9pbnQoY29uZGl0aW9uLnVybCwgIWJyZWFrcG9pbnRzW2ld LmVuYWJsZWQpOworICAgICAgICAgICAgaWYgKGJyZWFrcG9pbnRzW2ldLnR5cGUgPT09ICJFdmVu dExpc3RlbmVyIikKKyAgICAgICAgICAgICAgICB0aGlzLmNyZWF0ZUV2ZW50TGlzdGVuZXJCcmVh a3BvaW50KGJyZWFrcG9pbnRzW2ldLmNvbmRpdGlvbi5ldmVudE5hbWUpOworICAgICAgICAgICAg ZWxzZSBpZiAoYnJlYWtwb2ludHNbaV0udHlwZSA9PT0gIlhIUiIpCisgICAgICAgICAgICAgICAg dGhpcy5jcmVhdGVYSFJCcmVha3BvaW50KGJyZWFrcG9pbnRzW2ldLmNvbmRpdGlvbi51cmwsICFi cmVha3BvaW50c1tpXS5lbmFibGVkKTsKKyAgICAgICAgfQorICAgIH0sCisKKyAgICByZXN0b3Jl RE9NQnJlYWtwb2ludHM6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIGZ1bmN0aW9uIGRpZFB1 c2hOb2RlQnlQYXRoVG9Gcm9udGVuZChwYXRoLCBub2RlSWQpCisgICAgICAgIHsKKyAgICAgICAg ICAgIHBhdGhUb05vZGVJZFtwYXRoXSA9IG5vZGVJZDsKKyAgICAgICAgICAgIHBlbmRpbmdDYWxs cyAtPSAxOworICAgICAgICAgICAgaWYgKHBlbmRpbmdDYWxscykKKyAgICAgICAgICAgICAgICBy ZXR1cm47CisgICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGJyZWFrcG9pbnRzLmxlbmd0 aDsgKytpKSB7CisgICAgICAgICAgICAgICAgdmFyIGJyZWFrcG9pbnQgPSBicmVha3BvaW50c1tp XTsKKyAgICAgICAgICAgICAgICB2YXIgbm9kZUlkID0gcGF0aFRvTm9kZUlkW2JyZWFrcG9pbnQu Y29uZGl0aW9uLnBhdGhdOworICAgICAgICAgICAgICAgIGlmIChub2RlSWQpCisgICAgICAgICAg ICAgICAgICAgIHRoaXMuY3JlYXRlRE9NQnJlYWtwb2ludChub2RlSWQsIGJyZWFrcG9pbnQuY29u ZGl0aW9uLnR5cGUsICFicmVha3BvaW50LmVuYWJsZWQpOworICAgICAgICAgICAgfQorICAgICAg ICB9CisKKyAgICAgICAgdmFyIGJyZWFrcG9pbnRzID0gdGhpcy5fcGVyc2lzdGVudEJyZWFrcG9p bnRzKCk7CisgICAgICAgIHZhciBwYXRoVG9Ob2RlSWQgPSB7fTsKKyAgICAgICAgdmFyIHBlbmRp bmdDYWxscyA9IDA7CisgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgYnJlYWtwb2ludHMubGVu Z3RoOyArK2kpIHsKKyAgICAgICAgICAgIGlmIChicmVha3BvaW50c1tpXS50eXBlICE9PSAiRE9N IikKKyAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgIHZhciBwYXRoID0gYnJl YWtwb2ludHNbaV0uY29uZGl0aW9uLnBhdGg7CisgICAgICAgICAgICBpZiAocGF0aCBpbiBwYXRo VG9Ob2RlSWQpCisgICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICBwYXRoVG9O b2RlSWRbcGF0aF0gPSAwOworICAgICAgICAgICAgcGVuZGluZ0NhbGxzICs9IDE7CisgICAgICAg ICAgICBJbnNwZWN0b3JCYWNrZW5kLnB1c2hOb2RlQnlQYXRoVG9Gcm9udGVuZChwYXRoLCBkaWRQ dXNoTm9kZUJ5UGF0aFRvRnJvbnRlbmQuYmluZCh0aGlzLCBwYXRoKSk7CiAgICAgICAgIH0KICAg ICB9LAogCkBAIC00NDMsMjYgKzQ2OSwyMSBAQCBXZWJJbnNwZWN0b3IuTmF0aXZlQnJlYWtwb2lu dC5wcm90b3R5cGUgPSB7CiAKIFdlYkluc3BlY3Rvci5OYXRpdmVCcmVha3BvaW50LnByb3RvdHlw ZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuT2JqZWN0LnByb3RvdHlwZTsKIAotV2ViSW5zcGVj dG9yLkRPTUJyZWFrcG9pbnQgPSBmdW5jdGlvbihtYW5hZ2VyLCBmcm9udGVuZElkLCBwYXRoLCBk b21FdmVudFR5cGUpCitXZWJJbnNwZWN0b3IuRE9NQnJlYWtwb2ludCA9IGZ1bmN0aW9uKG1hbmFn ZXIsIGZyb250ZW5kSWQsIG5vZGVJZCwgZG9tRXZlbnRUeXBlKQogewogICAgIFdlYkluc3BlY3Rv ci5OYXRpdmVCcmVha3BvaW50LmNhbGwodGhpcywgbWFuYWdlciwgZnJvbnRlbmRJZCwgIkRPTSIp OwotICAgIHRoaXMuX3BhdGggPSBwYXRoOworICAgIHRoaXMuX25vZGVJZCA9IG5vZGVJZDsKICAg ICB0aGlzLl9kb21FdmVudFR5cGUgPSBkb21FdmVudFR5cGU7Ci0gICAgdGhpcy5fY29uZGl0aW9u ID0geyBwYXRoOiB0aGlzLl9wYXRoLCB0eXBlOiB0aGlzLl9kb21FdmVudFR5cGUgfTsKKyAgICB0 aGlzLl9jb25kaXRpb24gPSB7IG5vZGVJZDogdGhpcy5fbm9kZUlkLCB0eXBlOiB0aGlzLl9kb21F dmVudFR5cGUgfTsKKworICAgIHZhciBub2RlID0gV2ViSW5zcGVjdG9yLmRvbUFnZW50Lm5vZGVG b3JJZCh0aGlzLl9ub2RlSWQpOworICAgIGlmIChub2RlKSB7CisgICAgICAgIG5vZGUuYnJlYWtw b2ludHNbdGhpcy5fZG9tRXZlbnRUeXBlXSA9IHRoaXM7CisgICAgICAgIHRoaXMuX3BlcnNpc3Rl bnRDb25kaXRpb24gPSB7IHBhdGg6IG5vZGUucGF0aCgpLCB0eXBlOiB0aGlzLl9kb21FdmVudFR5 cGUgfTsKKyAgICB9CiB9CiAKIFdlYkluc3BlY3Rvci5ET01CcmVha3BvaW50LnByb3RvdHlwZSA9 IHsKLSAgICBzZXROb2RlSWQ6IGZ1bmN0aW9uKG5vZGVJZCkKLSAgICB7Ci0gICAgICAgIHRoaXMu X25vZGVJZCA9IG5vZGVJZDsKLSAgICAgICAgdmFyIG5vZGUgPSBXZWJJbnNwZWN0b3IuZG9tQWdl bnQubm9kZUZvcklkKHRoaXMuX25vZGVJZCk7Ci0gICAgICAgIGlmIChub2RlKSB7Ci0gICAgICAg ICAgICBub2RlLmJyZWFrcG9pbnRzW3RoaXMuX2RvbUV2ZW50VHlwZV0gPSB0aGlzOwotICAgICAg ICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoImxhYmVsLWNoYW5nZWQiKTsKLSAg ICAgICAgfSBlbHNlCi0gICAgICAgICAgICB0aGlzLnJlbW92ZSgpOwotICAgIH0sCi0KICAgICBj b21wYXJlVG86IGZ1bmN0aW9uKG90aGVyKQogICAgIHsKICAgICAgICAgcmV0dXJuIHRoaXMuX2Nv bXBhcmUodGhpcy5fZG9tRXZlbnRUeXBlLCBvdGhlci5fZG9tRXZlbnRUeXBlKTsKQEAgLTQ3MSw5 ICs0OTIsNiBAQCBXZWJJbnNwZWN0b3IuRE9NQnJlYWtwb2ludC5wcm90b3R5cGUgPSB7CiAgICAg cG9wdWxhdGVMYWJlbEVsZW1lbnQ6IGZ1bmN0aW9uKGVsZW1lbnQpCiAgICAgewogICAgICAgICAv LyBGSVhNRTogdGhpcyBzaG91bGQgYmVsb25nIHRvIHRoZSB2aWV3LCBub3QgdGhlIG1hbmFnZXIu Ci0gICAgICAgIGlmICghdGhpcy5fbm9kZUlkKQotICAgICAgICAgICAgcmV0dXJuOwotCiAgICAg ICAgIHZhciBsaW5raWZpZWROb2RlID0gV2ViSW5zcGVjdG9yLnBhbmVscy5lbGVtZW50cy5saW5r aWZ5Tm9kZUJ5SWQodGhpcy5fbm9kZUlkKTsKICAgICAgICAgbGlua2lmaWVkTm9kZS5hZGRTdHls ZUNsYXNzKCJtb25vc3BhY2UiKTsKICAgICAgICAgZWxlbWVudC5hcHBlbmRDaGlsZChsaW5raWZp ZWROb2RlKTsKQEAgLTUyNiw2ICs1NDQsNyBAQCBXZWJJbnNwZWN0b3IuRXZlbnRMaXN0ZW5lckJy ZWFrcG9pbnQgPSBmdW5jdGlvbihtYW5hZ2VyLCBmcm9udGVuZElkLCBldmVudE5hbWUpCiAgICAg V2ViSW5zcGVjdG9yLk5hdGl2ZUJyZWFrcG9pbnQuY2FsbCh0aGlzLCBtYW5hZ2VyLCBmcm9udGVu ZElkLCAiRXZlbnRMaXN0ZW5lciIpOwogICAgIHRoaXMuX2V2ZW50TmFtZSA9IGV2ZW50TmFtZTsK ICAgICB0aGlzLl9jb25kaXRpb24gPSB7IGV2ZW50TmFtZTogdGhpcy5fZXZlbnROYW1lIH07Cisg ICAgdGhpcy5fcGVyc2lzdGVudENvbmRpdGlvbiA9IHRoaXMuX2NvbmRpdGlvbjsKIH0KIAogV2Vi SW5zcGVjdG9yLkV2ZW50TGlzdGVuZXJCcmVha3BvaW50LmV2ZW50TmFtZUZvclVJID0gZnVuY3Rp b24oZXZlbnROYW1lKQpAQCAtNTcwLDYgKzU4OSw3IEBAIFdlYkluc3BlY3Rvci5YSFJCcmVha3Bv aW50ID0gZnVuY3Rpb24obWFuYWdlciwgZnJvbnRlbmRJZCwgdXJsKQogICAgIFdlYkluc3BlY3Rv ci5OYXRpdmVCcmVha3BvaW50LmNhbGwodGhpcywgbWFuYWdlciwgZnJvbnRlbmRJZCwgIlhIUiIp OwogICAgIHRoaXMuX3VybCA9IHVybDsKICAgICB0aGlzLl9jb25kaXRpb24gPSB7IHVybDogdGhp cy5fdXJsIH07CisgICAgdGhpcy5fcGVyc2lzdGVudENvbmRpdGlvbiA9IHRoaXMuX2NvbmRpdGlv bjsKIH0KIAogV2ViSW5zcGVjdG9yLlhIUkJyZWFrcG9pbnQucHJvdG90eXBlID0gewpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0JyZWFrcG9pbnRzU2lkZWJhclBhbmUu anMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQnJlYWtwb2ludHNTaWRlYmFyUGFuZS5q cwppbmRleCA1NTJmYTg4M2QwNTYwNTc0NmViOWM0MjBlZjlmYzM5OWJhYWVjMWVlLi40NzE5NGRh NTJmMDMyNGZhMDA1ZWY5ODFjOTNiNzUxN2UwMjc4ZTkwIDEwMDY0NAotLS0gYS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvQnJlYWtwb2ludHNTaWRlYmFyUGFuZS5qcworKysgYi9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvQnJlYWtwb2ludHNTaWRlYmFyUGFuZS5qcwpAQCAtMzUsMTIg KzM1LDEwIEBAIFdlYkluc3BlY3Rvci5CcmVha3BvaW50c1NpZGViYXJQYW5lID0gZnVuY3Rpb24o dGl0bGUpCiAgICAgdGhpcy5lbXB0eUVsZW1lbnQudGV4dENvbnRlbnQgPSBXZWJJbnNwZWN0b3Iu VUlTdHJpbmcoIk5vIEJyZWFrcG9pbnRzIik7CiAKICAgICB0aGlzLmJvZHlFbGVtZW50LmFwcGVu ZENoaWxkKHRoaXMuZW1wdHlFbGVtZW50KTsKLQotICAgIFdlYkluc3BlY3Rvci5icmVha3BvaW50 TWFuYWdlci5hZGRFdmVudExpc3RlbmVyKCJyZXNldCIsIHRoaXMuX3Jlc2V0LCB0aGlzKTsKIH0K IAogV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnRzU2lkZWJhclBhbmUucHJvdG90eXBlID0gewotICAg IF9yZXNldDogZnVuY3Rpb24oKQorICAgIHJlc2V0OiBmdW5jdGlvbigpCiAgICAgewogICAgICAg ICB0aGlzLmxpc3RFbGVtZW50LnJlbW92ZUNoaWxkcmVuKCk7CiAgICAgICAgIGlmICh0aGlzLmxp c3RFbGVtZW50LnBhcmVudEVsZW1lbnQpIHsKQEAgLTI1OSw3ICsyNTcsNiBAQCBXZWJJbnNwZWN0 b3IuRXZlbnRMaXN0ZW5lckJyZWFrcG9pbnRzU2lkZWJhclBhbmUgPSBmdW5jdGlvbigpCiAgICAg dGhpcy5ib2R5RWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLmNhdGVnb3JpZXNFbGVtZW50KTsKIAog ICAgIFdlYkluc3BlY3Rvci5icmVha3BvaW50TWFuYWdlci5hZGRFdmVudExpc3RlbmVyKCJldmVu dC1saXN0ZW5lci1icmVha3BvaW50LWFkZGVkIiwgdGhpcy5fYnJlYWtwb2ludEFkZGVkLCB0aGlz KTsKLSAgICBXZWJJbnNwZWN0b3IuYnJlYWtwb2ludE1hbmFnZXIuYWRkRXZlbnRMaXN0ZW5lcigi cmVzZXQiLCB0aGlzLl9yZXNldCwgdGhpcyk7CiAKICAgICB0aGlzLl9icmVha3BvaW50SXRlbXMg PSB7fTsKICAgICB0aGlzLl9jcmVhdGVDYXRlZ29yeSgiS2V5Ym9hcmQiLCAibGlzdGVuZXIiLCBb ImtleWRvd24iLCAia2V5dXAiLCAia2V5cHJlc3MiLCAidGV4dElucHV0Il0pOwpAQCAtMzg2LDcg KzM4Myw3IEBAIFdlYkluc3BlY3Rvci5FdmVudExpc3RlbmVyQnJlYWtwb2ludHNTaWRlYmFyUGFu ZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIGNhdGVnb3J5SXRlbS5jaGVja2JveC5pbmRldGVybWlu YXRlID0gaGFzRW5hYmxlZCAmJiBoYXNEaXNhYmxlZDsKICAgICB9LAogCi0gICAgX3Jlc2V0OiBm dW5jdGlvbigpCisgICAgcmVzZXQ6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIGZvciAodmFy IGV2ZW50TmFtZSBpbiB0aGlzLl9icmVha3BvaW50SXRlbXMpIHsKICAgICAgICAgICAgIHZhciBi cmVha3BvaW50SXRlbSA9IHRoaXMuX2JyZWFrcG9pbnRJdGVtc1tldmVudE5hbWVdOwpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RPTUFnZW50LmpzIGIvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL0RPTUFnZW50LmpzCmluZGV4IGFkMWViOTRhMWNhNzQ5YzZiN2Y3 NzdmYzM2MDc2NzE0ZjY3MTgwMDMuLjM3YmY1NDkzMTU0ZTM4Y2ZhOGYxZDE4NjczYzU3ZmIzOTcw OGZlYTAgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9ET01BZ2VudC5q cworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRE9NQWdlbnQuanMKQEAgLTM3OSw2 ICszNzksNyBAQCBXZWJJbnNwZWN0b3IuRE9NQWdlbnQucHJvdG90eXBlID0gewogICAgICAgICAg ICAgdGhpcy5kb2N1bWVudCA9IG5ldyBXZWJJbnNwZWN0b3IuRE9NRG9jdW1lbnQodGhpcywgdGhp cy5fd2luZG93LCBwYXlsb2FkKTsKICAgICAgICAgICAgIHRoaXMuX2lkVG9ET01Ob2RlW3BheWxv YWQuaWRdID0gdGhpcy5kb2N1bWVudDsKICAgICAgICAgICAgIHRoaXMuX2JpbmROb2Rlcyh0aGlz LmRvY3VtZW50LmNoaWxkcmVuKTsKKyAgICAgICAgICAgIFdlYkluc3BlY3Rvci5icmVha3BvaW50 TWFuYWdlci5yZXN0b3JlRE9NQnJlYWtwb2ludHMoKTsKICAgICAgICAgfSBlbHNlCiAgICAgICAg ICAgICB0aGlzLmRvY3VtZW50ID0gbnVsbDsKICAgICAgICAgV2ViSW5zcGVjdG9yLnBhbmVscy5l bGVtZW50cy5zZXREb2N1bWVudCh0aGlzLmRvY3VtZW50KTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1BhbmVsLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0VsZW1lbnRzUGFuZWwuanMKaW5kZXggYjFjZDI0Y2M3NzhiNzFjODZjZjE1NzQ4 YzgzMTBiOTVkYzk0YmE5ZS4uNjFiYTMzZTI5OTQwMTYwNDM1MjM4ZGQzZmY1ZDc5NDlkNmU0NWVj NiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzUGFuZWwu anMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzUGFuZWwuanMKQEAg LTE2OSw2ICsxNjksOSBAQCBXZWJJbnNwZWN0b3IuRWxlbWVudHNQYW5lbC5wcm90b3R5cGUgPSB7 CiAgICAgICAgIHRoaXMucmVjZW50bHlNb2RpZmllZE5vZGVzID0gW107CiAKICAgICAgICAgZGVs ZXRlIHRoaXMuY3VycmVudFF1ZXJ5OworCisgICAgICAgIGlmIChQcmVmZXJlbmNlcy5uYXRpdmVJ bnN0cnVtZW50YXRpb25FbmFibGVkKQorICAgICAgICAgICAgdGhpcy5zaWRlYmFyUGFuZXMuZG9t QnJlYWtwb2ludHMucmVzZXQoKTsKICAgICB9LAogCiAgICAgc2V0RG9jdW1lbnQ6IGZ1bmN0aW9u KGluc3BlY3RlZFJvb3REb2N1bWVudCkKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9FbGVtZW50c1RyZWVPdXRsaW5lLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0VsZW1lbnRzVHJlZU91dGxpbmUuanMKaW5kZXggMjBiM2FjNWM0ODA3MDJiODQxZDgxODky NjlmODU4ZGE5YjVmNTM4Yy4uZjg5M2NhMDRlNGE1ZGFiZGI0MGQ3ZDljZTg1M2ZmYjMwMDg0YmQ0 OCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzVHJlZU91 dGxpbmUuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzVHJlZU91 dGxpbmUuanMKQEAgLTc2NSw5ICs3NjUsOSBAQCBXZWJJbnNwZWN0b3IuRWxlbWVudHNUcmVlRWxl bWVudC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAvLyBBZGQgZGViYnVnaW5nLXJlbGF0ZWQg YWN0aW9ucwogICAgICAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kU2VwYXJhdG9yKCk7CiAKLSAg ICAgICAgICAgIGZ1bmN0aW9uIGhhbmRsZXJGdW5jdGlvbihwYXRoLCBicmVha1R5cGUpCisgICAg ICAgICAgICBmdW5jdGlvbiBoYW5kbGVyRnVuY3Rpb24obm9kZUlkLCBicmVha1R5cGUpCiAgICAg ICAgICAgICB7Ci0gICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmJyZWFrcG9pbnRNYW5hZ2Vy LmNyZWF0ZURPTUJyZWFrcG9pbnQocGF0aCwgYnJlYWtUeXBlKTsKKyAgICAgICAgICAgICAgICBX ZWJJbnNwZWN0b3IuYnJlYWtwb2ludE1hbmFnZXIuY3JlYXRlRE9NQnJlYWtwb2ludChub2RlSWQs IGJyZWFrVHlwZSk7CiAgICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnBhbmVscy5lbGVtZW50 cy5zaWRlYmFyUGFuZXMuZG9tQnJlYWtwb2ludHMuZXhwYW5kKCk7CiAgICAgICAgICAgICB9CiAg ICAgICAgICAgICB2YXIgbm9kZSA9IHRoaXMucmVwcmVzZW50ZWRPYmplY3Q7CkBAIC03NzYsNyAr Nzc2LDcgQEAgV2ViSW5zcGVjdG9yLkVsZW1lbnRzVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewog ICAgICAgICAgICAgICAgIHZhciBsYWJlbCA9IFdlYkluc3BlY3Rvci5kb21CcmVha3BvaW50VHlw ZUNvbnRleHRNZW51TGFiZWwodHlwZSk7CiAgICAgICAgICAgICAgICAgdmFyIGJyZWFrcG9pbnQg PSBub2RlLmJyZWFrcG9pbnRzW3R5cGVdOwogICAgICAgICAgICAgICAgIGlmICghYnJlYWtwb2lu dCkKLSAgICAgICAgICAgICAgICAgICAgdmFyIGhhbmRsZXIgPSBoYW5kbGVyRnVuY3Rpb24uYmlu ZCh0aGlzLCBub2RlLnBhdGgoKSwgdHlwZSk7CisgICAgICAgICAgICAgICAgICAgIHZhciBoYW5k bGVyID0gaGFuZGxlckZ1bmN0aW9uLmJpbmQodGhpcywgbm9kZS5pZCwgdHlwZSk7CiAgICAgICAg ICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAgICAgICB2YXIgaGFuZGxlciA9IGJyZWFrcG9p bnQucmVtb3ZlLmJpbmQoYnJlYWtwb2ludCk7CiAgICAgICAgICAgICAgICAgY29udGV4dE1lbnUu YXBwZW5kQ2hlY2tib3hJdGVtKGxhYmVsLCBoYW5kbGVyLCAhIWJyZWFrcG9pbnQpOwpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcyBiL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKaW5kZXggZTAxOGEyZmYxNzg2 MmJkNjUwYmExMjhhMjk5MzdmY2ZiMTFhODhhMy4uMGEzYzdhOTE2MGU4MTU3ZjhmMzIwY2E1MGU4 NDQyMDI5MDUyZjJkNSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Nj cmlwdHNQYW5lbC5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1Bh bmVsLmpzCkBAIC00NTYsOCArNDU2LDE1IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJv dG90eXBlID0gewogICAgICAgICB0aGlzLl9zb3VyY2VJRE1hcCA9IHt9OwogCiAgICAgICAgIHRo aXMuc2lkZWJhclBhbmVzLndhdGNoRXhwcmVzc2lvbnMucmVmcmVzaEV4cHJlc3Npb25zKCk7Ci0g ICAgICAgIGlmICghcHJlc2VydmVJdGVtcykKKyAgICAgICAgaWYgKCFwcmVzZXJ2ZUl0ZW1zKSB7 CisgICAgICAgICAgICB0aGlzLnNpZGViYXJQYW5lcy5qc0JyZWFrcG9pbnRzLnJlc2V0KCk7Cisg ICAgICAgICAgICBpZiAoUHJlZmVyZW5jZXMubmF0aXZlSW5zdHJ1bWVudGF0aW9uRW5hYmxlZCkg eworICAgICAgICAgICAgICAgIHRoaXMuc2lkZWJhclBhbmVzLmRvbUJyZWFrcG9pbnRzLnJlc2V0 KCk7CisgICAgICAgICAgICAgICAgdGhpcy5zaWRlYmFyUGFuZXMueGhyQnJlYWtwb2ludHMucmVz ZXQoKTsKKyAgICAgICAgICAgICAgICB0aGlzLnNpZGViYXJQYW5lcy5ldmVudExpc3RlbmVyQnJl YWtwb2ludHMucmVzZXQoKTsKKyAgICAgICAgICAgIH0KICAgICAgICAgICAgIHRoaXMuc2lkZWJh clBhbmVzLndvcmtlcnMucmVzZXQoKTsKKyAgICAgICAgfQogICAgIH0sCiAKICAgICBnZXQgdmlz aWJsZVZpZXcoKQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3Bl Y3Rvci5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKaW5kZXgg MDM1NmRiYmYwNWFiNzc4MDU2NTc1NjdhZjM1OWM2YzhjZWM5NWFmZC4uNzg1OTJmZmMwZDkxMWY3 MTJiMWU4YmM5ZDEyZTVjOWU2NGJmNGJhOCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL2luc3BlY3Rvci5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv aW5zcGVjdG9yLmpzCkBAIC0xMzc1LDYgKzEzNzUsOCBAQCBXZWJJbnNwZWN0b3IucmVzZXQgPSBm dW5jdGlvbigpCiAKICAgICB0aGlzLmNvbnNvbGUuY2xlYXJNZXNzYWdlcygpOwogICAgIHRoaXMu ZXh0ZW5zaW9uU2VydmVyLm5vdGlmeUluc3BlY3RvclJlc2V0KCk7CisKKyAgICB0aGlzLmJyZWFr cG9pbnRNYW5hZ2VyLnJlc3RvcmVCcmVha3BvaW50cygpOwogfQogCiBXZWJJbnNwZWN0b3IucmVz ZXRQcm9maWxlc1BhbmVsID0gZnVuY3Rpb24oKQpAQCAtMTQwMyw3ICsxNDA1LDYgQEAgV2ViSW5z cGVjdG9yLmRpZENvbW1pdExvYWQgPSBmdW5jdGlvbigpCiB7CiAgICAgLy8gQ2xlYW51cCBlbGVt ZW50cyBwYW5lbCBlYXJseSBvbiBpbnNwZWN0ZWQgcGFnZSByZWZyZXNoLgogICAgIFdlYkluc3Bl Y3Rvci5zZXREb2N1bWVudChudWxsKTsKLSAgICB0aGlzLmJyZWFrcG9pbnRNYW5hZ2VyLnJlc3Rv cmVCcmVha3BvaW50cygpOwogfQogCiBXZWJJbnNwZWN0b3IudXBkYXRlQ29uc29sZU1lc3NhZ2VF eHBpcmVkQ291bnQgPSBmdW5jdGlvbihjb3VudCkK