63137 2011-06-22 06:54:53 -0700 Web Inspector: DOMAgent.resolveNode should receive objectGroup. 2011-06-22 07:13:44 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 425186 0 pfeldman 2011-06-22 06:54:53 -0700 Otherwise, we retain all selected nodes in the injected script. 425187 1 98163 pfeldman 2011-06-22 06:56:29 -0700 Created attachment 98163 Patch 425197 2 pfeldman 2011-06-22 07:13:44 -0700 Committed r89429: <http://trac.webkit.org/changeset/89429> 98163 2011-06-22 06:56:29 -0700 2011-06-22 07:09:48 -0700 Patch bug-63137-20110622175627.patch text/plain 27393 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogODkzNTUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAyODA4ZTQwMjJmNTA4NTZk NmI1ODczMjJhOWFjMzlmN2ViOTNhNGQwLi5hODhmZTgyYWI2MDM0ZWYyMjFjMjIwZjRhZTY0MjVi YTdhNTA5YzQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzcgQEAKKzIwMTEtMDYtMjIgIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IERPTUFnZW50LnJlc29sdmVO b2RlIHNob3VsZCByZWNlaXZlIG9iamVjdEdyb3VwLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjMxMzcKKworICAgICAgICAqIGluc3BlY3Rvci9Jbmpl Y3RlZFNjcmlwdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbmplY3RlZFNjcmlwdDo6d3JhcE5v ZGUpOgorICAgICAgICAqIGluc3BlY3Rvci9JbmplY3RlZFNjcmlwdC5oOgorICAgICAgICAqIGlu c3BlY3Rvci9JbmplY3RlZFNjcmlwdFNvdXJjZS5qczoKKyAgICAgICAgKC4pOgorICAgICAgICAq IGluc3BlY3Rvci9JbnNwZWN0b3IuanNvbjoKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9y RE9NQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRE9NQWdlbnQ6OnJlc29s dmVOb2RlKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckRPTUFnZW50OjpidWlsZE9iamVj dEZvckV2ZW50TGlzdGVuZXIpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JET01BZ2Vu dC5oOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JET01EZWJ1Z2dlckFnZW50LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckRPTURlYnVnZ2VyQWdlbnQ6OmRlc2NyaXB0aW9u Rm9yRE9NRXZlbnQpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OnJlc3VtZSk6 CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuaDoKKyAgICAgICAg KiBpbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzVHJlZU91dGxpbmUuanM6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuRWxlbWVudHNUcmVlRWxlbWVudC5wcm90b3R5cGUuX2NyZWF0ZVRvb2x0aXBG b3JOb2RlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0V2ZW50TGlzdGVuZXJzU2lk ZWJhclBhbmUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRXZlbnRMaXN0ZW5lcnNTaWRlYmFy UGFuZS5wcm90b3R5cGUudXBkYXRlLmNhbGxiYWNrKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5F dmVudExpc3RlbmVyc1NpZGViYXJQYW5lLnByb3RvdHlwZS51cGRhdGUpOgorICAgICAgICAoLik6 CisgICAgICAgICgpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUHJvcGVydGllc1Np ZGViYXJQYW5lLmpzOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmVtb3RlT2JqZWN0 LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlbW90ZU9iamVjdC5yZXNvbHZlTm9kZSk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuUmVtb3RlT2JqZWN0UHJvcGVydHkuZnJvbVByaW1pdGl2ZVZh bHVlKToKKwogMjAxMS0wNi0yMCAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGNocm9taXVtLm9y Zz4KIAogICAgICAgICBSZXZpZXdlZCBieSBZdXJ5IFNlbWlraGF0c2t5LgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0LmNwcCBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdC5jcHAKaW5kZXggODVmNGJlZWU4ODliYWI1ZGM2 YTc1NDhkN2Q2ZmM2YTljYTk5MWY1OS4uNjE0YzcyMWRmZWU3MjdhZTVlZTM1MjYwMTQ5ZDdmZDI1 YjdlZjE0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luamVjdGVkU2Ny aXB0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHQuY3Bw CkBAIC0xNjIsOSArMTYyLDkgQEAgUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IEluamVjdGVk U2NyaXB0Ojp3cmFwT2JqZWN0KFNjcmlwdFZhbHVlIHZhbHVlLCBjb25zdAogICAgIHJldHVybiBy LnRvSW5zcGVjdG9yVmFsdWUobV9pbmplY3RlZFNjcmlwdE9iamVjdC5zY3JpcHRTdGF0ZSgpKS0+ YXNPYmplY3QoKTsKIH0KIAotUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IEluamVjdGVkU2Ny aXB0Ojp3cmFwTm9kZShOb2RlKiBub2RlKQorUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IElu amVjdGVkU2NyaXB0Ojp3cmFwTm9kZShOb2RlKiBub2RlLCBjb25zdCBTdHJpbmcmIGdyb3VwTmFt ZSkKIHsKLSAgICByZXR1cm4gd3JhcE9iamVjdChub2RlQXNTY3JpcHRWYWx1ZShub2RlKSwgIiIp OworICAgIHJldHVybiB3cmFwT2JqZWN0KG5vZGVBc1NjcmlwdFZhbHVlKG5vZGUpLCBncm91cE5h bWUpOwogfQogCiB2b2lkIEluamVjdGVkU2NyaXB0OjppbnNwZWN0Tm9kZShOb2RlKiBub2RlKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0LmggYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHQuaAppbmRleCBhOTY3MDUzNWU0 YmE4MGVhMzBjNzc1NGY1MGFiOWU2M2Y2ODgzNzY4Li5iMzIxMDE5ZjMzN2VhN2M2YWM3ODgyOWMz YTUwYThjMThmMTUzMTdlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5q ZWN0ZWRTY3JpcHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3Jp cHQuaApAQCAtNjgsNyArNjgsNyBAQCBwdWJsaWM6CiAjZW5kaWYKIAogICAgIFBhc3NSZWZQdHI8 SW5zcGVjdG9yT2JqZWN0PiB3cmFwT2JqZWN0KFNjcmlwdFZhbHVlLCBjb25zdCBTdHJpbmcmIGdy b3VwTmFtZSk7Ci0gICAgUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IHdyYXBOb2RlKE5vZGUq KTsKKyAgICBQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gd3JhcE5vZGUoTm9kZSosIGNvbnN0 IFN0cmluZyYgZ3JvdXBOYW1lKTsKICAgICB2b2lkIGluc3BlY3ROb2RlKE5vZGUqKTsKICAgICB2 b2lkIHJlbGVhc2VPYmplY3RHcm91cChjb25zdCBTdHJpbmcmKTsKICAgICBTY3JpcHRTdGF0ZSog c2NyaXB0U3RhdGUoKSBjb25zdCB7IHJldHVybiBtX2luamVjdGVkU2NyaXB0T2JqZWN0LnNjcmlw dFN0YXRlKCk7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbmplY3Rl ZFNjcmlwdFNvdXJjZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlw dFNvdXJjZS5qcwppbmRleCBkNjg5NTYwZDU2NGIyNmQzYzYxNzFmYzRhY2ZlOTJlNmU0NzI2NTM2 Li45MDFlNTcxNDgzYTBhY2EyNWEzNTMzZjU0NTVlMmE2NjQ1YWVjNmE0IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRTb3VyY2UuanMKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0U291cmNlLmpzCkBAIC0yNTYsNyAr MjU2LDggQEAgSW5qZWN0ZWRTY3JpcHQucHJvdG90eXBlID0gewogICAgICAgICAgICAgcmV0dXJu ICJDb3VsZCBub3QgZmluZCBvYmplY3Qgd2l0aCBnaXZlbiBpZCI7CiAgICAgICAgIHRyeSB7CiAg ICAgICAgICAgICBpbnNwZWN0ZWRXaW5kb3cuY29uc29sZS5fb2JqZWN0VG9FdmFsdWF0ZU9uID0g b2JqZWN0OwotICAgICAgICAgICAgcmV0dXJuIHRoaXMuX2V2YWx1YXRlQW5kV3JhcChpbnNwZWN0 ZWRXaW5kb3cuZXZhbCwgaW5zcGVjdGVkV2luZG93LCAiKGZ1bmN0aW9uKCkgeyIgKyBleHByZXNz aW9uICsgIn0pLmNhbGwod2luZG93LmNvbnNvbGUuX29iamVjdFRvRXZhbHVhdGVPbikiLCBwYXJz ZWRPYmplY3RJZC5vYmplY3RHcm91cCwgZmFsc2UsIGZhbHNlKTsKKyAgICAgICAgICAgIHZhciBv YmplY3RHcm91cE5hbWUgPSB0aGlzLl9pZFRvT2JqZWN0R3JvdXBOYW1lW3BhcnNlZE9iamVjdElk LmlkXTsKKyAgICAgICAgICAgIHJldHVybiB0aGlzLl9ldmFsdWF0ZUFuZFdyYXAoaW5zcGVjdGVk V2luZG93LmV2YWwsIGluc3BlY3RlZFdpbmRvdywgIihmdW5jdGlvbigpIHsiICsgZXhwcmVzc2lv biArICJ9KS5jYWxsKHdpbmRvdy5jb25zb2xlLl9vYmplY3RUb0V2YWx1YXRlT24pIiwgb2JqZWN0 R3JvdXBOYW1lLCBmYWxzZSwgZmFsc2UpOwogICAgICAgICB9IGZpbmFsbHkgewogICAgICAgICAg ICAgZGVsZXRlIGluc3BlY3RlZFdpbmRvdy5jb25zb2xlLl9vYmplY3RUb0V2YWx1YXRlT247CiAg ICAgICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3Iu anNvbiBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgppbmRleCAyOTJi YTE0MGQxN2Q2NGNiMTQ0NjNiNmU2MmNiYTU3OWRhNTU2OGUxLi4zZGRiMDAwODc4ZTgwMGMxYmQz OTU1ZGE4OTA4MjcwOWFlYjJmMzYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yLmpzb24KKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ci5qc29uCkBAIC03MTgsNyArNzE4LDcgQEAKICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAg ICAibmFtZSI6ICJhZGRET01TdG9yYWdlIiwKICAgICAgICAgICAgICAgICAicGFyYW1ldGVycyI6 IFsKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJzdG9yYWdlIiwgIiRyZWYiOiAiRE9N U3RvcmFnZVN0b3JhZ2UiIH0KKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJzdG9yYWdl IiwgInR5cGUiOiAib2JqZWN0IiB9CiAgICAgICAgICAgICAgICAgXQogICAgICAgICAgICAgfSwK ICAgICAgICAgICAgIHsKQEAgLTc2MCw3ICs3NjAsNyBAQAogICAgICAgICAiZGVzY3JpcHRpb24i OiAiVGhpcyBkb21haW4gZXhwb3NlcyBET00gcmVhZC93cml0ZSBvcGVyYXRpb25zLiBFYWNoIERP TSBOb2RlIGlzIHJlcHJlc2VudGVkIHdpdGggaXRzIG1pcnJvciBvYmplY3QgdGhhdCBoYXMgYW4g PGNvZGU+aWQ8L2NvZGU+LiBUaGlzIDxjb2RlPmlkPC9jb2RlPiBjYW4gYmUgdXNlZCB0byBnZXQg YWRkaXRpb25hbCBpbmZvcm1hdGlvbiBvbiB0aGUgTm9kZSwgY29udmVydCBpdCBpbnRvIHRoZSBK YXZhU2NyaXB0IG9iamVjdCwgZXRjLiBJdCBpcyBpbXBvcnRhbnQgdGhhdCBjbGllbnQgcmVjZWl2 ZXMgRE9NIGV2ZW50cyBvbmx5IGZvciB0aGUgbm9kZXMgdGhhdCBhcmUga25vd24gdG8gdGhlIGNs aWVudC4gQmFja2VuZCBrZWVwcyB0cmFjayBvZiB0aGUgbm9kZXMgdGhhdCB3ZXJlIHNlbnQgdG8g dGhlIGNsaWVudCBhbmQgbmV2ZXIgc2VuZHMgdGhlIHNhbWUgbm9kZSB0d2ljZS4gSXQgaXMgY2xp ZW50J3MgcmVzcG9uc2liaWxpdHkgdG8gY29sbGVjdCBpbmZvcm1hdGlvbiBhYm91dCB0aGUgbm9k ZXMgdGhhdCB3ZXJlIHNlbnQgdG8gdGhlIGNsaWVudC4iLAogICAgICAgICAidHlwZXMiOiBbCiAg ICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgImlkIjogIkRPTU5vZGUiLAorICAgICAgICAg ICAgICAgICJpZCI6ICJOb2RlIiwKICAgICAgICAgICAgICAgICAidHlwZSI6ICJvYmplY3QiLAog ICAgICAgICAgICAgICAgICJwcm9wZXJ0aWVzIjogWwogICAgICAgICAgICAgICAgICAgICB7ICJu YW1lIjogImlkIiwgInR5cGUiOiAiaW50ZWdlciIsICJkZXNjcmlwdGlvbiI6ICJOb2RlIGlkZW50 aWZpZXIgdGhhdCBpcyBwYXNzZWQgaW50byB0aGUgcmVzdCBvZiB0aGUgRE9NIG1lc3NhZ2VzIGFz IHRoZSA8Y29kZT5ub2RlSWQ8L2NvZGU+LiBCYWNrZW5kIHdpbGwgb25seSBwdXNoIG5vZGUgd2l0 aCBnaXZlbiA8Y29kZT5pZDwvY29kZT4gb25jZS4gSXQgaXMgYXdhcmUgb2YgYWxsIHJlcXVlc3Rl ZCBub2RlcyBhbmQgd2lsbCBvbmx5IGZpcmUgRE9NIGV2ZW50cyBmb3Igbm9kZXMga25vd24gdG8g dGhlIGNsaWVudC4iIH0sCkBAIC03NjksNyArNzY5LDcgQEAKICAgICAgICAgICAgICAgICAgICAg eyAibmFtZSI6ICJsb2NhbE5hbWUiLCAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAi PGNvZGU+Tm9kZTwvY29kZT4ncyBsb2NhbE5hbWUuIiB9LAogICAgICAgICAgICAgICAgICAgICB7 ICJuYW1lIjogIm5vZGVWYWx1ZSIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICI8 Y29kZT5Ob2RlPC9jb2RlPidzIG5vZGVWYWx1ZS4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsg Im5hbWUiOiAiY2hpbGROb2RlQ291bnQiLCAidHlwZSI6ICJpbnRlZ2VyIiwgIm9wdGlvbmFsIjog dHJ1ZSwgImRlc2NyaXB0aW9uIjogIkNoaWxkIGNvdW50IGZvciA8Y29kZT5Db250YWluZXI8L2Nv ZGU+IG5vZGVzLiIgfSwKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJjaGlsZHJlbiIs ICJ0eXBlIjogImFycmF5IiwgIm9wdGlvbmFsIjogdHJ1ZSwgIml0ZW1zIjogeyAiJHJlZiI6ICJE T01Ob2RlIiB9LCAiZGVzY3JpcHRpb24iOiAiQ2hpbGQgbm9kZXMgb2YgdGhpcyBub2RlIHdoZW4g cmVxdWVzdGVkIHdpdGggY2hpbGRyZW4uIiB9LAorICAgICAgICAgICAgICAgICAgICB7ICJuYW1l IjogImNoaWxkcmVuIiwgInR5cGUiOiAiYXJyYXkiLCAib3B0aW9uYWwiOiB0cnVlLCAiaXRlbXMi OiB7ICIkcmVmIjogIk5vZGUiIH0sICJkZXNjcmlwdGlvbiI6ICJDaGlsZCBub2RlcyBvZiB0aGlz IG5vZGUgd2hlbiByZXF1ZXN0ZWQgd2l0aCBjaGlsZHJlbi4iIH0sCiAgICAgICAgICAgICAgICAg ICAgIHsgIm5hbWUiOiAiYXR0cmlidXRlcyIsICJ0eXBlIjogImFycmF5IiwgIm9wdGlvbmFsIjog dHJ1ZSwgIml0ZW1zIjogeyAidHlwZSI6ICJzdHJpbmciIH0sICJkZXNjcmlwdGlvbiI6ICJBdHRy aWJ1dGVzIG9mIHRoZSA8Y29kZT5FbGVtZW50PC9jb2RlPiBub2RlIGluIHRoZSBmb3JtIG9mIGZs YXQgYXJyYXkgPGNvZGU+W25hbWUxLCB2YWx1ZTEsIG5hbWUyLCB2YWx1ZTJdPC9jb2RlPi4iIH0s CiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiZG9jdW1lbnRVUkwiLCAidHlwZSI6ICJz dHJpbmciLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiRG9jdW1lbnQgVVJMIHRo YXQgPGNvZGU+RG9jdW1lbnQ8L2NvZGU+IG9yIDxjb2RlPkZyYW1lT3duZXI8L2NvZGU+IG5vZGUg cG9pbnRzIHRvLiIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJwdWJsaWNJZCIs ICJ0eXBlIjogInN0cmluZyIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICI8Y29k ZT5Eb2N1bWVudFR5cGU8L2NvZGU+J3MgcHVibGljSWQuIC8vIEZJWE1FIiB9LApAQCAtNzgxLDE2 ICs3ODEsMTUgQEAKICAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiRE9NIGludGVyYWN0 aW9uIGlzIGltcGxlbWVudGVkIGluIHRlcm1zIG9mIG1pcnJvciBvYmplY3RzIHRoYXQgcmVwcmVz ZW50IHRoZSBhY3R1YWwgRE9NIG5vZGVzLiBET01Ob2RlIGlzIGEgYmFzZSBub2RlIG1pcnJvciB0 eXBlLiIKICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgImlk IjogIkRPTUV2ZW50TGlzdGVuZXIiLAorICAgICAgICAgICAgICAgICJpZCI6ICJFdmVudExpc3Rl bmVyIiwKICAgICAgICAgICAgICAgICAidHlwZSI6ICJvYmplY3QiLAogICAgICAgICAgICAgICAg ICJwcm9wZXJ0aWVzIjogWwogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInR5cGUiLCAi dHlwZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAiPGNvZGU+RXZlbnRMaXN0ZW5lcjwvY29k ZT4ncyB0eXBlLiIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJ1c2VDYXB0dXJl IiwgInR5cGUiOiAiYm9vbGVhbiIsICJkZXNjcmlwdGlvbiI6ICI8Y29kZT5FdmVudExpc3RlbmVy PC9jb2RlPidzIHVzZUNhcHR1cmUuIiB9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjog ImlzQXR0cmlidXRlIiwgInR5cGUiOiAiYm9vbGVhbiIsICJkZXNjcmlwdGlvbiI6ICI8Y29kZT5F dmVudExpc3RlbmVyPC9jb2RlPidzIGlzQXR0cmlidXRlLiIgfSwKICAgICAgICAgICAgICAgICAg ICAgeyAibmFtZSI6ICJub2RlSWQiLCAidHlwZSI6ICJpbnRlZ2VyIiwgImRlc2NyaXB0aW9uIjog IlRhcmdldCA8Y29kZT5ET01Ob2RlPC9jb2RlPiBpZC4iIH0sCi0gICAgICAgICAgICAgICAgICAg IHsgIm5hbWUiOiAibGlzdGVuZXJCb2R5IiwgInR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9u IjogIkxpc3RlbmVyIGZ1bmN0aW9uIGJvZHkuIiB9LAotICAgICAgICAgICAgICAgICAgICB7ICJu YW1lIjogInNvdXJjZU5hbWUiLCAidHlwZSI6ICJzdHJpbmciLCAib3B0aW9uYWwiOiB0cnVlLCAi ZGVzY3JpcHRpb24iOiAiSGFuZGxlciBsb2NhdGlvbiBzb3VyY2UgbmFtZS4iIH0sCi0gICAgICAg ICAgICAgICAgICAgIHsgIm5hbWUiOiAibGluZU51bWJlciIsICJ0eXBlIjogIm51bWJlciIsICJv cHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJIYW5kbGVyIGxvY2F0aW9uIGxpbmUgbnVt YmVyLiIgfQorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImhhbmRsZXJCb2R5IiwgInR5 cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIkV2ZW50IGhhbmRsZXIgZnVuY3Rpb24gYm9k eS4iIH0sCisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAibG9jYXRpb24iLCAiJHJlZiI6 ICJEZWJ1Z2dlci5Mb2NhdGlvbiIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJI YW5kbGVyIGNvZGUgbG9jYXRpb24uIiB9CiAgICAgICAgICAgICAgICAgXSwKICAgICAgICAgICAg ICAgICAiZGVzY3JpcHRpb24iOiAiRE9NIGludGVyYWN0aW9uIGlzIGltcGxlbWVudGVkIGluIHRl cm1zIG9mIG1pcnJvciBvYmplY3RzIHRoYXQgcmVwcmVzZW50IHRoZSBhY3R1YWwgRE9NIG5vZGVz LiBET01Ob2RlIGlzIGEgYmFzZSBub2RlIG1pcnJvciB0eXBlLiIKICAgICAgICAgICAgIH0sCkBA IC04MDgsNyArODA3LDcgQEAKICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICAibmFtZSI6 ICJnZXREb2N1bWVudCIsCiAgICAgICAgICAgICAgICAgInJldHVybnMiOiBbCi0gICAgICAgICAg ICAgICAgICAgIHsgIm5hbWUiOiAicm9vdCIsICIkcmVmIjogIkRPTU5vZGUiLCAiZGVzY3JpcHRp b24iOiAiUmVzdWx0aW5nIG5vZGUuIiB9CisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAi cm9vdCIsICIkcmVmIjogIk5vZGUiLCAiZGVzY3JpcHRpb24iOiAiUmVzdWx0aW5nIG5vZGUuIiB9 CiAgICAgICAgICAgICAgICAgXSwKICAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiUmV0 dXJucyB0aGUgcm9vdCBET00gbm9kZSB0byB0aGUgY2FsbGVyLiIKICAgICAgICAgICAgIH0sCkBA IC04OTAsNyArODg5LDcgQEAKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJub2RlSWQi LCAidHlwZSI6ICJpbnRlZ2VyIiwgImRlc2NyaXB0aW9uIjogIklkIG9mIHRoZSBub2RlIHRvIGdl dCBsaXN0ZW5lcnMgZm9yLiIgfQogICAgICAgICAgICAgICAgIF0sCiAgICAgICAgICAgICAgICAg InJldHVybnMiOiBbCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAibGlzdGVuZXJzIiwg InR5cGUiOiAiYXJyYXkiLCAiaXRlbXMiOiB7ICIkcmVmIjogIkRPTUV2ZW50TGlzdGVuZXIifSwg ImRlc2NyaXB0aW9uIjogIkFycmF5IG9mIHJlbGV2YW50IGxpc3RlbmVycy4iIH0KKyAgICAgICAg ICAgICAgICAgICAgeyAibmFtZSI6ICJsaXN0ZW5lcnMiLCAidHlwZSI6ICJhcnJheSIsICJpdGVt cyI6IHsgIiRyZWYiOiAiRXZlbnRMaXN0ZW5lciJ9LCAiZGVzY3JpcHRpb24iOiAiQXJyYXkgb2Yg cmVsZXZhbnQgbGlzdGVuZXJzLiIgfQogICAgICAgICAgICAgICAgIF0sCiAgICAgICAgICAgICAg ICAgImRlc2NyaXB0aW9uIjogIlJldHVybnMgZXZlbnQgbGlzdGVuZXJzIHJlbGV2YW50IHRvIHRo ZSBub2RlLiIKICAgICAgICAgICAgIH0sCkBAIC05ODcsNyArOTg2LDggQEAKICAgICAgICAgICAg IHsKICAgICAgICAgICAgICAgICAibmFtZSI6ICJyZXNvbHZlTm9kZSIsCiAgICAgICAgICAgICAg ICAgInBhcmFtZXRlcnMiOiBbCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAibm9kZUlk IiwgInR5cGUiOiAiaW50ZWdlciIsICJkZXNjcmlwdGlvbiI6ICJJZCBvZiB0aGUgbm9kZSB0byBy ZXNvbHZlLiIgfQorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogIm5vZGVJZCIsICJ0eXBl IjogImludGVnZXIiLCAiZGVzY3JpcHRpb24iOiAiSWQgb2YgdGhlIG5vZGUgdG8gcmVzb2x2ZS4i IH0sCisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAib2JqZWN0R3JvdXAiLCAidHlwZSI6 ICJzdHJpbmciLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiU3ltYm9saWMgZ3Jv dXAgbmFtZSB0aGF0IGNhbiBiZSB1c2VkIHRvIHJlbGVhc2UgbXVsdGlwbGUgb2JqZWN0cy4iIH0s CiAgICAgICAgICAgICAgICAgXSwKICAgICAgICAgICAgICAgICAicmV0dXJucyI6IFsKICAgICAg ICAgICAgICAgICAgICAgeyAibmFtZSI6ICJvYmplY3QiLCAiJHJlZiI6ICJSdW50aW1lLlJlbW90 ZU9iamVjdCIsICJkZXNjcmlwdGlvbiI6ICJKYXZhU2NyaXB0IG9iamVjdCB3cmFwcGVyIGZvciBn aXZlbiBub2RlLiIgfQpAQCAtMTAxNCw3ICsxMDE0LDcgQEAKICAgICAgICAgICAgICAgICAibmFt ZSI6ICJzZXRDaGlsZE5vZGVzIiwKICAgICAgICAgICAgICAgICAicGFyYW1ldGVycyI6IFsKICAg ICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJwYXJlbnRJZCIsICJ0eXBlIjogImludGVnZXIi LCAiZGVzY3JpcHRpb24iOiAiUGFyZW50IG5vZGUgaWQgdG8gcG9wdWxhdGUgd2l0aCBjaGlsZHJl bi4iIH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAibm9kZXMiLCAidHlwZSI6ICJh cnJheSIsICJpdGVtcyI6IHsgIiRyZWYiOiAiRE9NTm9kZSJ9LCAiZGVzY3JpcHRpb24iOiAiQ2hp bGQgbm9kZXMgYXJyYXkuIiB9CisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAibm9kZXMi LCAidHlwZSI6ICJhcnJheSIsICJpdGVtcyI6IHsgIiRyZWYiOiAiTm9kZSJ9LCAiZGVzY3JpcHRp b24iOiAiQ2hpbGQgbm9kZXMgYXJyYXkuIiB9CiAgICAgICAgICAgICAgICAgXSwKICAgICAgICAg ICAgICAgICAiZGVzY3JpcHRpb24iOiAiRmlyZWQgd2hlbiBiYWNrZW5kIHdhbnRzIHRvIHByb3Zp ZGUgY2xpZW50IHdpdGggdGhlIG1pc3NpbmcgRE9NIHN0cnVjdHVyZS4gVGhpcyBoYXBwZW5zIHVw b24gbW9zdCBvZiB0aGUgY2FsbHMgcmVxdWVzdGluZyBub2RlIGlkcy4iCiAgICAgICAgICAgICB9 LApAQCAtMTA1Myw3ICsxMDUzLDcgQEAKICAgICAgICAgICAgICAgICAicGFyYW1ldGVycyI6IFsK ICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJwYXJlbnRJZCIsICJ0eXBlIjogImludGVn ZXIiLCAiZGVzY3JpcHRpb24iOiAiSWQgb2YgdGhlIG5vZGUgdGhhdCBoYXMgY2hhbmdlZC4iIH0s CiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAicHJldklkIiwgInR5cGUiOiAiaW50ZWdl ciIsICJkZXNjcmlwdGlvbiI6ICJJZiBvZiB0aGUgcHJldmlvdXMgc2libGludC4iIH0sCi0gICAg ICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAibm9kZSIsICIkcmVmIjogIkRPTU5vZGUiLCAiZGVz Y3JpcHRpb24iOiAiSW5zZXJ0ZWQgbm9kZSBkYXRhLiIgfQorICAgICAgICAgICAgICAgICAgICB7 ICJuYW1lIjogIm5vZGUiLCAiJHJlZiI6ICJOb2RlIiwgImRlc2NyaXB0aW9uIjogIkluc2VydGVk IG5vZGUgZGF0YS4iIH0KICAgICAgICAgICAgICAgICBdLAogICAgICAgICAgICAgICAgICJkZXNj cmlwdGlvbiI6ICJNaXJyb3JzIDxjb2RlPkRPTU5vZGVJbnNlcnRlZDwvY29kZT4gZXZlbnQuIgog ICAgICAgICAgICAgfSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JET01BZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9N QWdlbnQuY3BwCmluZGV4IGQxMzliYjRiOGM0MWMyYzY0NTRhNjY0M2E3MGY4NWQwZmM1Y2FlNzEu LjhiMmI2YjdkMDNmZjhiZDNjOTNiNWEwYzA4NDM1ZWIzMTc1YWZiYWUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcApAQCAtMTAxNCwxNCArMTAx NCwxNSBAQCB2b2lkIEluc3BlY3RvckRPTUFnZW50OjpoaWRlSGlnaGxpZ2h0KEVycm9yU3RyaW5n KikKICAgICBtX2NsaWVudC0+aGlkZUhpZ2hsaWdodCgpOwogfQogCi12b2lkIEluc3BlY3RvckRP TUFnZW50OjpyZXNvbHZlTm9kZShFcnJvclN0cmluZyogZXJyb3IsIGludCBub2RlSWQsIFJlZlB0 cjxJbnNwZWN0b3JPYmplY3Q+KiByZXN1bHQpCit2b2lkIEluc3BlY3RvckRPTUFnZW50OjpyZXNv bHZlTm9kZShFcnJvclN0cmluZyogZXJyb3IsIGludCBub2RlSWQsIGNvbnN0IFN0cmluZyogY29u c3Qgb2JqZWN0R3JvdXAsIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+KiByZXN1bHQpCiB7CisgICAg U3RyaW5nIG9iamVjdEdyb3VwTmFtZSA9IG9iamVjdEdyb3VwID8gKm9iamVjdEdyb3VwIDogIiI7 CiAgICAgTm9kZSogbm9kZSA9IG5vZGVGb3JJZChub2RlSWQpOwogICAgIGlmICghbm9kZSkgewog ICAgICAgICAqZXJyb3IgPSAiTm8gbm9kZSB3aXRoIGdpdmVuIGlkIGZvdW5kLiI7CiAgICAgICAg IHJldHVybjsKICAgICB9Ci0gICAgKnJlc3VsdCA9IHJlc29sdmVOb2RlKG5vZGUpOworICAgICpy ZXN1bHQgPSByZXNvbHZlTm9kZShub2RlLCBvYmplY3RHcm91cE5hbWUpOwogfQogCiB2b2lkIElu c3BlY3RvckRPTUFnZW50OjpnZXRBdHRyaWJ1dGVzKEVycm9yU3RyaW5nKiwgY29uc3QgUmVmUHRy PEluc3BlY3RvckFycmF5PiYgbm9kZUlkcywgUmVmUHRyPEluc3BlY3RvckFycmF5PiogcmVzdWx0 KQpAQCAtMTE3MSwxMiArMTE3MiwxNCBAQCBQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gSW5z cGVjdG9yRE9NQWdlbnQ6OmJ1aWxkT2JqZWN0Rm9yRXZlbnRMaXN0ZW5lcihjb25zdAogICAgIHZh bHVlLT5zZXRCb29sZWFuKCJ1c2VDYXB0dXJlIiwgcmVnaXN0ZXJlZEV2ZW50TGlzdGVuZXIudXNl Q2FwdHVyZSk7CiAgICAgdmFsdWUtPnNldEJvb2xlYW4oImlzQXR0cmlidXRlIiwgZXZlbnRMaXN0 ZW5lci0+aXNBdHRyaWJ1dGUoKSk7CiAgICAgdmFsdWUtPnNldE51bWJlcigibm9kZUlkIiwgcHVz aE5vZGVQYXRoVG9Gcm9udGVuZChub2RlKSk7Ci0gICAgdmFsdWUtPnNldFN0cmluZygibGlzdGVu ZXJCb2R5IiwgZXZlbnRMaXN0ZW5lckhhbmRsZXJCb2R5KG5vZGUtPmRvY3VtZW50KCksIGV2ZW50 TGlzdGVuZXIuZ2V0KCkpKTsKKyAgICB2YWx1ZS0+c2V0U3RyaW5nKCJoYW5kbGVyQm9keSIsIGV2 ZW50TGlzdGVuZXJIYW5kbGVyQm9keShub2RlLT5kb2N1bWVudCgpLCBldmVudExpc3RlbmVyLmdl dCgpKSk7CiAgICAgU3RyaW5nIHNvdXJjZU5hbWU7CiAgICAgaW50IGxpbmVOdW1iZXI7CiAgICAg aWYgKGV2ZW50TGlzdGVuZXJIYW5kbGVyTG9jYXRpb24obm9kZS0+ZG9jdW1lbnQoKSwgZXZlbnRM aXN0ZW5lci5nZXQoKSwgc291cmNlTmFtZSwgbGluZU51bWJlcikpIHsKLSAgICAgICAgdmFsdWUt PnNldFN0cmluZygic291cmNlTmFtZSIsIHNvdXJjZU5hbWUpOwotICAgICAgICB2YWx1ZS0+c2V0 TnVtYmVyKCJsaW5lTnVtYmVyIiwgbGluZU51bWJlcik7CisgICAgICAgIFJlZlB0cjxJbnNwZWN0 b3JPYmplY3Q+IGxvY2F0aW9uID0gSW5zcGVjdG9yT2JqZWN0OjpjcmVhdGUoKTsKKyAgICAgICAg bG9jYXRpb24tPnNldFN0cmluZygic291cmNlSWQiLCBzb3VyY2VOYW1lKTsKKyAgICAgICAgbG9j YXRpb24tPnNldE51bWJlcigibGluZU51bWJlciIsIGxpbmVOdW1iZXIpOworICAgICAgICB2YWx1 ZS0+c2V0T2JqZWN0KCJsb2NhdGlvbiIsIGxvY2F0aW9uKTsKICAgICB9CiAgICAgcmV0dXJuIHZh bHVlLnJlbGVhc2UoKTsKIH0KQEAgLTE0NDUsNyArMTQ0OCw3IEBAIHZvaWQgSW5zcGVjdG9yRE9N QWdlbnQ6OnB1c2hOb2RlQnlQYXRoVG9Gcm9udGVuZChFcnJvclN0cmluZyosIGNvbnN0IFN0cmlu ZyYgcGF0CiAgICAgICAgICpub2RlSWQgPSBwdXNoTm9kZVBhdGhUb0Zyb250ZW5kKG5vZGUpOwog fQogCi1QYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gSW5zcGVjdG9yRE9NQWdlbnQ6OnJlc29s dmVOb2RlKE5vZGUqIG5vZGUpCitQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gSW5zcGVjdG9y RE9NQWdlbnQ6OnJlc29sdmVOb2RlKE5vZGUqIG5vZGUsIGNvbnN0IFN0cmluZyYgb2JqZWN0R3Jv dXApCiB7CiAgICAgRG9jdW1lbnQqIGRvY3VtZW50ID0gbm9kZS0+aXNEb2N1bWVudE5vZGUoKSA/ IG5vZGUtPmRvY3VtZW50KCkgOiBub2RlLT5vd25lckRvY3VtZW50KCk7CiAgICAgRnJhbWUqIGZy YW1lID0gZG9jdW1lbnQgPyBkb2N1bWVudC0+ZnJhbWUoKSA6IDA7CkBAIC0xNDU2LDcgKzE0NTks NyBAQCBQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gSW5zcGVjdG9yRE9NQWdlbnQ6OnJlc29s dmVOb2RlKE5vZGUqIG5vZGUpCiAgICAgaWYgKGluamVjdGVkU2NyaXB0Lmhhc05vVmFsdWUoKSkK ICAgICAgICAgcmV0dXJuIDA7CiAKLSAgICByZXR1cm4gaW5qZWN0ZWRTY3JpcHQud3JhcE5vZGUo bm9kZSk7CisgICAgcmV0dXJuIGluamVjdGVkU2NyaXB0LndyYXBOb2RlKG5vZGUsIG9iamVjdEdy b3VwKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JET01BZ2VudDo6ZHJhd05vZGVIaWdobGlnaHQoR3Jh cGhpY3NDb250ZXh0JiBjb250ZXh0KSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yRE9NQWdlbnQuaAppbmRleCAyMTE5MDNiNmExOTg3MGMwMzJkMzBiMzIwNTU0ZTdk ODM0YThiMjVhLi45MDk3ZDNiZWY2MzUyZDFjMDM5MTMyMmU1MTJlZTgyMzEwMjIyNTY0IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuaApAQCAtMTI1LDcg KzEyNSw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGdldEV2ZW50TGlzdGVuZXJzRm9yTm9kZShFcnJv clN0cmluZyosIGludCBub2RlSWQsIFJlZlB0cjxJbnNwZWN0b3JBcnJheT4qIGxpc3RlbmVyc0Fy cmF5KTsKICAgICB2b2lkIHBlcmZvcm1TZWFyY2goRXJyb3JTdHJpbmcqLCBjb25zdCBTdHJpbmcm IHdoaXRlc3BhY2VUcmltbWVkUXVlcnksIGNvbnN0IGJvb2wqIGNvbnN0IHJ1blN5bmNocm9ub3Vz bHkpOwogICAgIHZvaWQgY2FuY2VsU2VhcmNoKEVycm9yU3RyaW5nKik7Ci0gICAgdm9pZCByZXNv bHZlTm9kZShFcnJvclN0cmluZyosIGludCBub2RlSWQsIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+ KiByZXN1bHQpOworICAgIHZvaWQgcmVzb2x2ZU5vZGUoRXJyb3JTdHJpbmcqLCBpbnQgbm9kZUlk LCBjb25zdCBTdHJpbmcqIGNvbnN0IG9iamVjdEdyb3VwLCBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0 PiogcmVzdWx0KTsKICAgICB2b2lkIGdldEF0dHJpYnV0ZXMoRXJyb3JTdHJpbmcqLCBjb25zdCBS ZWZQdHI8SW5zcGVjdG9yQXJyYXk+JiBub2RlSWRzLCBSZWZQdHI8SW5zcGVjdG9yQXJyYXk+KiBy ZXN1bHQpOwogICAgIHZvaWQgc2V0SW5zcGVjdE1vZGVFbmFibGVkKEVycm9yU3RyaW5nKiwgYm9v bCBlbmFibGVkKTsKICAgICB2b2lkIHB1c2hOb2RlVG9Gcm9udGVuZChFcnJvclN0cmluZyosIGNv bnN0IFN0cmluZyYgb2JqZWN0SWQsIGludCogbm9kZUlkKTsKQEAgLTE1OCw3ICsxNTgsNyBAQCBw dWJsaWM6CiAKICAgICBTdHJpbmcgZG9jdW1lbnRVUkxTdHJpbmcoRG9jdW1lbnQqKSBjb25zdDsK IAotICAgIFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiByZXNvbHZlTm9kZShOb2RlKik7Cisg ICAgUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IHJlc29sdmVOb2RlKE5vZGUqLCBjb25zdCBT dHJpbmcmIG9iamVjdEdyb3VwKTsKICAgICBib29sIGhhbmRsZU1vdXNlUHJlc3MoKTsKICAgICBi b29sIHNlYXJjaGluZ0Zvck5vZGVJblBhZ2UoKSBjb25zdDsKICAgICB2b2lkIG1vdXNlRGlkTW92 ZU92ZXJFbGVtZW50KGNvbnN0IEhpdFRlc3RSZXN1bHQmLCB1bnNpZ25lZCBtb2RpZmllckZsYWdz KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01EZWJ1 Z2dlckFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01EZWJ1 Z2dlckFnZW50LmNwcAppbmRleCAzYjlmODg2MTJmZTZjYTRmODE3NTA2YzdhMDdhOGNlMWJlZGZm MGZkLi40ZmRkZDg2MDY1MWUyNDMwMjNiMjAwNjZjZWVmNzgwZGEwZWMwMDI1IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NRGVidWdnZXJBZ2VudC5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTURlYnVnZ2VyQWdlbnQu Y3BwCkBAIC0yNTYsNyArMjU2LDcgQEAgdm9pZCBJbnNwZWN0b3JET01EZWJ1Z2dlckFnZW50Ojpk ZXNjcmlwdGlvbkZvckRPTUV2ZW50KE5vZGUqIHRhcmdldCwgaW50IGJyZWFrcG8KICAgICBpZiAo KDEgPDwgYnJlYWtwb2ludFR5cGUpICYgaW5oZXJpdGFibGVET01CcmVha3BvaW50VHlwZXNNYXNr KSB7CiAgICAgICAgIC8vIEZvciBpbmhlcml0YWJsZSBicmVha3BvaW50IHR5cGVzLCB0YXJnZXQg bm9kZSBpc24ndCBhbHdheXMgdGhlIHNhbWUgYXMgdGhlIG5vZGUgdGhhdCBvd25zIGEgYnJlYWtw b2ludC4KICAgICAgICAgLy8gVGFyZ2V0IG5vZGUgbWF5IGJlIHVua25vd24gdG8gZnJvbnRlbmQs IHNvIHdlIG5lZWQgdG8gcHVzaCBpdCBmaXJzdC4KLSAgICAgICAgUmVmUHRyPEluc3BlY3Rvck9i amVjdD4gdGFyZ2V0Tm9kZU9iamVjdCA9IG1fZG9tQWdlbnQtPnJlc29sdmVOb2RlKHRhcmdldCk7 CisgICAgICAgIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IHRhcmdldE5vZGVPYmplY3QgPSBtX2Rv bUFnZW50LT5yZXNvbHZlTm9kZSh0YXJnZXQsIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OmJhY2t0 cmFjZU9iamVjdEdyb3VwKTsKICAgICAgICAgZGVzY3JpcHRpb24tPnNldE9iamVjdCgidGFyZ2V0 Tm9kZSIsIHRhcmdldE5vZGVPYmplY3QpOwogCiAgICAgICAgIC8vIEZpbmQgYnJlYWtwb2ludCBv d25lciBub2RlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ckRlYnVnZ2VyQWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRl YnVnZ2VyQWdlbnQuY3BwCmluZGV4IDU4M2NmZmIyZWE5OTk3YTMwZWNhMTM5NWMyY2UwY2UxZDIy MzE5ZmUuLjZhODI5ZDIyMTMyMzJhMWUyYWY0ZWJjNTQ3ODNjYjRmNTFlMDY4NzMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5jcHAK QEAgLTQ4LDYgKzQ4LDggQEAgc3RhdGljIGNvbnN0IGNoYXIgZGVidWdnZXJFbmFibGVkW10gPSAi ZGVidWdnZXJFbmFibGVkIjsKIHN0YXRpYyBjb25zdCBjaGFyIGphdmFTY3JpcHRCcmVha3BvaW50 c1tdID0gImphdmFTY3JpcHRCcmVha29waW50cyI7CiB9OwogCitjb25zdCBjaGFyKiBJbnNwZWN0 b3JEZWJ1Z2dlckFnZW50OjpiYWNrdHJhY2VPYmplY3RHcm91cCA9ICJiYWNrdHJhY2Utb2JqZWN0 LWdyb3VwIjsKKwogSW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6SW5zcGVjdG9yRGVidWdnZXJBZ2Vu dChJbnN0cnVtZW50aW5nQWdlbnRzKiBpbnN0cnVtZW50aW5nQWdlbnRzLCBJbnNwZWN0b3JTdGF0 ZSogaW5zcGVjdG9yU3RhdGUsIEluamVjdGVkU2NyaXB0TWFuYWdlciogaW5qZWN0ZWRTY3JpcHRN YW5hZ2VyKQogICAgIDogbV9pbnN0cnVtZW50aW5nQWdlbnRzKGluc3RydW1lbnRpbmdBZ2VudHMp CiAgICAgLCBtX2luc3BlY3RvclN0YXRlKGluc3BlY3RvclN0YXRlKQpAQCAtMzM4LDcgKzM0MCw3 IEBAIHZvaWQgSW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6cGF1c2UoRXJyb3JTdHJpbmcqKQogCiB2 b2lkIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OnJlc3VtZShFcnJvclN0cmluZyopCiB7Ci0gICAg bV9pbmplY3RlZFNjcmlwdE1hbmFnZXItPnJlbGVhc2VPYmplY3RHcm91cCgiYmFja3RyYWNlIik7 CisgICAgbV9pbmplY3RlZFNjcmlwdE1hbmFnZXItPnJlbGVhc2VPYmplY3RHcm91cChJbnNwZWN0 b3JEZWJ1Z2dlckFnZW50OjpiYWNrdHJhY2VPYmplY3RHcm91cCk7CiAgICAgc2NyaXB0RGVidWdT ZXJ2ZXIoKS5jb250aW51ZVByb2dyYW0oKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmgKaW5kZXggODZjYjE5OTRkYjE1Njc1N2Zj NzAxYWVmZWQyMTY3ZGRlMTQ4OWNjZi4uMTZhY2YxY2QwZjY1ZTFlMWRmYzllZWI5MWY2YTVhNTc3 NWRmNGYzMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRl YnVnZ2VyQWdlbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVi dWdnZXJBZ2VudC5oCkBAIC02Niw2ICs2Niw4IEBAIGVudW0gRGVidWdnZXJFdmVudFR5cGUgewog Y2xhc3MgSW5zcGVjdG9yRGVidWdnZXJBZ2VudCA6IHB1YmxpYyBTY3JpcHREZWJ1Z0xpc3RlbmVy IHsKICAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShJbnNwZWN0b3JEZWJ1Z2dlckFnZW50KTsgV1RG X01BS0VfRkFTVF9BTExPQ0FURUQ7CiBwdWJsaWM6CisgICAgc3RhdGljIGNvbnN0IGNoYXIqIGJh Y2t0cmFjZU9iamVjdEdyb3VwOworCiAgICAgdmlydHVhbCB+SW5zcGVjdG9yRGVidWdnZXJBZ2Vu dCgpOwogCiAgICAgdm9pZCBlbmFibGUoRXJyb3JTdHJpbmcqKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNUcmVlT3V0bGluZS5qcyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNUcmVlT3V0bGluZS5qcwpp bmRleCA0Y2UyZTdiZWI4NWNlMDAxMDVjNzc3NTMyODM2NTU5ZWY2NjhmNGYzLi5jZTU1ZjlmN2U5 NDZiNWI2MDQxMmEzYmJhMzQ5YzllMTM3YTExZWRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzVHJlZU91dGxpbmUuanMKKysrIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1RyZWVPdXRsaW5lLmpzCkBAIC00 NzYsNyArNDc2LDcgQEAgV2ViSW5zcGVjdG9yLkVsZW1lbnRzVHJlZUVsZW1lbnQucHJvdG90eXBl ID0gewogICAgICAgICAgICAgb2JqZWN0LmV2YWx1YXRlKCJyZXR1cm4gJ1snICsgdGhpcy5vZmZz ZXRXaWR0aCArICcsJyArIHRoaXMub2Zmc2V0SGVpZ2h0ICsgJywnICsgdGhpcy5uYXR1cmFsV2lk dGggKyAnLCcgKyB0aGlzLm5hdHVyYWxIZWlnaHQgKyAnXSciLCBzZXRUb29sdGlwLmJpbmQodGhp cykpOwogICAgICAgICAgICAgb2JqZWN0LnJlbGVhc2UoKTsKICAgICAgICAgfQotICAgICAgICBX ZWJJbnNwZWN0b3IuUmVtb3RlT2JqZWN0LnJlc29sdmVOb2RlKG5vZGUsIHJlc29sdmVkTm9kZS5i aW5kKHRoaXMpKTsKKyAgICAgICAgV2ViSW5zcGVjdG9yLlJlbW90ZU9iamVjdC5yZXNvbHZlTm9k ZShub2RlLCAiIiwgcmVzb2x2ZWROb2RlLmJpbmQodGhpcykpOwogICAgIH0sCiAKICAgICB1cGRh dGVTZWxlY3Rpb246IGZ1bmN0aW9uKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvRXZlbnRMaXN0ZW5lcnNTaWRlYmFyUGFuZS5qcyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRXZlbnRMaXN0ZW5lcnNTaWRlYmFyUGFuZS5qcwppbmRl eCAyZGNlN2VlODIwOWRhYzVlZjBiNGNlZmJlN2U2ODEwOTExODljZGYxLi40OTgxMjZhMjc0NTU4 MzFmNmFhNGRjYzQ4ODMxMThjMjliNWE5YTBhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL0V2ZW50TGlzdGVuZXJzU2lkZWJhclBhbmUuanMKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FdmVudExpc3RlbmVyc1NpZGViYXJQYW5l LmpzCkBAIC01Nyw5ICs1NywxMiBAQCBXZWJJbnNwZWN0b3IuRXZlbnRMaXN0ZW5lcnNTaWRlYmFy UGFuZSA9IGZ1bmN0aW9uKCkKICAgICB0aGlzLnRpdGxlRWxlbWVudC5hcHBlbmRDaGlsZCh0aGlz LnNldHRpbmdzU2VsZWN0RWxlbWVudCk7CiB9CiAKK1dlYkluc3BlY3Rvci5FdmVudExpc3RlbmVy c1NpZGViYXJQYW5lLl9vYmplY3RHcm91cE5hbWUgPSAiZXZlbnQtbGlzdGVuZXJzLXNpZGViYXIt cGFuZSI7CisKIFdlYkluc3BlY3Rvci5FdmVudExpc3RlbmVyc1NpZGViYXJQYW5lLnByb3RvdHlw ZSA9IHsKICAgICB1cGRhdGU6IGZ1bmN0aW9uKG5vZGUpCiAgICAgeworICAgICAgICBSdW50aW1l QWdlbnQucmVsZWFzZU9iamVjdEdyb3VwKFdlYkluc3BlY3Rvci5FdmVudExpc3RlbmVyc1NpZGVi YXJQYW5lLl9vYmplY3RHcm91cE5hbWUpOwogICAgICAgICB2YXIgYm9keSA9IHRoaXMuYm9keUVs ZW1lbnQ7CiAgICAgICAgIGJvZHkucmVtb3ZlQ2hpbGRyZW4oKTsKICAgICAgICAgdGhpcy5zZWN0 aW9ucyA9IFtdOwpAQCAtNzUsNyArNzgsNyBAQCBXZWJJbnNwZWN0b3IuRXZlbnRMaXN0ZW5lcnNT aWRlYmFyUGFuZS5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgdmFyIGV2ZW50TGlzdGVu ZXIgPSBldmVudExpc3RlbmVyc1tpXTsKICAgICAgICAgICAgICAgICBldmVudExpc3RlbmVyLm5v ZGUgPSBXZWJJbnNwZWN0b3IuZG9tQWdlbnQubm9kZUZvcklkKGV2ZW50TGlzdGVuZXIubm9kZUlk KTsKICAgICAgICAgICAgICAgICBkZWxldGUgZXZlbnRMaXN0ZW5lci5ub2RlSWQ7IC8vIG5vIGxv bmdlciBuZWVkZWQKLSAgICAgICAgICAgICAgICBpZiAoL15mdW5jdGlvbiBfaW5zcGVjdG9yQ29t bWFuZExpbmVBUElfbG9nRXZlbnRcKC8udGVzdChldmVudExpc3RlbmVyLmxpc3RlbmVyQm9keS50 b1N0cmluZygpKSkKKyAgICAgICAgICAgICAgICBpZiAoL15mdW5jdGlvbiBfaW5zcGVjdG9yQ29t bWFuZExpbmVBUElfbG9nRXZlbnRcKC8udGVzdChldmVudExpc3RlbmVyLmhhbmRsZXJCb2R5LnRv U3RyaW5nKCkpKQogICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsgLy8gaWdub3JlIGV2ZW50 IGxpc3RlbmVycyBnZW5lcmF0ZWQgYnkgbW9uaXRvckV2ZW50CiAgICAgICAgICAgICAgICAgdmFy IHR5cGUgPSBldmVudExpc3RlbmVyLnR5cGU7CiAgICAgICAgICAgICAgICAgdmFyIHNlY3Rpb24g PSBzZWN0aW9uTWFwW3R5cGVdOwpAQCAtMTg2LDIwICsxODksMjUgQEAgV2ViSW5zcGVjdG9yLkV2 ZW50TGlzdGVuZXJCYXIucHJvdG90eXBlID0gewogICAgICAgICBmdW5jdGlvbiB1cGRhdGVXaXRo Tm9kZU9iamVjdChub2RlT2JqZWN0KQogICAgICAgICB7CiAgICAgICAgICAgICB2YXIgcHJvcGVy dGllcyA9IFtdOworCisgICAgICAgICAgICBpZiAodGhpcy5ldmVudExpc3RlbmVyLnR5cGUpCisg ICAgICAgICAgICAgICAgcHJvcGVydGllcy5wdXNoKFdlYkluc3BlY3Rvci5SZW1vdGVPYmplY3RQ cm9wZXJ0eS5mcm9tUHJpbWl0aXZlVmFsdWUoInR5cGUiLCB0aGlzLmV2ZW50TGlzdGVuZXIudHlw ZSkpOworICAgICAgICAgICAgaWYgKHR5cGVvZiB0aGlzLmV2ZW50TGlzdGVuZXIudXNlQ2FwdHVy ZSAhPT0gInVuZGVmaW5lZCIpCisgICAgICAgICAgICAgICAgcHJvcGVydGllcy5wdXNoKFdlYklu c3BlY3Rvci5SZW1vdGVPYmplY3RQcm9wZXJ0eS5mcm9tUHJpbWl0aXZlVmFsdWUoInVzZUNhcHR1 cmUiLCB0aGlzLmV2ZW50TGlzdGVuZXIudXNlQ2FwdHVyZSkpOworICAgICAgICAgICAgaWYgKHR5 cGVvZiB0aGlzLmV2ZW50TGlzdGVuZXIuaXNBdHRyaWJ1dGUgIT09ICJ1bmRlZmluZWQiKQorICAg ICAgICAgICAgICAgIHByb3BlcnRpZXMucHVzaChXZWJJbnNwZWN0b3IuUmVtb3RlT2JqZWN0UHJv cGVydHkuZnJvbVByaW1pdGl2ZVZhbHVlKCJpc0F0dHJpYnV0ZSIsIHRoaXMuZXZlbnRMaXN0ZW5l ci5pc0F0dHJpYnV0ZSkpOwogICAgICAgICAgICAgaWYgKG5vZGVPYmplY3QpCiAgICAgICAgICAg ICAgICAgcHJvcGVydGllcy5wdXNoKG5ldyBXZWJJbnNwZWN0b3IuUmVtb3RlT2JqZWN0UHJvcGVy dHkoIm5vZGUiLCBub2RlT2JqZWN0KSk7Ci0KLSAgICAgICAgICAgIGZvciAodmFyIHByb3BlcnR5 TmFtZSBpbiB0aGlzLmV2ZW50TGlzdGVuZXIpIHsKLSAgICAgICAgICAgICAgICB2YXIgdmFsdWUg PSBXZWJJbnNwZWN0b3IuUmVtb3RlT2JqZWN0LmZyb21QcmltaXRpdmVWYWx1ZSh0aGlzLmV2ZW50 TGlzdGVuZXJbcHJvcGVydHlOYW1lXSk7Ci0gICAgICAgICAgICAgICAgcHJvcGVydGllcy5wdXNo KG5ldyBXZWJJbnNwZWN0b3IuUmVtb3RlT2JqZWN0UHJvcGVydHkocHJvcGVydHlOYW1lLCB2YWx1 ZSkpOworICAgICAgICAgICAgaWYgKHR5cGVvZiB0aGlzLmV2ZW50TGlzdGVuZXIuaGFuZGxlckJv ZHkgIT09ICJ1bmRlZmluZWQiKQorICAgICAgICAgICAgICAgIHByb3BlcnRpZXMucHVzaChXZWJJ bnNwZWN0b3IuUmVtb3RlT2JqZWN0UHJvcGVydHkuZnJvbVByaW1pdGl2ZVZhbHVlKCJsaXN0ZW5l ckJvZHkiLCB0aGlzLmV2ZW50TGlzdGVuZXIuaGFuZGxlckJvZHkpKTsKKyAgICAgICAgICAgIGlm ICh0aGlzLmV2ZW50TGlzdGVuZXIubG9jYXRpb24pIHsKKyAgICAgICAgICAgICAgICBwcm9wZXJ0 aWVzLnB1c2goV2ViSW5zcGVjdG9yLlJlbW90ZU9iamVjdFByb3BlcnR5LmZyb21QcmltaXRpdmVW YWx1ZSgic291cmNlTmFtZSIsIHRoaXMuZXZlbnRMaXN0ZW5lci5sb2NhdGlvbi5zb3VyY2VJZCkp OworICAgICAgICAgICAgICAgIHByb3BlcnRpZXMucHVzaChXZWJJbnNwZWN0b3IuUmVtb3RlT2Jq ZWN0UHJvcGVydHkuZnJvbVByaW1pdGl2ZVZhbHVlKCJsaW5lTnVtYmVyIiwgdGhpcy5ldmVudExp c3RlbmVyLmxvY2F0aW9uLmxpbmVOdW1iZXIpKTsKICAgICAgICAgICAgIH0KKwogICAgICAgICAg ICAgdGhpcy51cGRhdGVQcm9wZXJ0aWVzKHByb3BlcnRpZXMpOwotICAgICAgICAgICAgaWYgKG5v ZGVPYmplY3QpCi0gICAgICAgICAgICAgICAgbm9kZU9iamVjdC5yZWxlYXNlKCk7CiAgICAgICAg IH0KLSAgICAgICAgdmFyIG5vZGUgPSB0aGlzLmV2ZW50TGlzdGVuZXIubm9kZTsKLSAgICAgICAg ZGVsZXRlIHRoaXMuZXZlbnRMaXN0ZW5lci5ub2RlOwotICAgICAgICBXZWJJbnNwZWN0b3IuUmVt b3RlT2JqZWN0LnJlc29sdmVOb2RlKG5vZGUsIHVwZGF0ZVdpdGhOb2RlT2JqZWN0LmJpbmQodGhp cykpOworICAgICAgICBXZWJJbnNwZWN0b3IuUmVtb3RlT2JqZWN0LnJlc29sdmVOb2RlKHRoaXMu ZXZlbnRMaXN0ZW5lci5ub2RlLCBXZWJJbnNwZWN0b3IuRXZlbnRMaXN0ZW5lcnNTaWRlYmFyUGFu ZS5fb2JqZWN0R3JvdXBOYW1lLCB1cGRhdGVXaXRoTm9kZU9iamVjdC5iaW5kKHRoaXMpKTsKICAg ICB9LAogCiAgICAgX3NldE5vZGVUaXRsZTogZnVuY3Rpb24oKQpAQCAtMjI1LDExICsyMzMsMTEg QEAgV2ViSW5zcGVjdG9yLkV2ZW50TGlzdGVuZXJCYXIucHJvdG90eXBlID0gewogICAgIF9zZXRG dW5jdGlvblN1YnRpdGxlOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICAvLyBSZXF1aXJlcyB0 aGF0IEZ1bmN0aW9uLnRvU3RyaW5nKCkgcmV0dXJuIGF0IGxlYXN0IHRoZSBmdW5jdGlvbidzIHNp Z25hdHVyZS4KLSAgICAgICAgaWYgKHRoaXMuZXZlbnRMaXN0ZW5lci5zb3VyY2VOYW1lKSB7Cisg ICAgICAgIGlmICh0aGlzLmV2ZW50TGlzdGVuZXIubG9jYXRpb24pIHsKICAgICAgICAgICAgIHRo aXMuc3VidGl0bGVFbGVtZW50LnJlbW92ZUNoaWxkcmVuKCk7Ci0gICAgICAgICAgICB0aGlzLnN1 YnRpdGxlRWxlbWVudC5hcHBlbmRDaGlsZChXZWJJbnNwZWN0b3IubGlua2lmeVJlc291cmNlQXNO b2RlKHRoaXMuZXZlbnRMaXN0ZW5lci5zb3VyY2VOYW1lLCAic2NyaXB0cyIsIHRoaXMuZXZlbnRM aXN0ZW5lci5saW5lTnVtYmVyKSk7CisgICAgICAgICAgICB0aGlzLnN1YnRpdGxlRWxlbWVudC5h cHBlbmRDaGlsZChXZWJJbnNwZWN0b3IubGlua2lmeVJlc291cmNlQXNOb2RlKHRoaXMuZXZlbnRM aXN0ZW5lci5sb2NhdGlvbi5zb3VyY2VJZCwgInNjcmlwdHMiLCB0aGlzLmV2ZW50TGlzdGVuZXIu bG9jYXRpb24ubGluZU51bWJlcikpOwogICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgdmFy IG1hdGNoID0gdGhpcy5ldmVudExpc3RlbmVyLmxpc3RlbmVyQm9keS5tYXRjaCgvZnVuY3Rpb24g KFteXChdKz8pXCgvKTsKKyAgICAgICAgICAgIHZhciBtYXRjaCA9IHRoaXMuZXZlbnRMaXN0ZW5l ci5oYW5kbGVyQm9keS5tYXRjaCgvZnVuY3Rpb24gKFteXChdKz8pXCgvKTsKICAgICAgICAgICAg IGlmIChtYXRjaCkKICAgICAgICAgICAgICAgICB0aGlzLnN1YnRpdGxlRWxlbWVudC50ZXh0Q29u dGVudCA9IG1hdGNoWzFdOwogICAgICAgICAgICAgZWxzZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9wZXJ0aWVzU2lkZWJhclBhbmUuanMgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Byb3BlcnRpZXNTaWRlYmFyUGFuZS5qcwpp bmRleCBkNjc0MjBiODc5ZTg1ODFhMWI1MDY4YzYxZmVmMjlkOTQwMDA2NjU0Li40YTdmZmNkOTI4 OGFlNmFhZTk5NGQ4ZDM1Mzc4NjIwYTczNGExZWM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Byb3BlcnRpZXNTaWRlYmFyUGFuZS5qcworKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Byb3BlcnRpZXNTaWRlYmFyUGFuZS5qcwpA QCAtMzEsNiArMzEsOCBAQCBXZWJJbnNwZWN0b3IuUHJvcGVydGllc1NpZGViYXJQYW5lID0gZnVu Y3Rpb24oKQogICAgIFdlYkluc3BlY3Rvci5TaWRlYmFyUGFuZS5jYWxsKHRoaXMsIFdlYkluc3Bl Y3Rvci5VSVN0cmluZygiUHJvcGVydGllcyIpKTsKIH0KIAorV2ViSW5zcGVjdG9yLlByb3BlcnRp ZXNTaWRlYmFyUGFuZS5fb2JqZWN0R3JvdXBOYW1lID0gInByb3BlcnRpZXMtc2lkZWJhci1wYW5l IjsKKwogV2ViSW5zcGVjdG9yLlByb3BlcnRpZXNTaWRlYmFyUGFuZS5wcm90b3R5cGUgPSB7CiAg ICAgdXBkYXRlOiBmdW5jdGlvbihub2RlKQogICAgIHsKQEAgLTQyLDcgKzQ0LDcgQEAgV2ViSW5z cGVjdG9yLlByb3BlcnRpZXNTaWRlYmFyUGFuZS5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBy ZXR1cm47CiAgICAgICAgIH0KIAotICAgICAgICBXZWJJbnNwZWN0b3IuUmVtb3RlT2JqZWN0LnJl c29sdmVOb2RlKG5vZGUsIG5vZGVSZXNvbHZlZC5iaW5kKHRoaXMpKTsKKyAgICAgICAgV2ViSW5z cGVjdG9yLlJlbW90ZU9iamVjdC5yZXNvbHZlTm9kZShub2RlLCBXZWJJbnNwZWN0b3IuUHJvcGVy dGllc1NpZGViYXJQYW5lLl9vYmplY3RHcm91cE5hbWUsIG5vZGVSZXNvbHZlZC5iaW5kKHRoaXMp KTsKIAogICAgICAgICBmdW5jdGlvbiBub2RlUmVzb2x2ZWQob2JqZWN0KQogICAgICAgICB7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1JlbW90ZU9iamVj dC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVtb3RlT2JqZWN0Lmpz CmluZGV4IDY0ZTZmN2I2ZTdlZDNlZDk2Y2M3ZWRlYjkyN2E2MGIyMTE4YzhkMWEuLjM0N2Y4M2Mz ZWZhOWQ0OGVmZWExYjIxYTcyZDE2OWRiZmZkNGM0NDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVtb3RlT2JqZWN0LmpzCisrKyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVtb3RlT2JqZWN0LmpzCkBAIC00Niw3ICs0Niw3IEBA IFdlYkluc3BlY3Rvci5SZW1vdGVPYmplY3QuZnJvbUxvY2FsT2JqZWN0ID0gZnVuY3Rpb24odmFs dWUpCiAgICAgcmV0dXJuIG5ldyBXZWJJbnNwZWN0b3IuTG9jYWxKU09OT2JqZWN0KHZhbHVlKTsK IH0KIAotV2ViSW5zcGVjdG9yLlJlbW90ZU9iamVjdC5yZXNvbHZlTm9kZSA9IGZ1bmN0aW9uKG5v ZGUsIGNhbGxiYWNrKQorV2ViSW5zcGVjdG9yLlJlbW90ZU9iamVjdC5yZXNvbHZlTm9kZSA9IGZ1 bmN0aW9uKG5vZGUsIG9iamVjdEdyb3VwLCBjYWxsYmFjaykKIHsKICAgICBmdW5jdGlvbiBteWNh bGxiYWNrKGVycm9yLCBvYmplY3QpCiAgICAgewpAQCAtNTgsNyArNTgsNyBAQCBXZWJJbnNwZWN0 b3IuUmVtb3RlT2JqZWN0LnJlc29sdmVOb2RlID0gZnVuY3Rpb24obm9kZSwgY2FsbGJhY2spCiAg ICAgICAgIGVsc2UKICAgICAgICAgICAgIGNhbGxiYWNrKFdlYkluc3BlY3Rvci5SZW1vdGVPYmpl Y3QuZnJvbVBheWxvYWQob2JqZWN0KSk7CiAgICAgfQotICAgIERPTUFnZW50LnJlc29sdmVOb2Rl KG5vZGUuaWQsIG15Y2FsbGJhY2spOworICAgIERPTUFnZW50LnJlc29sdmVOb2RlKG5vZGUuaWQs IG9iamVjdEdyb3VwLCBteWNhbGxiYWNrKTsKIH0KIAogV2ViSW5zcGVjdG9yLlJlbW90ZU9iamVj dC5mcm9tUGF5bG9hZCA9IGZ1bmN0aW9uKHBheWxvYWQpCkBAIC0xNjUsNiArMTY1LDExIEBAIFdl Ykluc3BlY3Rvci5SZW1vdGVPYmplY3RQcm9wZXJ0eSA9IGZ1bmN0aW9uKG5hbWUsIHZhbHVlKQog ICAgIHRoaXMudmFsdWUgPSB2YWx1ZTsKIH0KIAorV2ViSW5zcGVjdG9yLlJlbW90ZU9iamVjdFBy b3BlcnR5LmZyb21QcmltaXRpdmVWYWx1ZSA9IGZ1bmN0aW9uKG5hbWUsIHZhbHVlKQoreworICAg IHJldHVybiBuZXcgV2ViSW5zcGVjdG9yLlJlbW90ZU9iamVjdFByb3BlcnR5KG5hbWUsIFdlYklu c3BlY3Rvci5SZW1vdGVPYmplY3QuZnJvbVByaW1pdGl2ZVZhbHVlKHZhbHVlKSk7Cit9CisKIC8v IFRoZSBiZWxvdyBpcyBhIHdyYXBwZXIgYXJvdW5kIGEgbG9jYWwgb2JqZWN0IHRoYXQgcHJvdmlk ZXMgYW4gaW50ZXJmYWNlIGNvbWFwdGlibGUKIC8vIHdpdGggUmVtb3RlT2JqZWN0LCB0byBiZSB1 c2VkIGJ5IHRoZSBVSSBjb2RlIChwcmltYXJpbHkgT2JqZWN0UHJvcGVydGllc1NlY3Rpb24pLgog Ly8gTm90ZSB0aGF0IG9ubHkgSlNPTi1jb21wbGlhbnQgb2JqZWN0cyBhcmUgY3VycmVudGx5IHN1 cHBvcnRlZCwgYXMgdGhlcmUncyBubyBwcm92aXNpb24K