48121 2010-10-22 04:10:55 -0700 Web Inspector: update resources tree in storage panel upon network events. 2010-10-22 06:33:33 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman pfeldman apavlov bweinstein commit-queue joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 297900 0 pfeldman 2010-10-22 04:10:55 -0700 We now have live frame tree with resources no matter whether resource tracking is on or off. 297901 1 71546 pfeldman 2010-10-22 04:12:36 -0700 Created attachment 71546 [PATCH] Proposed change. 297910 2 71546 yurys 2010-10-22 04:53:25 -0700 Comment on attachment 71546 [PATCH] Proposed change. View in context: https://bugs.webkit.org/attachment.cgi?id=71546&action=review > WebCore/inspector/InspectorResourceAgent.cpp:354 > + frameObject->setNumber("parentId", reinterpret_cast<uintptr_t>(frame->tree()->parent())); can we extract this reinterpret_cast into a function that would convert to the id for us? > WebCore/inspector/front-end/StoragePanel.js:187 > + (child._resource.type !== WebInspector.Resource.Type.Document && child._resource.displayName.localeCompare(resource.displayName) > 0)) { style: wrong alignment 297914 3 pfeldman 2010-10-22 05:20:33 -0700 (In reply to comment #2) > (From update of attachment 71546 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=71546&action=review > > > WebCore/inspector/InspectorResourceAgent.cpp:354 > > + frameObject->setNumber("parentId", reinterpret_cast<uintptr_t>(frame->tree()->parent())); > > can we extract this reinterpret_cast into a function that would convert to the id for us? > Will fix in the next patch. 297957 4 71546 commit-queue 2010-10-22 06:33:28 -0700 Comment on attachment 71546 [PATCH] Proposed change. Clearing flags on attachment: 71546 Committed r70305: <http://trac.webkit.org/changeset/70305> 297958 5 commit-queue 2010-10-22 06:33:33 -0700 All reviewed patches have been landed. Closing bug. 71546 2010-10-22 04:12:36 -0700 2010-10-22 06:33:28 -0700 [PATCH] Proposed change. live_tree text/plain 19396 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MTk4YmM3ZS4uNjRlZTA2YiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSw0MSBAQAorMjAxMC0xMC0yMiAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiB1cGRhdGUgcmVzb3VyY2VzIHRyZWUg aW4gc3RvcmFnZSBwYW5lbCB1cG9uIG5ldHdvcmsgZXZlbnRzLgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDgxMjEKKworICAgICAgICAqIGluc3BlY3Rv ci9JbnNwZWN0b3IuaWRsOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFn ZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmJ1aWxkT2JqZWN0Rm9yRG9jdW1lbnRMb2FkZXIp OgorICAgICAgICAoV2ViQ29yZTo6YnVpbGRPYmplY3RGb3JGcmFtZVRyZWUpOgorICAgICAgICAo V2ViQ29yZTo6SW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6ZGlkQ29tbWl0TG9hZCk6CisgICAgICAg IChXZWJDb3JlOjpJbnNwZWN0b3JSZXNvdXJjZUFnZW50OjpmcmFtZURldGFjaGVkRnJvbVBhcmVu dCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZU1hbmFnZXIuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VNYW5hZ2VyKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5SZXNvdXJjZU1hbmFnZXIucHJvdG90eXBlLl9jcmVhdGVSZXNvdXJjZSk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuUmVzb3VyY2VNYW5hZ2VyLnByb3RvdHlwZS5kaWRSZWNlaXZlUmVzcG9u c2UpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlTWFuYWdlci5wcm90b3R5cGUuZGlk TG9hZFJlc291cmNlRnJvbU1lbW9yeUNhY2hlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNv dXJjZU1hbmFnZXIucHJvdG90eXBlLmRpZENvbW1pdExvYWRGb3JGcmFtZSk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuUmVzb3VyY2VNYW5hZ2VyLnByb3RvdHlwZS5fYWRkUmVzb3VyY2VUb1N0b3Jh Z2VGcmFtZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VNYW5hZ2VyLnByb3RvdHlw ZS5mcmFtZURldGFjaGVkRnJvbVBhcmVudCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3Vy Y2VNYW5hZ2VyLnByb3RvdHlwZS5fY2xlYXJSZXNvdXJjZXMpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlJlc291cmNlTWFuYWdlci5wcm90b3R5cGUuX3Byb2Nlc3NDYWNoZWRSZXNvdXJjZXMpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlTWFuYWdlci5wcm90b3R5cGUuX2FkZEZyYW1l c1JlY3Vyc2l2ZWx5KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZU1hbmFnZXIuZ2V0 Q29udGVudHMpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU3RvcmFnZVBhbmVsLmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0b3JhZ2VQYW5lbC5wcm90b3R5cGUuYWRkT3JVcGRh dGVGcmFtZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3RvcmFnZVBhbmVsLnByb3RvdHlwZS5y ZW1vdmVGcmFtZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3RvcmFnZVBhbmVsLnByb3RvdHlw ZS5hZGRSZXNvdXJjZVRvRnJhbWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0b3JhZ2VQYW5l bC5wcm90b3R5cGUucmVtb3ZlUmVzb3VyY2VzRnJvbUZyYW1lKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5CYXNlU3RvcmFnZVRyZWVFbGVtZW50LnByb3RvdHlwZS5vbmF0dGFjaCk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuQmFzZVN0b3JhZ2VUcmVlRWxlbWVudC5wcm90b3R5cGUub25yZXZlYWwp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkJhc2VTdG9yYWdlVHJlZUVsZW1lbnQucHJvdG90eXBl LnNldCB0aXRsZVRleHQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZyYW1lVHJlZUVsZW1lbnQp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZyYW1lVHJlZUVsZW1lbnQucHJvdG90eXBlLm9uc2Vs ZWN0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5GcmFtZVRyZWVFbGVtZW50LnByb3RvdHlwZS5n ZXQgZGlzcGxheU5hbWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZyYW1lVHJlZUVsZW1lbnQu cHJvdG90eXBlLnNldCBkaXNwbGF5TmFtZSk6CisKIDIwMTAtMTAtMjEgIFBhdmVsIEZlbGRtYW4g IDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgWXVyeSBTZW1p a2hhdHNreS4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5pZGwgYi9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuaWRsCmluZGV4IGI1YTQzODguLjEwN2YxNTYgMTAw NjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5pZGwKKysrIGIvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yLmlkbApAQCAtMTIzLDggKzEyMyw4IEBAIG1vZHVsZSBjb3JlIHsK ICAgICAgICAgW25vdGlmeV0gdm9pZCBkaWRGYWlsTG9hZGluZyhvdXQgbG9uZyBpZGVudGlmaWVy LCBvdXQgZG91YmxlIHRpbWUsIG91dCBTdHJpbmcgbG9jYWxpemVkRGVzY3JpcHRpb24pOwogICAg ICAgICBbbm90aWZ5XSB2b2lkIGRpZExvYWRSZXNvdXJjZUZyb21NZW1vcnlDYWNoZShvdXQgZG91 YmxlIHRpbWUsIG91dCBPYmplY3QgcmVzb3VyY2UpOwogICAgICAgICBbbm90aWZ5XSB2b2lkIHNl dE92ZXJyaWRlQ29udGVudChvdXQgbG9uZyBpZGVudGlmaWVyLCBvdXQgU3RyaW5nIHNvdXJjZVN0 cmluZywgb3V0IFN0cmluZyB0eXBlKTsKLSAgICAgICAgW25vdGlmeV0gdm9pZCBkaWRDb21taXRM b2FkRm9yRnJhbWUob3V0IE9iamVjdCBmcmFtZVRyZWUsIG91dCB1bnNpZ25lZCBsb25nIGxvYWRl cklkKTsKLSAgICAgICAgW25vdGlmeV0gdm9pZCBmcmFtZURldGFjaGVkRnJvbVBhcmVudChvdXQg T2JqZWN0IGZyYW1lVHJlZSk7CisgICAgICAgIFtub3RpZnldIHZvaWQgZGlkQ29tbWl0TG9hZEZv ckZyYW1lKG91dCB1bnNpZ25lZCBsb25nIHBhcmVudEZyYW1lSWQsIG91dCBPYmplY3QgbG9hZGVy KTsKKyAgICAgICAgW25vdGlmeV0gdm9pZCBmcmFtZURldGFjaGVkRnJvbVBhcmVudChvdXQgdW5z aWduZWQgbG9uZyBmcmFtZUlkKTsKIAogICAgICAgICBbbm90aWZ5XSB2b2lkIGRpZENyZWF0ZVdl YlNvY2tldChvdXQgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBvdXQgU3RyaW5nIHJlcXVlc3RV UkwpOwogICAgICAgICBbbm90aWZ5XSB2b2lkIHdpbGxTZW5kV2ViU29ja2V0SGFuZHNoYWtlUmVx dWVzdChvdXQgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBvdXQgZG91YmxlIHRpbWUsIG91dCBP YmplY3QgcmVxdWVzdCk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JS ZXNvdXJjZUFnZW50LmNwcCBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdl bnQuY3BwCmluZGV4IDBkZjNlODcuLmVlNzQ1N2IgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQuY3BwCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvclJlc291cmNlQWdlbnQuY3BwCkBAIC0yMDQsNiArMjA0LDcgQEAgc3RhdGljIFBhc3NS ZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBidWlsZE9iamVjdEZvckRvY3VtZW50TG9hZGVyKERvY3Vt ZW50TG9hZGVyKgogICAgIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGRvY3VtZW50TG9hZGVyT2Jq ZWN0ID0gSW5zcGVjdG9yT2JqZWN0OjpjcmVhdGUoKTsKICAgICBkb2N1bWVudExvYWRlck9iamVj dC0+c2V0TnVtYmVyKCJmcmFtZUlkIiwgcmVpbnRlcnByZXRfY2FzdDx1aW50cHRyX3Q+KGxvYWRl ci0+ZnJhbWUoKSkpOwogICAgIGRvY3VtZW50TG9hZGVyT2JqZWN0LT5zZXROdW1iZXIoImxvYWRl cklkIiwgcmVpbnRlcnByZXRfY2FzdDx1aW50cHRyX3Q+KGxvYWRlcikpOworICAgIGRvY3VtZW50 TG9hZGVyT2JqZWN0LT5zZXRTdHJpbmcoInVybCIsIGxvYWRlci0+cmVxdWVzdFVSTCgpLnN0cmlu ZygpKTsKICAgICByZXR1cm4gZG9jdW1lbnRMb2FkZXJPYmplY3Q7CiB9CiAKQEAgLTM1MCw2ICsz NTEsNyBAQCB2b2lkIEluc3BlY3RvclJlc291cmNlQWdlbnQ6OnNldE92ZXJyaWRlQ29udGVudCh1 bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0CiBzdGF0aWMgUGFzc1JlZlB0cjxJbnNwZWN0 b3JPYmplY3Q+IGJ1aWxkT2JqZWN0Rm9yRnJhbWVUcmVlKEZyYW1lKiBmcmFtZSwgYm9vbCBkdW1w UmVzb3VyY2VzKQogewogICAgIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGZyYW1lT2JqZWN0ID0g SW5zcGVjdG9yT2JqZWN0OjpjcmVhdGUoKTsKKyAgICBmcmFtZU9iamVjdC0+c2V0TnVtYmVyKCJw YXJlbnRJZCIsIHJlaW50ZXJwcmV0X2Nhc3Q8dWludHB0cl90PihmcmFtZS0+dHJlZSgpLT5wYXJl bnQoKSkpOwogICAgIGZyYW1lT2JqZWN0LT5zZXROdW1iZXIoImlkIiwgcmVpbnRlcnByZXRfY2Fz dDx1aW50cHRyX3Q+KGZyYW1lKSk7CiAgICAgaWYgKGR1bXBSZXNvdXJjZXMpCiAgICAgICAgIHBv cHVsYXRlT2JqZWN0V2l0aEZyYW1lUmVzb3VyY2VzKGZyYW1lLCBmcmFtZU9iamVjdCk7CkBAIC0z NjYsMTQgKzM2OCwxMyBAQCBzdGF0aWMgUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGJ1aWxk T2JqZWN0Rm9yRnJhbWVUcmVlKEZyYW1lKiBmcmFtZSwgYm9vbCBkdQogCiB2b2lkIEluc3BlY3Rv clJlc291cmNlQWdlbnQ6OmRpZENvbW1pdExvYWQoRG9jdW1lbnRMb2FkZXIqIGxvYWRlcikKIHsK LSAgICBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBmcmFtZU9iamVjdCA9IGJ1aWxkT2JqZWN0Rm9y RnJhbWVUcmVlKGxvYWRlci0+ZnJhbWUoKSwgZmFsc2UpOwotICAgIG1fZnJvbnRlbmQtPmRpZENv bW1pdExvYWRGb3JGcmFtZShmcmFtZU9iamVjdCwgcmVpbnRlcnByZXRfY2FzdDx1aW50cHRyX3Q+ KGxvYWRlcikpOworICAgIEZyYW1lKiBwYXJlbnRGcmFtZSA9IGxvYWRlci0+ZnJhbWUoKS0+dHJl ZSgpLT5wYXJlbnQoKTsKKyAgICBtX2Zyb250ZW5kLT5kaWRDb21taXRMb2FkRm9yRnJhbWUocmVp bnRlcnByZXRfY2FzdDx1aW50cHRyX3Q+KHBhcmVudEZyYW1lKSwgYnVpbGRPYmplY3RGb3JEb2N1 bWVudExvYWRlcihsb2FkZXIpKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JSZXNvdXJjZUFnZW50Ojpm cmFtZURldGFjaGVkRnJvbVBhcmVudChGcmFtZSogZnJhbWUpCiB7Ci0gICAgUmVmUHRyPEluc3Bl Y3Rvck9iamVjdD4gZnJhbWVPYmplY3QgPSBidWlsZE9iamVjdEZvckZyYW1lVHJlZShmcmFtZSwg ZmFsc2UpOwotICAgIG1fZnJvbnRlbmQtPmZyYW1lRGV0YWNoZWRGcm9tUGFyZW50KGZyYW1lT2Jq ZWN0KTsKKyAgICBtX2Zyb250ZW5kLT5mcmFtZURldGFjaGVkRnJvbVBhcmVudChyZWludGVycHJl dF9jYXN0PHVpbnRwdHJfdD4oZnJhbWUpKTsKIH0KIAogI2lmIEVOQUJMRShXRUJfU09DS0VUUykK ZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZU1hbmFnZXIu anMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VNYW5hZ2VyLmpzCmluZGV4 IDY3NDc5ZTIuLjJkOGRkYTEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9SZXNvdXJjZU1hbmFnZXIuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jl c291cmNlTWFuYWdlci5qcwpAQCAtNDgsNyArNDgsNyBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VN YW5hZ2VyID0gZnVuY3Rpb24oKQogICAgICAgICAiZGlkQ2xvc2VXZWJTb2NrZXQiKTsKIAogICAg IHRoaXMuX3Jlc291cmNlc0J5SWQgPSB7fTsKLSAgICB0aGlzLl9yZXNvdXJjZXNCeUZyYW1lID0g e307CisgICAgdGhpcy5fcmVzb3VyY2VzQnlGcmFtZUlkID0ge307CiAgICAgdGhpcy5fbGFzdENh Y2hlZElkID0gMDsKICAgICBJbnNwZWN0b3JCYWNrZW5kLmNhY2hlZFJlc291cmNlcyh0aGlzLl9w cm9jZXNzQ2FjaGVkUmVzb3VyY2VzLmJpbmQodGhpcykpOwogfQpAQCAtNzUsMTIgKzc1LDEyIEBA IFdlYkluc3BlY3Rvci5SZXNvdXJjZU1hbmFnZXIucHJvdG90eXBlID0gewogICAgICAgICB0aGlz Ll9yZXNvdXJjZXNCeUlkW2lkZW50aWZpZXJdID0gcmVzb3VyY2U7CiAKICAgICAgICAgcmVzb3Vy Y2UubG9hZGVyID0gbG9hZGVyOwotICAgICAgICB2YXIgcmVzb3VyY2VzRm9yRnJhbWUgPSB0aGlz Ll9yZXNvdXJjZXNCeUZyYW1lW2xvYWRlci5mcmFtZUlkXTsKKyAgICAgICAgdmFyIHJlc291cmNl c0ZvckZyYW1lID0gdGhpcy5fcmVzb3VyY2VzQnlGcmFtZUlkW2xvYWRlci5mcmFtZUlkXTsKICAg ICAgICAgaWYgKCFyZXNvdXJjZXNGb3JGcmFtZSkgewotICAgICAgICAgICAgcmVzb3VyY2VzRm9y RnJhbWUgPSB7fTsKLSAgICAgICAgICAgIHRoaXMuX3Jlc291cmNlc0J5RnJhbWVbbG9hZGVyLmZy YW1lSWRdID0gcmVzb3VyY2VzRm9yRnJhbWU7CisgICAgICAgICAgICByZXNvdXJjZXNGb3JGcmFt ZSA9IFtdOworICAgICAgICAgICAgdGhpcy5fcmVzb3VyY2VzQnlGcmFtZUlkW2xvYWRlci5mcmFt ZUlkXSA9IHJlc291cmNlc0ZvckZyYW1lOwogICAgICAgICB9Ci0gICAgICAgIHJlc291cmNlc0Zv ckZyYW1lW3Jlc291cmNlLmlkZW50aWZpZXJdID0gcmVzb3VyY2U7CisgICAgICAgIHJlc291cmNl c0ZvckZyYW1lLnB1c2gocmVzb3VyY2UpOwogICAgICAgICByZXR1cm4gcmVzb3VyY2U7CiAgICAg fSwKIApAQCAtMTQ2LDYgKzE0Niw3IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZU1hbmFnZXIucHJv dG90eXBlID0gewogICAgICAgICByZXNvdXJjZS5yZXNwb25zZVJlY2VpdmVkVGltZSA9IHRpbWU7 CiAKICAgICAgICAgV2ViSW5zcGVjdG9yLnBhbmVscy5uZXR3b3JrLnJlZnJlc2hSZXNvdXJjZShy ZXNvdXJjZSk7CisgICAgICAgIHRoaXMuX2FkZFJlc291cmNlVG9TdG9yYWdlRnJhbWUocmVzb3Vy Y2UubG9hZGVyLmZyYW1lSWQsIHJlc291cmNlKTsKICAgICB9LAogCiAgICAgX3VwZGF0ZVJlc291 cmNlV2l0aFJlc3BvbnNlOiBmdW5jdGlvbihyZXNvdXJjZSwgcmVzcG9uc2UpCkBAIC0yMTcsNiAr MjE4LDcgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlTWFuYWdlci5wcm90b3R5cGUgPSB7CiAgICAg ICAgIHJlc291cmNlLnN0YXJ0VGltZSA9IHJlc291cmNlLnJlc3BvbnNlUmVjZWl2ZWRUaW1lID0g cmVzb3VyY2UuZW5kVGltZSA9IHRpbWU7CiAKICAgICAgICAgV2ViSW5zcGVjdG9yLnBhbmVscy5u ZXR3b3JrLmFkZFJlc291cmNlKHJlc291cmNlKTsKKyAgICAgICAgV2ViSW5zcGVjdG9yLnBhbmVs cy5zdG9yYWdlLmFkZFJlc291cmNlVG9GcmFtZShyZXNvdXJjZS5sb2FkZXIuZnJhbWVJZCwgcmVz b3VyY2UpOwogICAgIH0sCiAKICAgICBfdXBkYXRlUmVzb3VyY2VXaXRoQ2FjaGVkUmVzb3VyY2U6 IGZ1bmN0aW9uKHJlc291cmNlLCBjYWNoZWRSZXNvdXJjZSkKQEAgLTIzOCwzMyArMjQwLDUwIEBA IFdlYkluc3BlY3Rvci5SZXNvdXJjZU1hbmFnZXIucHJvdG90eXBlID0gewogICAgICAgICBXZWJJ bnNwZWN0b3IucGFuZWxzLm5ldHdvcmsuYWRkUmVzb3VyY2UocmVzb3VyY2UpOwogICAgIH0sCiAK LSAgICBkaWRDb21taXRMb2FkRm9yRnJhbWU6IGZ1bmN0aW9uKGZyYW1lVHJlZSwgbG9hZGVySWQp CisgICAgZGlkQ29tbWl0TG9hZEZvckZyYW1lOiBmdW5jdGlvbihwYXJlbnRGcmFtZUlkLCBsb2Fk ZXIpCiAgICAgewotICAgICAgICB0aGlzLl9jbGVhclJlc291cmNlcyhmcmFtZVRyZWUuaWQsIGxv YWRlcklkKTsKLSAgICAgICAgZm9yICh2YXIgaSA9IDA7IGZyYW1lVHJlZS5jaGlsZHJlbiAmJiBm cmFtZVRyZWUuY2hpbGRyZW4ubGVuZ3RoOyArK2kpCi0gICAgICAgICAgICB0aGlzLmRpZENvbW1p dExvYWRGb3JGcmFtZShmcmFtZVRyZWUuY2hpbGRyZW5baV0sIGxvYWRlcklkKTsKKyAgICAgICAg dGhpcy5fY2xlYXJSZXNvdXJjZXMobG9hZGVyLmZyYW1lSWQsIGxvYWRlci5sb2FkZXJJZCk7Cisg ICAgICAgIFdlYkluc3BlY3Rvci5wYW5lbHMuc3RvcmFnZS5yZW1vdmVSZXNvdXJjZXNGcm9tRnJh bWUobG9hZGVyLmZyYW1lSWQpOworCisgICAgICAgIHZhciB0bXBSZXNvdXJjZSA9IG5ldyBXZWJJ bnNwZWN0b3IuUmVzb3VyY2UobnVsbCwgbG9hZGVyLnVybCk7CisgICAgICAgIFdlYkluc3BlY3Rv ci5wYW5lbHMuc3RvcmFnZS5hZGRPclVwZGF0ZUZyYW1lKHBhcmVudEZyYW1lSWQsIGxvYWRlci5m cmFtZUlkLCB0bXBSZXNvdXJjZS5kaXNwbGF5TmFtZSk7CisKKyAgICAgICAgdmFyIHJlc291cmNl c0ZvckZyYW1lID0gdGhpcy5fcmVzb3VyY2VzQnlGcmFtZUlkW2xvYWRlci5mcmFtZUlkXTsKKyAg ICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCByZXNvdXJjZXNGb3JGcmFtZS5sZW5ndGg7ICsraSkK KyAgICAgICAgICAgIHRoaXMuX2FkZFJlc291cmNlVG9TdG9yYWdlRnJhbWUobG9hZGVyLmZyYW1l SWQsIHJlc291cmNlc0ZvckZyYW1lW2ldKTsKKyAgICB9LAorCisgICAgX2FkZFJlc291cmNlVG9T dG9yYWdlRnJhbWU6IGZ1bmN0aW9uKGZyYW1lSWQsIHJlc291cmNlKQorICAgIHsKKyAgICAgICAg Ly8gRG8gbm90IHNob3cgcmVkaXJlY3RzIGluIHJlc291cmNlIGJyb3dzZXIuCisgICAgICAgIGlm IChyZXNvdXJjZS5zdGF0dXNDb2RlIDwgMzAwIHx8IHJlc291cmNlLnN0YXR1c0NvZGUgPiAzMDMp CisgICAgICAgICAgICBXZWJJbnNwZWN0b3IucGFuZWxzLnN0b3JhZ2UuYWRkUmVzb3VyY2VUb0Zy YW1lKGZyYW1lSWQsIHJlc291cmNlKTsKICAgICB9LAogCi0gICAgZnJhbWVEZXRhY2hlZEZyb21Q YXJlbnQ6IGZ1bmN0aW9uKGZyYW1lVHJlZSkKKyAgICBmcmFtZURldGFjaGVkRnJvbVBhcmVudDog ZnVuY3Rpb24oZnJhbWVJZCkKICAgICB7Ci0gICAgICAgIHRoaXMuZGlkQ29tbWl0TG9hZEZvckZy YW1lKGZyYW1lVHJlZSwgMCk7CisgICAgICAgIHRoaXMuX2NsZWFyUmVzb3VyY2VzKGZyYW1lSWQs IDApOworICAgICAgICBXZWJJbnNwZWN0b3IucGFuZWxzLnN0b3JhZ2UucmVtb3ZlRnJhbWUoZnJh bWVJZCk7CiAgICAgfSwKIAogICAgIF9jbGVhclJlc291cmNlczogZnVuY3Rpb24oZnJhbWVJZCwg bG9hZGVyVG9QcmVzZXJ2ZUlkKQogICAgIHsKLSAgICAgICAgdmFyIHJlc291cmNlc0ZvckZyYW1l ID0gdGhpcy5fcmVzb3VyY2VzQnlGcmFtZVtmcmFtZUlkXTsKLSAgICAgICAgaWYgKHJlc291cmNl c0ZvckZyYW1lKQorICAgICAgICB2YXIgcmVzb3VyY2VzRm9yRnJhbWUgPSB0aGlzLl9yZXNvdXJj ZXNCeUZyYW1lSWRbZnJhbWVJZF07CisgICAgICAgIGlmICghcmVzb3VyY2VzRm9yRnJhbWUpCiAg ICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgZm9yICh2YXIgaWQgaW4gcmVzb3VyY2VzRm9y RnJhbWUpIHsKLSAgICAgICAgICAgIHZhciByZXNvdXJjZSA9IHRoaXMuX3Jlc291cmNlc0J5SWRb aWRdOwotICAgICAgICAgICAgaWYgKHJlc291cmNlLmxvYWRlcklkID09PSBsb2FkZXJUb1ByZXNl cnZlSWQpCisgICAgICAgIHZhciBwcmVzZXJ2ZWRSZXNvdXJjZXNGb3JGcmFtZSA9IFtdOworICAg ICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHJlc291cmNlc0ZvckZyYW1lLmxlbmd0aDsgKytpKSB7 CisgICAgICAgICAgICB2YXIgcmVzb3VyY2UgPSByZXNvdXJjZXNGb3JGcmFtZVtpXTsKKyAgICAg ICAgICAgIGlmIChyZXNvdXJjZS5sb2FkZXIubG9hZGVySWQgPT09IGxvYWRlclRvUHJlc2VydmVJ ZCkgeworICAgICAgICAgICAgICAgIHByZXNlcnZlZFJlc291cmNlc0ZvckZyYW1lLnB1c2gocmVz b3VyY2UpOwogICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgfQogICAgICAg ICAgICAgZGVsZXRlIHRoaXMuX3Jlc291cmNlc0J5SWRbaWRdOwotICAgICAgICAgICAgZGVsZXRl IHJlc291cmNlc0ZvckZyYW1lW2lkXTsKICAgICAgICAgfQotICAgICAgICBpZiAoIU9iamVjdC5r ZXlzKHJlc291cmNlc0ZvckZyYW1lKS5sZW5ndGgpCi0gICAgICAgICAgICBkZWxldGUgdGhpcy5f cmVzb3VyY2VzQnlGcmFtZVtmcmFtZUlkXTsKKyAgICAgICAgZGVsZXRlIHRoaXMuX3Jlc291cmNl c0J5RnJhbWVJZFtmcmFtZUlkXTsKKyAgICAgICAgaWYgKHByZXNlcnZlZFJlc291cmNlc0ZvckZy YW1lLmxlbmd0aCkKKyAgICAgICAgICAgIHRoaXMuX3Jlc291cmNlc0J5RnJhbWVJZFtmcmFtZUlk XSA9IHByZXNlcnZlZFJlc291cmNlc0ZvckZyYW1lOwogICAgIH0sCiAKICAgICBkaWRDcmVhdGVX ZWJTb2NrZXQ6IGZ1bmN0aW9uKGlkZW50aWZpZXIsIHJlcXVlc3RVUkwpCkBAIC0zMTcsMzcgKzMz NiwyOCBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VNYW5hZ2VyLnByb3RvdHlwZSA9IHsKIAogICAg IF9wcm9jZXNzQ2FjaGVkUmVzb3VyY2VzOiBmdW5jdGlvbihtYWluRnJhbWVQYXlsb2FkKQogICAg IHsKLSAgICAgICAgdGhpcy5fYXBwZW5kRnJhbWVzUmVjdXJzaXZlbHkobnVsbCwgbWFpbkZyYW1l UGF5bG9hZCk7CisgICAgICAgIHRoaXMuX2FkZEZyYW1lc1JlY3Vyc2l2ZWx5KG51bGwsIG1haW5G cmFtZVBheWxvYWQpOwogICAgIH0sCiAKLSAgICBfYXBwZW5kRnJhbWVzUmVjdXJzaXZlbHk6IGZ1 bmN0aW9uKHBhcmVudEZyYW1lSWQsIGZyYW1lUGF5bG9hZCkKKyAgICBfYWRkRnJhbWVzUmVjdXJz aXZlbHk6IGZ1bmN0aW9uKHBhcmVudEZyYW1lSWQsIGZyYW1lUGF5bG9hZCkKICAgICB7CiAgICAg ICAgIHZhciBmcmFtZVJlc291cmNlID0gdGhpcy5fY3JlYXRlUmVzb3VyY2UobnVsbCwgZnJhbWVQ YXlsb2FkLnJlc291cmNlLnVybCwgZnJhbWVQYXlsb2FkLnJlc291cmNlLmxvYWRlcik7CiAgICAg ICAgIGZyYW1lUmVzb3VyY2UudHlwZSA9IFdlYkluc3BlY3Rvci5SZXNvdXJjZS5UeXBlWyJEb2N1 bWVudCJdOwotICAgICAgICBXZWJJbnNwZWN0b3IucGFuZWxzLnN0b3JhZ2UuYWRkRnJhbWUocGFy ZW50RnJhbWVJZCwgZnJhbWVQYXlsb2FkLmlkLCBmcmFtZVJlc291cmNlKTsKKyAgICAgICAgV2Vi SW5zcGVjdG9yLnBhbmVscy5zdG9yYWdlLmFkZE9yVXBkYXRlRnJhbWUocGFyZW50RnJhbWVJZCwg ZnJhbWVQYXlsb2FkLmlkLCBmcmFtZVJlc291cmNlLmRpc3BsYXlOYW1lKTsKKyAgICAgICAgV2Vi SW5zcGVjdG9yLnBhbmVscy5zdG9yYWdlLmFkZFJlc291cmNlVG9GcmFtZShmcmFtZVBheWxvYWQu aWQsIGZyYW1lUmVzb3VyY2UpOwogCiAgICAgICAgIGZvciAodmFyIGkgPSAwOyBmcmFtZVBheWxv YWQuY2hpbGRyZW4gJiYgaSA8IGZyYW1lUGF5bG9hZC5jaGlsZHJlbi5sZW5ndGg7ICsraSkKLSAg ICAgICAgICAgIHRoaXMuX2FwcGVuZEZyYW1lc1JlY3Vyc2l2ZWx5KGZyYW1lUGF5bG9hZC5pZCwg ZnJhbWVQYXlsb2FkLmNoaWxkcmVuW2ldKTsKKyAgICAgICAgICAgIHRoaXMuX2FkZEZyYW1lc1Jl Y3Vyc2l2ZWx5KGZyYW1lUGF5bG9hZC5pZCwgZnJhbWVQYXlsb2FkLmNoaWxkcmVuW2ldKTsKIAog ICAgICAgICBpZiAoIWZyYW1lUGF5bG9hZC5zdWJyZXNvdXJjZXMpCiAgICAgICAgICAgICByZXR1 cm47CiAKLSAgICAgICAgdmFyIHJlc291cmNlcyA9IFtdOwogICAgICAgICBmb3IgKHZhciBpID0g MDsgaSA8IGZyYW1lUGF5bG9hZC5zdWJyZXNvdXJjZXMubGVuZ3RoOyArK2kpIHsKICAgICAgICAg ICAgIHZhciBjYWNoZWRSZXNvdXJjZSA9IGZyYW1lUGF5bG9hZC5zdWJyZXNvdXJjZXNbaV07CiAg ICAgICAgICAgICB2YXIgcmVzb3VyY2UgPSB0aGlzLl9jcmVhdGVSZXNvdXJjZShudWxsLCBjYWNo ZWRSZXNvdXJjZS51cmwsIGNhY2hlZFJlc291cmNlLmxvYWRlcik7CiAgICAgICAgICAgICB0aGlz Ll91cGRhdGVSZXNvdXJjZVdpdGhDYWNoZWRSZXNvdXJjZShyZXNvdXJjZSwgY2FjaGVkUmVzb3Vy Y2UpOwotICAgICAgICAgICAgcmVzb3VyY2VzLnB1c2gocmVzb3VyY2UpOworICAgICAgICAgICAg V2ViSW5zcGVjdG9yLnBhbmVscy5zdG9yYWdlLmFkZFJlc291cmNlVG9GcmFtZShmcmFtZVBheWxv YWQuaWQsIHJlc291cmNlKTsKICAgICAgICAgfQotCi0gICAgICAgIGZ1bmN0aW9uIGNvbXBhcmF0 b3IoYSwgYikKLSAgICAgICAgewotICAgICAgICAgICAgcmV0dXJuIGEuZGlzcGxheU5hbWUubG9j YWxlQ29tcGFyZShiLmRpc3BsYXlOYW1lKTsKLSAgICAgICAgfQotICAgICAgICByZXNvdXJjZXMu c29ydChjb21wYXJhdG9yKTsKLQotICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHJlc291cmNl cy5sZW5ndGg7ICsraSkKLSAgICAgICAgICAgIFdlYkluc3BlY3Rvci5wYW5lbHMuc3RvcmFnZS5h ZGRGcmFtZVJlc291cmNlKGZyYW1lUGF5bG9hZC5pZCwgcmVzb3VyY2VzW2ldKTsKICAgICB9CiB9 CiAKQEAgLTM5Niw2ICs0MDYsMTEgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlTWFuYWdlci5yZXNv dXJjZVZpZXdGb3JSZXNvdXJjZSA9IGZ1bmN0aW9uKHJlc291cmNlKQogCiBXZWJJbnNwZWN0b3Iu UmVzb3VyY2VNYW5hZ2VyLmdldENvbnRlbnRzID0gZnVuY3Rpb24ocmVzb3VyY2UsIGNhbGxiYWNr KQogeworICAgIGlmICgib3ZlcnJpZGVuQ29udGVudCIgaW4gcmVzb3VyY2UpIHsKKyAgICAgICAg Y2FsbGJhY2socmVzb3VyY2Uub3ZlcnJpZGVuQ29udGVudCk7CisgICAgICAgIHJldHVybjsKKyAg ICB9CisKICAgICAvLyBGSVhNRTogZXZlbnR1YWxseSwgY2FjaGVkIHJlc291cmNlcyB3aWxsIGhh dmUgbm8gaWRlbnRpZmllcnMuCiAgICAgaWYgKHJlc291cmNlLmxvYWRlcikKICAgICAgICAgSW5z cGVjdG9yQmFja2VuZC5yZXNvdXJjZUNvbnRlbnQocmVzb3VyY2UubG9hZGVyLmZyYW1lSWQsIHJl c291cmNlLnVybCwgY2FsbGJhY2spOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1N0b3JhZ2VQYW5lbC5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdG9y YWdlUGFuZWwuanMKaW5kZXggMmQyMjcxMy4uMGQ4MDA4MiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1N0b3JhZ2VQYW5lbC5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvU3RvcmFnZVBhbmVsLmpzCkBAIC0xMTksNTEgKzExOSw4NCBAQCBXZWJJbnNw ZWN0b3IuU3RvcmFnZVBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHRoaXMuc2lkZWJh clRyZWUuc2VsZWN0ZWRUcmVlRWxlbWVudC5kZXNlbGVjdCgpOwogICAgIH0sCiAKLSAgICBhZGRG cmFtZTogZnVuY3Rpb24ocGFyZW50RnJhbWVJZCwgZnJhbWVJZCwgZnJhbWVSZXNvdXJjZSkKKyAg ICBhZGRPclVwZGF0ZUZyYW1lOiBmdW5jdGlvbihwYXJlbnRGcmFtZUlkLCBmcmFtZUlkLCBkaXNw bGF5TmFtZSkKICAgICB7CisgICAgICAgIHZhciBmcmFtZVRyZWVFbGVtZW50ID0gdGhpcy5fdHJl ZUVsZW1lbnRGb3JGcmFtZUlkW2ZyYW1lSWRdOworICAgICAgICBpZiAoZnJhbWVUcmVlRWxlbWVu dCkgeworICAgICAgICAgICAgZnJhbWVUcmVlRWxlbWVudC5kaXNwbGF5TmFtZSA9IGRpc3BsYXlO YW1lOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisKICAgICAgICAgdmFyIHBhcmVu dFRyZWVFbGVtZW50ID0gcGFyZW50RnJhbWVJZCA/IHRoaXMuX3RyZWVFbGVtZW50Rm9yRnJhbWVJ ZFtwYXJlbnRGcmFtZUlkXSA6IHRoaXMucmVzb3VyY2VzTGlzdFRyZWVFbGVtZW50OwogICAgICAg ICBpZiAoIXBhcmVudFRyZWVFbGVtZW50KSB7CiAgICAgICAgICAgICBjb25zb2xlLmVycm9yKCJO byBmcmFtZSB3aXRoIGlkOiIgKyBwYXJlbnRGcmFtZUlkICsgIiB0byByb3V0ZSAiICsgZGlzcGxh eU5hbWUgKyAiIHRvLiIpCiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIAotICAgICAg ICB2YXIgZnJhbWVUcmVlRWxlbWVudCA9IG5ldyBXZWJJbnNwZWN0b3IuRnJhbWVUcmVlRWxlbWVu dCh0aGlzLCBmcmFtZUlkLCBmcmFtZVJlc291cmNlKTsKKyAgICAgICAgdmFyIGZyYW1lVHJlZUVs ZW1lbnQgPSBuZXcgV2ViSW5zcGVjdG9yLkZyYW1lVHJlZUVsZW1lbnQodGhpcywgZnJhbWVJZCwg ZGlzcGxheU5hbWUpOwogICAgICAgICB0aGlzLl90cmVlRWxlbWVudEZvckZyYW1lSWRbZnJhbWVJ ZF0gPSBmcmFtZVRyZWVFbGVtZW50OworCisgICAgICAgIC8vIEluc2VydCBpbiB0aGUgYWxwaGFi ZXRpY2FsIG9yZGVyLCBmaXJzdCBmcmFtZXMsIHRoZW4gcmVzb3VyY2VzLgorICAgICAgICB2YXIg Y2hpbGRyZW4gPSBwYXJlbnRUcmVlRWxlbWVudC5jaGlsZHJlbjsKKyAgICAgICAgZm9yICh2YXIg aSA9IDA7IGkgPCBjaGlsZHJlbi5sZW5ndGg7ICsraSkgeworICAgICAgICAgICAgdmFyIGNoaWxk ID0gY2hpbGRyZW5baV07CisgICAgICAgICAgICBpZiAoIShjaGlsZCBpbnN0YW5jZW9mIFdlYklu c3BlY3Rvci5GcmFtZVRyZWVFbGVtZW50KSkgeworICAgICAgICAgICAgICAgIHBhcmVudFRyZWVF bGVtZW50Lmluc2VydENoaWxkKGZyYW1lVHJlZUVsZW1lbnQsIGkpOworICAgICAgICAgICAgICAg IHJldHVybjsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGlmIChjaGlsZC5kaXNwbGF5TmFt ZS5sb2NhbGVDb21wYXJlKGZyYW1lVHJlZUVsZW1lbnQuZGlzcGxheU5hbWUpID4gMCkgeworICAg ICAgICAgICAgICAgIHBhcmVudFRyZWVFbGVtZW50Lmluc2VydENoaWxkKGZyYW1lVHJlZUVsZW1l bnQsIGkpOworICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIH0KKyAgICAgICAg fQogICAgICAgICBwYXJlbnRUcmVlRWxlbWVudC5hcHBlbmRDaGlsZChmcmFtZVRyZWVFbGVtZW50 KTsKICAgICB9LAogCiAgICAgcmVtb3ZlRnJhbWU6IGZ1bmN0aW9uKGZyYW1lSWQpCiAgICAgewog ICAgICAgICB2YXIgZnJhbWVUcmVlRWxlbWVudCA9IHRoaXMuX3RyZWVFbGVtZW50Rm9yRnJhbWVJ ZFtmcmFtZUlkXTsKLSAgICAgICAgaWYgKCFmcmFtZVRyZWVFbGVtZW50KSB7Ci0gICAgICAgICAg ICBjb25zb2xlLmVycm9yKCJObyBmcmFtZSB3aXRoIGlkOiIgKyBmcmFtZUlkICsgIiB0byByZW1v dmUuIik7CisgICAgICAgIGlmICghZnJhbWVUcmVlRWxlbWVudCkKICAgICAgICAgICAgIHJldHVy bjsKLSAgICAgICAgfQorCisgICAgICAgIHZhciBjaGlsZHJlbiA9IGZyYW1lVHJlZUVsZW1lbnQu Y2hpbGRyZW4uc2xpY2UoKTsKKyAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBjaGlsZHJlbi5s ZW5ndGg7ICsraSkKKyAgICAgICAgICAgIHRoaXMucmVtb3ZlRnJhbWUoY2hpbGRyZW5baV0uX2Zy YW1lSWQpOwogCiAgICAgICAgIGRlbGV0ZSB0aGlzLl90cmVlRWxlbWVudEZvckZyYW1lSWRbZnJh bWVJZF07CiAgICAgICAgIGZyYW1lVHJlZUVsZW1lbnQucGFyZW50LnJlbW92ZUNoaWxkKGZyYW1l VHJlZUVsZW1lbnQpOwogICAgIH0sCiAKLSAgICBhZGRGcmFtZVJlc291cmNlOiBmdW5jdGlvbihm cmFtZUlkLCByZXNvdXJjZSkKKyAgICBhZGRSZXNvdXJjZVRvRnJhbWU6IGZ1bmN0aW9uKGZyYW1l SWQsIHJlc291cmNlKQogICAgIHsKICAgICAgICAgdmFyIGZyYW1lVHJlZUVsZW1lbnQgPSB0aGlz Ll90cmVlRWxlbWVudEZvckZyYW1lSWRbZnJhbWVJZF07CiAgICAgICAgIGlmICghZnJhbWVUcmVl RWxlbWVudCkgewotICAgICAgICAgICAgY29uc29sZS5lcnJvcigiTm8gZnJhbWUgd2l0aCBpZDoi ICsgZnJhbWVJZCArICIgdG8gYWRkIHJlc291cmNlIHRvLiIpOworICAgICAgICAgICAgY29uc29s ZS5lcnJvcigiTm8gZnJhbWUgdG8gYWRkIHJlc291cmNlIHRvIik7CiAgICAgICAgICAgICByZXR1 cm47CiAgICAgICAgIH0KIAogICAgICAgICB2YXIgcmVzb3VyY2VUcmVlRWxlbWVudCA9IG5ldyBX ZWJJbnNwZWN0b3IuRnJhbWVSZXNvdXJjZVRyZWVFbGVtZW50KHRoaXMsIHJlc291cmNlKTsKKwor ICAgICAgICAvLyBJbnNlcnQgaW4gdGhlIGFscGhhYmV0aWNhbCBvcmRlciwgZmlyc3QgZnJhbWVz LCB0aGVuIHJlc291cmNlcy4gRG9jdW1lbnQgcmVzb3VyY2UgZ29lcyBmaXJzdC4KKyAgICAgICAg dmFyIGNoaWxkcmVuID0gZnJhbWVUcmVlRWxlbWVudC5jaGlsZHJlbjsKKyAgICAgICAgZm9yICh2 YXIgaSA9IDA7IGkgPCBjaGlsZHJlbi5sZW5ndGg7ICsraSkgeworICAgICAgICAgICAgdmFyIGNo aWxkID0gY2hpbGRyZW5baV07CisgICAgICAgICAgICBpZiAoIShjaGlsZCBpbnN0YW5jZW9mIFdl Ykluc3BlY3Rvci5GcmFtZVJlc291cmNlVHJlZUVsZW1lbnQpKQorICAgICAgICAgICAgICAgIGNv bnRpbnVlOworCisgICAgICAgICAgICBpZiAocmVzb3VyY2UudHlwZSA9PT0gV2ViSW5zcGVjdG9y LlJlc291cmNlLlR5cGUuRG9jdW1lbnQgfHwKKyAgICAgICAgICAgICAgICAgICAgKGNoaWxkLl9y ZXNvdXJjZS50eXBlICE9PSBXZWJJbnNwZWN0b3IuUmVzb3VyY2UuVHlwZS5Eb2N1bWVudCAmJiBj aGlsZC5fcmVzb3VyY2UuZGlzcGxheU5hbWUubG9jYWxlQ29tcGFyZShyZXNvdXJjZS5kaXNwbGF5 TmFtZSkgPiAwKSkgeworICAgICAgICAgICAgICAgIGZyYW1lVHJlZUVsZW1lbnQuaW5zZXJ0Q2hp bGQocmVzb3VyY2VUcmVlRWxlbWVudCwgaSk7CisgICAgICAgICAgICAgICAgcmV0dXJuOworICAg ICAgICAgICAgfQorICAgICAgICB9CiAgICAgICAgIGZyYW1lVHJlZUVsZW1lbnQuYXBwZW5kQ2hp bGQocmVzb3VyY2VUcmVlRWxlbWVudCk7CiAgICAgfSwKIAotICAgIHJlbW92ZUZyYW1lUmVzb3Vy Y2VzOiBmdW5jdGlvbihmcmFtZUlkKQorICAgIHJlbW92ZVJlc291cmNlc0Zyb21GcmFtZTogZnVu Y3Rpb24oZnJhbWVJZCkKICAgICB7CiAgICAgICAgIHZhciBmcmFtZVRyZWVFbGVtZW50ID0gdGhp cy5fdHJlZUVsZW1lbnRGb3JGcmFtZUlkW2ZyYW1lSWRdOwotICAgICAgICBpZiAoIWZyYW1lVHJl ZUVsZW1lbnQpIHsKLSAgICAgICAgICAgIGNvbnNvbGUuZXJyb3IoIk5vIGZyYW1lIHdpdGggaWQ6 IiArIGZyYW1lSWQgKyAiIHRvIHJlbW92ZSByZXNvdXJjZXMgZnJvbS4iKTsKLSAgICAgICAgICAg IHJldHVybjsKLSAgICAgICAgfQotICAgICAgICBmcmFtZVRyZWVFbGVtZW50LnJlbW92ZUNoaWxk cmVuKCk7CisgICAgICAgIGlmIChmcmFtZVRyZWVFbGVtZW50KQorICAgICAgICAgICAgZnJhbWVU cmVlRWxlbWVudC5yZW1vdmVDaGlsZHJlbigpOwogICAgIH0sCiAKICAgICBhZGREYXRhYmFzZTog ZnVuY3Rpb24oZGF0YWJhc2UpCkBAIC00OTMsMTAgKzUyNiwxMCBAQCBXZWJJbnNwZWN0b3IuQmFz ZVN0b3JhZ2VUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuaW1hZ2VFbGVt ZW50LmNsYXNzTmFtZSA9ICJpY29uIjsKICAgICAgICAgdGhpcy5saXN0SXRlbUVsZW1lbnQuYXBw ZW5kQ2hpbGQodGhpcy5pbWFnZUVsZW1lbnQpOwogCi0gICAgICAgIHZhciB0aXRsZUVsZW1lbnQg PSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIik7Ci0gICAgICAgIHRpdGxlRWxlbWVudC50 ZXh0Q29udGVudCA9IHRoaXMuX3RpdGxlVGV4dDsKLSAgICAgICAgdGl0bGVFbGVtZW50LmNsYXNz TmFtZSA9ICJzdG9yYWdlLWJhc2UtdHJlZS1lbGVtZW50LXRpdGxlIjsKLSAgICAgICAgdGhpcy5s aXN0SXRlbUVsZW1lbnQuYXBwZW5kQ2hpbGQodGl0bGVFbGVtZW50KTsKKyAgICAgICAgdGhpcy50 aXRsZUVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIik7CisgICAgICAgIHRo aXMudGl0bGVFbGVtZW50LnRleHRDb250ZW50ID0gdGhpcy5fdGl0bGVUZXh0OworICAgICAgICB0 aGlzLnRpdGxlRWxlbWVudC5jbGFzc05hbWUgPSAic3RvcmFnZS1iYXNlLXRyZWUtZWxlbWVudC10 aXRsZSI7CisgICAgICAgIHRoaXMubGlzdEl0ZW1FbGVtZW50LmFwcGVuZENoaWxkKHRoaXMudGl0 bGVFbGVtZW50KTsKIAogICAgICAgICB2YXIgc2VsZWN0aW9uRWxlbWVudCA9IGRvY3VtZW50LmNy ZWF0ZUVsZW1lbnQoImRpdiIpOwogICAgICAgICBzZWxlY3Rpb25FbGVtZW50LmNsYXNzTmFtZSA9 ICJzZWxlY3Rpb24iOwpAQCAtNTA3LDYgKzU0MCwxMiBAQCBXZWJJbnNwZWN0b3IuQmFzZVN0b3Jh Z2VUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAgewogICAgICAgICBpZiAodGhpcy5saXN0 SXRlbUVsZW1lbnQpCiAgICAgICAgICAgICB0aGlzLmxpc3RJdGVtRWxlbWVudC5zY3JvbGxJbnRv Vmlld0lmTmVlZGVkKGZhbHNlKTsKKyAgICB9LAorCisgICAgc2V0IHRpdGxlVGV4dCh0aXRsZVRl eHQpCisgICAgeworICAgICAgICB0aGlzLl90aXRsZVRleHQgPSB0aXRsZVRleHQ7CisgICAgICAg IHRoaXMudGl0bGVFbGVtZW50LnRleHRDb250ZW50ID0gdGhpcy5fdGl0bGVUZXh0OwogICAgIH0K IH0KIApAQCAtNTI2LDE3ICs1NjUsMjggQEAgV2ViSW5zcGVjdG9yLlN0b3JhZ2VDYXRlZ29yeVRy ZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKIH0KIFdlYkluc3BlY3Rvci5TdG9yYWdlQ2F0ZWdvcnlU cmVlRWxlbWVudC5wcm90b3R5cGUuX19wcm90b19fID0gV2ViSW5zcGVjdG9yLkJhc2VTdG9yYWdl VHJlZUVsZW1lbnQucHJvdG90eXBlOwogCi1XZWJJbnNwZWN0b3IuRnJhbWVUcmVlRWxlbWVudCA9 IGZ1bmN0aW9uKHN0b3JhZ2VQYW5lbCwgZnJhbWVJZCwgZnJhbWVSZXNvdXJjZSkKK1dlYkluc3Bl Y3Rvci5GcmFtZVRyZWVFbGVtZW50ID0gZnVuY3Rpb24oc3RvcmFnZVBhbmVsLCBmcmFtZUlkLCBk aXNwbGF5TmFtZSkKIHsKLSAgICBXZWJJbnNwZWN0b3IuQmFzZVN0b3JhZ2VUcmVlRWxlbWVudC5j YWxsKHRoaXMsIHN0b3JhZ2VQYW5lbCwgZnJhbWVSZXNvdXJjZS5kaXNwbGF5TmFtZSwgImZyYW1l LXN0b3JhZ2UtdHJlZS1pdGVtIik7CisgICAgV2ViSW5zcGVjdG9yLkJhc2VTdG9yYWdlVHJlZUVs ZW1lbnQuY2FsbCh0aGlzLCBzdG9yYWdlUGFuZWwsIGRpc3BsYXlOYW1lLCAiZnJhbWUtc3RvcmFn ZS10cmVlLWl0ZW0iKTsKICAgICB0aGlzLl9mcmFtZUlkID0gZnJhbWVJZDsKLSAgICB0aGlzLl9y ZXNvdXJjZSA9IGZyYW1lUmVzb3VyY2U7CisgICAgdGhpcy5fZGlzcGxheU5hbWUgPSBkaXNwbGF5 TmFtZTsKIH0KIAogV2ViSW5zcGVjdG9yLkZyYW1lVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewog ICAgIG9uc2VsZWN0OiBmdW5jdGlvbigpCiAgICAgewotICAgICAgICB0aGlzLl9zdG9yYWdlUGFu ZWwuc2hvd1Jlc291cmNlKHRoaXMuX3Jlc291cmNlKTsKKyAgICAgICAgdGhpcy5fc3RvcmFnZVBh bmVsLnNob3dDYXRlZ29yeVZpZXcodGhpcy5fZGlzcGxheU5hbWUpOworICAgIH0sCisKKyAgICBn ZXQgZGlzcGxheU5hbWUoKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX2Rpc3BsYXlOYW1l OworICAgIH0sCisKKyAgICBzZXQgZGlzcGxheU5hbWUoZGlzcGxheU5hbWUpCisgICAgeworICAg ICAgICB0aGlzLl9kaXNwbGF5TmFtZSA9IGRpc3BsYXlOYW1lOworICAgICAgICB0aGlzLnRpdGxl VGV4dCA9IGRpc3BsYXlOYW1lOwogICAgIH0KIH0KIFdlYkluc3BlY3Rvci5GcmFtZVRyZWVFbGVt ZW50LnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuQmFzZVN0b3JhZ2VUcmVlRWxl bWVudC5wcm90b3R5cGU7Cg==