56243 2011-03-11 22:58:06 -0800 Web Inspector: follow up to error reporting, fixing multiple regressions. 2011-03-12 01:11:02 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman webkit-unassigned apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 366522 0 pfeldman 2011-03-11 22:58:06 -0800 Patch to follow. 366523 1 85571 pfeldman 2011-03-11 23:03:38 -0800 Created attachment 85571 Patch 366525 2 85571 loislo 2011-03-11 23:10:37 -0800 Comment on attachment 85571 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=85571&action=review > Source/WebCore/inspector/InspectorRuntimeAgent.cpp:87 > + if (!injectedScript.setPropertyValue(objectId, propertyName, expression)) > + *errorString = "Failed setting value."; please generate the error in js function and propagate it to the top level. 366544 3 pfeldman 2011-03-12 01:11:02 -0800 Committed r80931: <http://trac.webkit.org/changeset/80931> 85571 2011-03-11 23:03:38 -0800 2011-03-11 23:10:47 -0800 Patch bug-56243-20110312100335.patch text/plain 29500 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogODA4NzUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAyMGU4OGVjNTQ5YTNiZmQ5NDMyZDAx MTliOTdiN2QyNzg1NGQwYTkzLi5lNWYwOWU4NTI4OGQyZDAxYjQ4NzRhYjk1OWNiZjQ4MjJlOGUx NzljIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTEtMDMtMTEgIFBhdmVsIEZlbGRtYW4gIDxw ZmVsZG1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogZm9sbG93IHVwIHRvIGVycm9yIHJlcG9ydGlu ZywgZml4aW5nIG11bHRpcGxlIHJlZ3Jlc3Npb25zLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTYyNDMKKworICAgICAgICAqIGluc3BlY3Rvci9lbGVt ZW50cy9lbGVtZW50cy1wYW5lbC1zZWFyY2guaHRtbDoKKwogMjAxMS0wMy0xMSAgRGltaXRyaSBH bGF6a292ICA8ZGdsYXprb3ZAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtHVEtdIFVwZGF0ZSBl eHBlY3RhdGlvbnMgYWZ0ZXIgcjgwODU3LgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVj dG9yL2VsZW1lbnRzL2VsZW1lbnRzLXBhbmVsLXNlYXJjaC5odG1sIGIvTGF5b3V0VGVzdHMvaW5z cGVjdG9yL2VsZW1lbnRzL2VsZW1lbnRzLXBhbmVsLXNlYXJjaC5odG1sCmluZGV4IGQ1YjNhYzA5 ODQ1ZjA5MTJjMTNlNTFhMDBlY2ZkM2EyYmZmNDI2N2IuLjNmNmM5ODQ5OGJiZWNlZDRjNjBjNDJj YWQ4MmI2ODkwY2EzMTk4Y2UgMTAwNzU1Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9lbGVt ZW50cy9lbGVtZW50cy1wYW5lbC1zZWFyY2guaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0 b3IvZWxlbWVudHMvZWxlbWVudHMtcGFuZWwtc2VhcmNoLmh0bWwKQEAgLTI3LDcgKzI3LDcgQEAg ZnVuY3Rpb24gdGVzdCgpCiAgICAgICAgICAgICBpZiAobm9kZS5ub2RlVHlwZSgpID09PSBOb2Rl LlRFWFRfTk9ERSkKICAgICAgICAgICAgICAgICBzZWFyY2hSZXN1bHRzLnB1c2gobm9kZS5ub2Rl VmFsdWUoKSk7CiAgICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgbm9kZS5vdXRlckhU TUwoYWRkU2VhcmNoUmVzdWx0KTsKKyAgICAgICAgICAgICAgICBub2RlLmdldE91dGVySFRNTChh ZGRTZWFyY2hSZXN1bHQpOwogICAgICAgICB9CiAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmRjMmQ2 OWZmMDBkYzk0NzQ1YjYwMjkwMTIwYjc3YzFhMjcwY2RkYi4uYzg0NGNmYzQ3YzgxYzc0MzFlOGM0 OThlYTIwMzY3YzY2YjU4ZjAzNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU3IEBACisyMDExLTAz LTExICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGZvbGxv dyB1cCB0byBlcnJvciByZXBvcnRpbmcsIGZpeGluZyBtdWx0aXBsZSByZWdyZXNzaW9ucy4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU2MjQzCisKKyAg ICAgICAgKiBpbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 SW5qZWN0ZWRTY3JpcHQ6OnNldFByb3BlcnR5VmFsdWUpOgorICAgICAgICAqIGluc3BlY3Rvci9J bmplY3RlZFNjcmlwdC5oOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3IuaWRsOgorICAg ICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpJbnNwZWN0b3JET01BZ2VudDo6Z2V0Q2hpbGROb2Rlcyk6CisgICAgICAgIChXZWJDb3JlOjpJ bnNwZWN0b3JET01BZ2VudDo6Z2V0T3V0ZXJIVE1MKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3Bl Y3RvckRPTUFnZW50OjpnZXRFdmVudExpc3RlbmVyc0Zvck5vZGUpOgorICAgICAgICAqIGluc3Bl Y3Rvci9JbnNwZWN0b3JET01BZ2VudC5oOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JS dW50aW1lQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yUnVudGltZUFnZW50 OjpzZXRQcm9wZXJ0eVZhbHVlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yUnVudGlt ZUFnZW50Lmg6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9ET01BZ2VudC5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5ET01Ob2RlLnByb3RvdHlwZS5zZXROb2RlTmFtZSk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuRE9NTm9kZS5wcm90b3R5cGUuc2V0Tm9kZVZhbHVlKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5ET01Ob2RlLnByb3RvdHlwZS5nZXRDaGlsZE5vZGVzKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5ET01Ob2RlLnByb3RvdHlwZS5nZXRPdXRlckhUTUwpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLkRPTU5vZGUucHJvdG90eXBlLnNldE91dGVySFRNTCk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuRE9NTm9kZS5wcm90b3R5cGUucmVtb3ZlTm9kZSk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuRE9NTm9kZS5wcm90b3R5cGUuY29weU5vZGUpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkRPTUFnZW50LnByb3RvdHlwZS5wdXNoTm9kZVRvRnJvbnRlbmQpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLkRPTUFnZW50LnByb3RvdHlwZS5wdXNoTm9kZUJ5UGF0aFRvRnJvbnRlbmQp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkV2ZW50TGlzdGVuZXJzLmdldEV2ZW50TGlzdGVuZXJz Rm9yTm9kZSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9ET01TdG9yYWdlLmpzOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTVN0b3JhZ2UucHJvdG90eXBlLmdldEVudHJpZXMpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTVN0b3JhZ2UucHJvdG90eXBlLnNldEl0ZW0pOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkRPTVN0b3JhZ2UucHJvdG90eXBlLnJlbW92ZUl0ZW0pOgorICAg ICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRE9NU3RvcmFnZUl0ZW1zVmlldy5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5ET01TdG9yYWdlSXRlbXNWaWV3LnByb3RvdHlwZS51cGRhdGUpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTVN0b3JhZ2VJdGVtc1ZpZXcucHJvdG90eXBlLl9zaG93 RE9NU3RvcmFnZUVudHJpZXMpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVu dHNUcmVlT3V0bGluZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5FbGVtZW50c1RyZWVFbGVt ZW50LnByb3RvdHlwZS5fY3JlYXRlVG9vbHRpcEZvck5vZGUuc2V0VG9vbHRpcCk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuRWxlbWVudHNUcmVlRWxlbWVudC5wcm90b3R5cGUudXBkYXRlQ2hpbGRy ZW4pOgorICAgICAgICAoKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0V2ZW50TGlz dGVuZXJzU2lkZWJhclBhbmUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRXZlbnRMaXN0ZW5l cnNTaWRlYmFyUGFuZS5wcm90b3R5cGUudXBkYXRlLmNhbGxiYWNrKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5FdmVudExpc3RlbmVyc1NpZGViYXJQYW5lLnByb3RvdHlwZS51cGRhdGUpOgorICAg ICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvT2JqZWN0UHJvcGVydGllc1NlY3Rpb24uanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuT2JqZWN0UHJvcGVydHlUcmVlRWxlbWVudC5wcm90b3R5cGUu YXBwbHlFeHByZXNzaW9uLmNhbGxiYWNrKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5PYmplY3RQ cm9wZXJ0eVRyZWVFbGVtZW50LnByb3RvdHlwZS5hcHBseUV4cHJlc3Npb24pOgorICAgICAgICAq IGluc3BlY3Rvci9mcm9udC1lbmQvUHJvcGVydGllc1NpZGViYXJQYW5lLmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlByb3BlcnRpZXNTaWRlYmFyUGFuZS5wcm90b3R5cGUudXBkYXRlLm5vZGVS ZXNvbHZlZCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9SZW1vdGVPYmplY3QuanM6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVtb3RlT2JqZWN0LnByb3RvdHlwZS5zZXRQcm9wZXJ0 eVZhbHVlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZW1vdGVPYmplY3QucHJvdG90eXBlLmV2 YWx1YXRlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qczoKKwog MjAxMS0wMy0xMSAgRXJpYyBDYXJsc29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KIAogICAg ICAgICBSZXZpZXdlZCBieSBTYW0gV2VpbmlnLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luamVjdGVkU2NyaXB0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bmplY3RlZFNjcmlwdC5jcHAKaW5kZXggNDRiZGRmZWVhM2RlMWU5OWM3NDkwYzQzNTI0MWRiOTlh MjhkZTA1ZC4uZWFhYTdlYWQzNDdlYTdkN2Q3YjlmMjY1MTQ5N2Q2ODY4Y2E4MzEwMiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHQuY3BwCkBAIC0xMDcsMTMgKzEw NywxOCBAQCB2b2lkIEluamVjdGVkU2NyaXB0OjpyZXNvbHZlTm9kZShsb25nIG5vZGVJZCwgUmVm UHRyPEluc3BlY3RvclZhbHVlPiogcmVzdWx0KQogICAgIG1ha2VDYWxsKGZ1bmN0aW9uLCByZXN1 bHQpOwogfQogCi12b2lkIEluamVjdGVkU2NyaXB0OjpzZXRQcm9wZXJ0eVZhbHVlKFBhc3NSZWZQ dHI8SW5zcGVjdG9yT2JqZWN0PiBvYmplY3RJZCwgY29uc3QgU3RyaW5nJiBwcm9wZXJ0eU5hbWUs IGNvbnN0IFN0cmluZyYgZXhwcmVzc2lvbiwgUmVmUHRyPEluc3BlY3RvclZhbHVlPiogcmVzdWx0 KQorYm9vbCBJbmplY3RlZFNjcmlwdDo6c2V0UHJvcGVydHlWYWx1ZShQYXNzUmVmUHRyPEluc3Bl Y3Rvck9iamVjdD4gb2JqZWN0SWQsIGNvbnN0IFN0cmluZyYgcHJvcGVydHlOYW1lLCBjb25zdCBT dHJpbmcmIGV4cHJlc3Npb24pCiB7CiAgICAgU2NyaXB0RnVuY3Rpb25DYWxsIGZ1bmN0aW9uKG1f aW5qZWN0ZWRTY3JpcHRPYmplY3QsICJzZXRQcm9wZXJ0eVZhbHVlIik7CiAgICAgZnVuY3Rpb24u YXBwZW5kQXJndW1lbnQob2JqZWN0SWQtPnRvSlNPTlN0cmluZygpKTsKICAgICBmdW5jdGlvbi5h cHBlbmRBcmd1bWVudChwcm9wZXJ0eU5hbWUpOwogICAgIGZ1bmN0aW9uLmFwcGVuZEFyZ3VtZW50 KGV4cHJlc3Npb24pOwotICAgIG1ha2VDYWxsKGZ1bmN0aW9uLCByZXN1bHQpOworICAgIFJlZlB0 cjxJbnNwZWN0b3JWYWx1ZT4gcmVzdWx0OworICAgIG1ha2VDYWxsKGZ1bmN0aW9uLCAmcmVzdWx0 KTsKKworICAgIGJvb2wgc3VjY2VzcyA9IGZhbHNlOworICAgIHJlc3VsdC0+YXNCb29sZWFuKCZz dWNjZXNzKTsKKyAgICByZXR1cm4gc3VjY2VzczsKIH0KIAogdm9pZCBJbmplY3RlZFNjcmlwdDo6 cmVsZWFzZU9iamVjdChQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gb2JqZWN0SWQpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHQuaCBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdC5oCmluZGV4IDk2ODg1NTEyNjAwYjYx YzNhYjRmN2Q4OWJiYjI4NDE5ZjRjNGZjYmYuLmEzMDg3MGEzOTFiMTE3MTYwMWFjYTJkZDIyYjg3 OTU4N2ZhZDY1Y2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbmplY3Rl ZFNjcmlwdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdC5o CkBAIC01Nyw3ICs1Nyw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGdldFByb3BlcnRpZXMoUGFzc1Jl ZlB0cjxJbnNwZWN0b3JPYmplY3Q+IG9iamVjdElkLCBib29sIGlnbm9yZUhhc093blByb3BlcnR5 LCBib29sIGFiYnJldmlhdGUsIFJlZlB0cjxJbnNwZWN0b3JWYWx1ZT4qIHJlc3VsdCk7CiAgICAg Tm9kZSogbm9kZUZvck9iamVjdElkKFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBvYmplY3RJ ZCk7CiAgICAgdm9pZCByZXNvbHZlTm9kZShsb25nIG5vZGVJZCwgUmVmUHRyPEluc3BlY3RvclZh bHVlPiogcmVzdWx0KTsKLSAgICB2b2lkIHNldFByb3BlcnR5VmFsdWUoUGFzc1JlZlB0cjxJbnNw ZWN0b3JPYmplY3Q+IG9iamVjdElkLCBjb25zdCBTdHJpbmcmIHByb3BlcnR5TmFtZSwgY29uc3Qg U3RyaW5nJiBleHByZXNzaW9uLCBSZWZQdHI8SW5zcGVjdG9yVmFsdWU+KiByZXN1bHQpOworICAg IGJvb2wgc2V0UHJvcGVydHlWYWx1ZShQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gb2JqZWN0 SWQsIGNvbnN0IFN0cmluZyYgcHJvcGVydHlOYW1lLCBjb25zdCBTdHJpbmcmIGV4cHJlc3Npb24p OwogICAgIHZvaWQgcmVsZWFzZU9iamVjdChQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gb2Jq ZWN0SWQpOwogICAgIAogI2lmIEVOQUJMRShKQVZBU0NSSVBUX0RFQlVHR0VSKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5pZGwgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmlkbAppbmRleCBhOWU5MWFkY2Q5MTE3NmM4ODQxMjhmY2Ex MWEyNzM4YWJjZWEwMjAyLi5lMWI4MWNiMTI3ZGE0MTFmZThiMzlmMWU1ZjU4Nzc1MDA1ZDkyOTQ4 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmlkbAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmlkbApAQCAtNzUsNyArNzUsNyBA QCBtb2R1bGUgY29yZSB7CiAgICAgICAgIHZvaWQgZXZhbHVhdGUoaW4gU3RyaW5nIGV4cHJlc3Np b24sIGluIFN0cmluZyBvYmplY3RHcm91cCwgaW4gYm9vbGVhbiBpbmNsdWRlQ29tbWFuZExpbmVB UEksIG91dCBWYWx1ZSByZXN1bHQpOwogICAgICAgICB2b2lkIGV2YWx1YXRlT24oaW4gT2JqZWN0 IG9iamVjdElkLCBpbiBTdHJpbmcgZXhwcmVzc2lvbiwgb3V0IFZhbHVlIHJlc3VsdCk7CiAgICAg ICAgIHZvaWQgZ2V0UHJvcGVydGllcyhpbiBPYmplY3Qgb2JqZWN0SWQsIGluIGJvb2xlYW4gaWdu b3JlSGFzT3duUHJvcGVydHksIGluIGJvb2xlYW4gYWJicmV2aWF0ZSwgb3V0IFZhbHVlIHJlc3Vs dCk7Ci0gICAgICAgIHZvaWQgc2V0UHJvcGVydHlWYWx1ZShpbiBPYmplY3Qgb2JqZWN0SWQsIGlu IFN0cmluZyBwcm9wZXJ0eU5hbWUsIGluIFN0cmluZyBleHByZXNzaW9uLCBvdXQgVmFsdWUgcmVz dWx0KTsKKyAgICAgICAgdm9pZCBzZXRQcm9wZXJ0eVZhbHVlKGluIE9iamVjdCBvYmplY3RJZCwg aW4gU3RyaW5nIHByb3BlcnR5TmFtZSwgaW4gU3RyaW5nIGV4cHJlc3Npb24pOwogICAgICAgICB2 b2lkIHJlbGVhc2VPYmplY3QoaW4gT2JqZWN0IG9iamVjdElkKTsKICAgICAgICAgdm9pZCByZWxl YXNlT2JqZWN0R3JvdXAoaW4gbG9uZyBpbmplY3RlZFNjcmlwdElkLCBpbiBTdHJpbmcgb2JqZWN0 R3JvdXApOwogICAgIH07CkBAIC0xNDUsMTAgKzE0NSwxMCBAQCBtb2R1bGUgY29yZSB7CiAKICAg ICBpbnRlcmZhY2UgW0NvbmRpdGlvbmFsPUlOU1BFQ1RPUl0gRE9NIHsKICAgICAgICAgdm9pZCBn ZXREb2N1bWVudChvdXQgT2JqZWN0IHJvb3QpOwotICAgICAgICB2b2lkIGNoaWxkTm9kZXMoaW4g bG9uZyBub2RlSWQpOworICAgICAgICB2b2lkIGdldENoaWxkTm9kZXMoaW4gbG9uZyBub2RlSWQp OwogCi0gICAgICAgIHZvaWQgcXVlcnlTZWxlY3RvcihpbiBsb25nIG5vZGVJZCwgaW4gU3RyaW5n IHNlbGVjdG9ycywgaW4gYm9vbGVhbiBkb2N1bWVudFdpZGUsIG91dCBsb25nIGVsZW1lbnRJZCk7 Ci0gICAgICAgIHZvaWQgcXVlcnlTZWxlY3RvckFsbChpbiBsb25nIG5vZGVJZCwgaW4gU3RyaW5n IHNlbGVjdG9ycywgaW4gYm9vbGVhbiBkb2N1bWVudFdpZGUsIG91dCBBcnJheSByZXN1bHQpOwor ICAgICAgICB2b2lkIHF1ZXJ5U2VsZWN0b3IoaW4gbG9uZyBub2RlSWQsIGluIFN0cmluZyBzZWxl Y3RvcnMsIGluIGJvb2xlYW4gZG9jdW1lbnRXaWRlLCBvdXQgbG9uZyBub2RlSWQpOworICAgICAg ICB2b2lkIHF1ZXJ5U2VsZWN0b3JBbGwoaW4gbG9uZyBub2RlSWQsIGluIFN0cmluZyBzZWxlY3Rv cnMsIGluIGJvb2xlYW4gZG9jdW1lbnRXaWRlLCBvdXQgQXJyYXkgbm9kZUlkcyk7CiAKICAgICAg ICAgdm9pZCBzZXROb2RlTmFtZShpbiBsb25nIG5vZGVJZCwgaW4gU3RyaW5nIG5hbWUsIG91dCBs b25nIG91dE5vZGVJZCk7CiAgICAgICAgIHZvaWQgc2V0Tm9kZVZhbHVlKGluIGxvbmcgbm9kZUlk LCBpbiBTdHJpbmcgdmFsdWUsIG91dCBib29sZWFuIHN1Y2Nlc3MpOwpAQCAtMTU3LDEwICsxNTcs MTAgQEAgbW9kdWxlIGNvcmUgewogICAgICAgICB2b2lkIHNldEF0dHJpYnV0ZShpbiBsb25nIGVs ZW1lbnRJZCwgaW4gU3RyaW5nIG5hbWUsIGluIFN0cmluZyB2YWx1ZSwgb3V0IGJvb2xlYW4gc3Vj Y2Vzcyk7CiAgICAgICAgIHZvaWQgcmVtb3ZlQXR0cmlidXRlKGluIGxvbmcgZWxlbWVudElkLCBp biBTdHJpbmcgbmFtZSwgb3V0IGJvb2xlYW4gc3VjY2Vzcyk7CiAKLSAgICAgICAgdm9pZCBnZXRF dmVudExpc3RlbmVyc0Zvck5vZGUoaW4gbG9uZyBub2RlSWQsIG91dCBsb25nIG91dE5vZGVJZCwg b3V0IEFycmF5IGxpc3RlbmVyc0FycmF5KTsKKyAgICAgICAgdm9pZCBnZXRFdmVudExpc3RlbmVy c0Zvck5vZGUoaW4gbG9uZyBub2RlSWQsIG91dCBBcnJheSBsaXN0ZW5lcnNBcnJheSk7CiAgICAg ICAgIHZvaWQgY29weU5vZGUoaW4gbG9uZyBub2RlSWQpOwogCi0gICAgICAgIHZvaWQgb3V0ZXJI VE1MKGluIGxvbmcgbm9kZUlkLCBvdXQgU3RyaW5nIG91dGVySFRNTCk7CisgICAgICAgIHZvaWQg Z2V0T3V0ZXJIVE1MKGluIGxvbmcgbm9kZUlkLCBvdXQgU3RyaW5nIG91dGVySFRNTCk7CiAgICAg ICAgIHZvaWQgc2V0T3V0ZXJIVE1MKGluIGxvbmcgbm9kZUlkLCBpbiBTdHJpbmcgb3V0ZXJIVE1M LCBvdXQgbG9uZyBvdXROb2RlSWQpOwogCiAgICAgICAgIHZvaWQgcGVyZm9ybVNlYXJjaChpbiBT dHJpbmcgcXVlcnksIGluIGJvb2xlYW4gcnVuU3luY2hyb25vdXNseSk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcAppbmRleCAwNWQxMDAyM2VkYmJi OGJiNTc3MjE4ZDg1MmU5MGQ1N2Q4ZTFmMmNjLi4wYzQxMTA1ZDgwY2FhZmQ2YTk2MjE0NmJiYWI4 ZTcwMmIyMDJiYzIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yRE9NQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JE T01BZ2VudC5jcHAKQEAgLTQyNyw3ICs0MjcsNyBAQCBOb2RlKiBJbnNwZWN0b3JET01BZ2VudDo6 bm9kZUZvcklkKGxvbmcgaWQpCiAgICAgcmV0dXJuIDA7CiB9CiAKLXZvaWQgSW5zcGVjdG9yRE9N QWdlbnQ6OmNoaWxkTm9kZXMoRXJyb3JTdHJpbmcqLCBsb25nIG5vZGVJZCkKK3ZvaWQgSW5zcGVj dG9yRE9NQWdlbnQ6OmdldENoaWxkTm9kZXMoRXJyb3JTdHJpbmcqLCBsb25nIG5vZGVJZCkKIHsK ICAgICBwdXNoQ2hpbGROb2Rlc1RvRnJvbnRlbmQobm9kZUlkKTsKIH0KQEAgLTU5MSw3ICs1OTEs NyBAQCB2b2lkIEluc3BlY3RvckRPTUFnZW50OjpzZXROb2RlTmFtZShFcnJvclN0cmluZyosIGxv bmcgbm9kZUlkLCBjb25zdCBTdHJpbmcmIHRhZwogICAgICAgICBwdXNoQ2hpbGROb2Rlc1RvRnJv bnRlbmQoKm5ld0lkKTsKIH0KIAotdm9pZCBJbnNwZWN0b3JET01BZ2VudDo6b3V0ZXJIVE1MKEVy cm9yU3RyaW5nKiwgbG9uZyBub2RlSWQsIFdURjo6U3RyaW5nKiBvdXRlckhUTUwpCit2b2lkIElu c3BlY3RvckRPTUFnZW50OjpnZXRPdXRlckhUTUwoRXJyb3JTdHJpbmcqLCBsb25nIG5vZGVJZCwg V1RGOjpTdHJpbmcqIG91dGVySFRNTCkKIHsKICAgICBOb2RlKiBub2RlID0gbm9kZUZvcklkKG5v ZGVJZCk7CiAgICAgaWYgKCFub2RlIHx8ICFub2RlLT5pc0hUTUxFbGVtZW50KCkpCkBAIC02NTEs MTAgKzY1MSw5IEBAIHZvaWQgSW5zcGVjdG9yRE9NQWdlbnQ6OnNldE5vZGVWYWx1ZShFcnJvclN0 cmluZyosIGxvbmcgbm9kZUlkLCBjb25zdCBTdHJpbmcmIHZhCiAgICAgKnN1Y2Nlc3MgPSBmYWxz ZTsKIH0KIAotdm9pZCBJbnNwZWN0b3JET01BZ2VudDo6Z2V0RXZlbnRMaXN0ZW5lcnNGb3JOb2Rl KEVycm9yU3RyaW5nKiwgbG9uZyBub2RlSWQsIGxvbmcqIG91dE5vZGVJZCwgUmVmUHRyPEluc3Bl Y3RvckFycmF5PiogbGlzdGVuZXJzQXJyYXkpCit2b2lkIEluc3BlY3RvckRPTUFnZW50OjpnZXRF dmVudExpc3RlbmVyc0Zvck5vZGUoRXJyb3JTdHJpbmcqLCBsb25nIG5vZGVJZCwgUmVmUHRyPElu c3BlY3RvckFycmF5PiogbGlzdGVuZXJzQXJyYXkpCiB7CiAgICAgTm9kZSogbm9kZSA9IG5vZGVG b3JJZChub2RlSWQpOwotICAgICpvdXROb2RlSWQgPSBub2RlSWQ7CiAgICAgRXZlbnRUYXJnZXRE YXRhKiBkOwogCiAgICAgLy8gUXVpY2sgYnJlYWsgaWYgYSBudWxsIG5vZGUgb3Igbm8gbGlzdGVu ZXJzIGF0IGFsbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ckRPTUFnZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQu aAppbmRleCAzMmE5NWNkMGQyM2Q2NWRmMWEyY2FkMzU4YzRjMzBjNzYwZTYzMzY2Li5jMTgxNzA0 MWI3N2ViYzkzYjExNDAxOTgyMTNkYmE2MzlmZWZiYjdlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuaApAQCAtMTA5LDE1ICsxMDksMTUgQEAgcHVibGlj OgogICAgIHZvaWQgcXVlcnlTZWxlY3RvcihFcnJvclN0cmluZyosIGxvbmcgbm9kZUlkLCBjb25z dCBTdHJpbmcmIHNlbGVjdG9ycywgYm9vbCBkb2N1bWVudFdpZGUsIGxvbmcqIGVsZW1lbnRJZCk7 CiAgICAgdm9pZCBxdWVyeVNlbGVjdG9yQWxsKEVycm9yU3RyaW5nKiwgbG9uZyBub2RlSWQsIGNv bnN0IFN0cmluZyYgc2VsZWN0b3JzLCBib29sIGRvY3VtZW50V2lkZSwgUmVmUHRyPEluc3BlY3Rv ckFycmF5PiogcmVzdWx0KTsKICAgICB2b2lkIGdldERvY3VtZW50KEVycm9yU3RyaW5nKiwgUmVm UHRyPEluc3BlY3Rvck9iamVjdD4qIHJvb3QpOwotICAgIHZvaWQgY2hpbGROb2RlcyhFcnJvclN0 cmluZyosIGxvbmcgbm9kZUlkKTsKKyAgICB2b2lkIGdldENoaWxkTm9kZXMoRXJyb3JTdHJpbmcq LCBsb25nIG5vZGVJZCk7CiAgICAgdm9pZCBzZXRBdHRyaWJ1dGUoRXJyb3JTdHJpbmcqLCBsb25n IGVsZW1lbnRJZCwgY29uc3QgU3RyaW5nJiBuYW1lLCBjb25zdCBTdHJpbmcmIHZhbHVlLCBib29s KiBzdWNjZXNzKTsKICAgICB2b2lkIHJlbW92ZUF0dHJpYnV0ZShFcnJvclN0cmluZyosIGxvbmcg ZWxlbWVudElkLCBjb25zdCBTdHJpbmcmIG5hbWUsIGJvb2wqIHN1Y2Nlc3MpOwogICAgIHZvaWQg cmVtb3ZlTm9kZShFcnJvclN0cmluZyosIGxvbmcgbm9kZUlkLCBsb25nKiBvdXROb2RlSWQpOwog ICAgIHZvaWQgc2V0Tm9kZU5hbWUoRXJyb3JTdHJpbmcqLCBsb25nIG5vZGVJZCwgY29uc3QgU3Ry aW5nJiBuYW1lLCBsb25nKiBuZXdJZCk7Ci0gICAgdm9pZCBvdXRlckhUTUwoRXJyb3JTdHJpbmcq LCBsb25nIG5vZGVJZCwgV1RGOjpTdHJpbmcqIG91dGVySFRNTCk7CisgICAgdm9pZCBnZXRPdXRl ckhUTUwoRXJyb3JTdHJpbmcqLCBsb25nIG5vZGVJZCwgV1RGOjpTdHJpbmcqIG91dGVySFRNTCk7 CiAgICAgdm9pZCBzZXRPdXRlckhUTUwoRXJyb3JTdHJpbmcqLCBsb25nIG5vZGVJZCwgY29uc3Qg U3RyaW5nJiBvdXRlckhUTUwsIGxvbmcqIG5ld0lkKTsKICAgICB2b2lkIHNldE5vZGVWYWx1ZShF cnJvclN0cmluZyosIGxvbmcgbm9kZUlkLCBjb25zdCBTdHJpbmcmIHZhbHVlLCBib29sKiBzdWNj ZXNzKTsKLSAgICB2b2lkIGdldEV2ZW50TGlzdGVuZXJzRm9yTm9kZShFcnJvclN0cmluZyosIGxv bmcgbm9kZUlkLCBsb25nKiBvdXROb2RlSWQsIFJlZlB0cjxJbnNwZWN0b3JBcnJheT4qIGxpc3Rl bmVyc0FycmF5KTsKKyAgICB2b2lkIGdldEV2ZW50TGlzdGVuZXJzRm9yTm9kZShFcnJvclN0cmlu ZyosIGxvbmcgbm9kZUlkLCBSZWZQdHI8SW5zcGVjdG9yQXJyYXk+KiBsaXN0ZW5lcnNBcnJheSk7 CiAgICAgdm9pZCBwZXJmb3JtU2VhcmNoKEVycm9yU3RyaW5nKiwgY29uc3QgU3RyaW5nJiB3aGl0 ZXNwYWNlVHJpbW1lZFF1ZXJ5LCBib29sIHJ1blN5bmNocm9ub3VzbHkpOwogICAgIHZvaWQgc2Vh cmNoQ2FuY2VsZWQoRXJyb3JTdHJpbmcqKTsKICAgICB2b2lkIHJlc29sdmVOb2RlKEVycm9yU3Ry aW5nKiwgbG9uZyBub2RlSWQsIGNvbnN0IFN0cmluZyYgb2JqZWN0R3JvdXAsIFJlZlB0cjxJbnNw ZWN0b3JWYWx1ZT4qIHJlc3VsdCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yUnVudGltZUFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JSdW50aW1lQWdlbnQuY3BwCmluZGV4IDc1ZTIxMDU1OGU5OGJmMDlkMmJhMWU3NzE2 NTljYmFmNDg4YmY2MWUuLjE0OWJiZWNiMDFlY2QzY2E2NjliMjI1N2RhZGUwYjM0ZmE5ODEzNGQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSdW50aW1lQWdl bnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSdW50aW1lQWdl bnQuY3BwCkBAIC03OSwxMSArNzksMTQgQEAgdm9pZCBJbnNwZWN0b3JSdW50aW1lQWdlbnQ6Omdl dFByb3BlcnRpZXMoRXJyb3JTdHJpbmcqLCBQYXNzUmVmUHRyPEluc3BlY3Rvck9iamUKICAgICAg ICAgaW5qZWN0ZWRTY3JpcHQuZ2V0UHJvcGVydGllcyhvYmplY3RJZCwgaWdub3JlSGFzT3duUHJv cGVydHksIGFiYnJldmlhdGUsIHJlc3VsdCk7CiB9CiAKLXZvaWQgSW5zcGVjdG9yUnVudGltZUFn ZW50OjpzZXRQcm9wZXJ0eVZhbHVlKEVycm9yU3RyaW5nKiwgUGFzc1JlZlB0cjxJbnNwZWN0b3JP YmplY3Q+IG9iamVjdElkLCBjb25zdCBTdHJpbmcmIHByb3BlcnR5TmFtZSwgY29uc3QgU3RyaW5n JiBleHByZXNzaW9uLCBSZWZQdHI8SW5zcGVjdG9yVmFsdWU+KiByZXN1bHQpCit2b2lkIEluc3Bl Y3RvclJ1bnRpbWVBZ2VudDo6c2V0UHJvcGVydHlWYWx1ZShFcnJvclN0cmluZyogZXJyb3JTdHJp bmcsIFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBvYmplY3RJZCwgY29uc3QgU3RyaW5nJiBw cm9wZXJ0eU5hbWUsIGNvbnN0IFN0cmluZyYgZXhwcmVzc2lvbikKIHsKICAgICBJbmplY3RlZFNj cmlwdCBpbmplY3RlZFNjcmlwdCA9IG1faW5qZWN0ZWRTY3JpcHRNYW5hZ2VyLT5pbmplY3RlZFNj cmlwdEZvck9iamVjdElkKG9iamVjdElkLmdldCgpKTsKLSAgICBpZiAoIWluamVjdGVkU2NyaXB0 Lmhhc05vVmFsdWUoKSkKLSAgICAgICAgaW5qZWN0ZWRTY3JpcHQuc2V0UHJvcGVydHlWYWx1ZShv YmplY3RJZCwgcHJvcGVydHlOYW1lLCBleHByZXNzaW9uLCByZXN1bHQpOworICAgIGlmICghaW5q ZWN0ZWRTY3JpcHQuaGFzTm9WYWx1ZSgpKSB7CisgICAgICAgIGlmICghaW5qZWN0ZWRTY3JpcHQu c2V0UHJvcGVydHlWYWx1ZShvYmplY3RJZCwgcHJvcGVydHlOYW1lLCBleHByZXNzaW9uKSkKKyAg ICAgICAgICAgICplcnJvclN0cmluZyA9ICJGYWlsZWQgc2V0dGluZyB2YWx1ZS4iOworICAgIH0g ZWxzZQorICAgICAgICAqZXJyb3JTdHJpbmcgPSAiTm8gaW5qZWN0ZWQgc2NyaXB0IGZvdW5kLiI7 CiB9CiAKIHZvaWQgSW5zcGVjdG9yUnVudGltZUFnZW50OjpyZWxlYXNlT2JqZWN0KEVycm9yU3Ry aW5nKiwgUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IG9iamVjdElkKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJ1bnRpbWVBZ2VudC5oIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJ1bnRpbWVBZ2VudC5oCmluZGV4IDMwNjY1MjAz YjQ5ZTg3YTM1NmI0ZDFjYjUwNTMyYjVjZjQ3MGM4YzIuLmFkM2NlNWIzY2MyYmM2ZmVjZDNhMGFm ODZiZmNjYTM1NmUzZmZmZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JSdW50aW1lQWdlbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yUnVudGltZUFnZW50LmgKQEAgLTU2LDcgKzU2LDcgQEAgcHVibGljOgogICAgIHZvaWQg ZXZhbHVhdGVPbihFcnJvclN0cmluZyosIFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBvYmpl Y3RJZCwgY29uc3QgU3RyaW5nJiBleHByZXNzaW9uLCBSZWZQdHI8SW5zcGVjdG9yVmFsdWU+KiBy ZXN1bHQpOwogICAgIHZvaWQgcmVsZWFzZU9iamVjdChFcnJvclN0cmluZyosIFBhc3NSZWZQdHI8 SW5zcGVjdG9yT2JqZWN0PiBvYmplY3RJZCk7CiAgICAgdm9pZCBnZXRQcm9wZXJ0aWVzKEVycm9y U3RyaW5nKiwgUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IG9iamVjdElkLCBib29sIGlnbm9y ZUhhc093blByb3BlcnR5LCBib29sIGFiYnJldmlhdGUsIFJlZlB0cjxJbnNwZWN0b3JWYWx1ZT4q IHJlc3VsdCk7Ci0gICAgdm9pZCBzZXRQcm9wZXJ0eVZhbHVlKEVycm9yU3RyaW5nKiwgUGFzc1Jl ZlB0cjxJbnNwZWN0b3JPYmplY3Q+IG9iamVjdElkLCBjb25zdCBTdHJpbmcmIHByb3BlcnR5TmFt ZSwgY29uc3QgU3RyaW5nJiBleHByZXNzaW9uLCBSZWZQdHI8SW5zcGVjdG9yVmFsdWU+KiByZXN1 bHQpOworICAgIHZvaWQgc2V0UHJvcGVydHlWYWx1ZShFcnJvclN0cmluZyosIFBhc3NSZWZQdHI8 SW5zcGVjdG9yT2JqZWN0PiBvYmplY3RJZCwgY29uc3QgU3RyaW5nJiBwcm9wZXJ0eU5hbWUsIGNv bnN0IFN0cmluZyYgZXhwcmVzc2lvbik7CiAgICAgdm9pZCByZWxlYXNlT2JqZWN0R3JvdXAoRXJy b3JTdHJpbmcqLCBsb25nIGluamVjdGVkU2NyaXB0SWQsIGNvbnN0IFN0cmluZyYgb2JqZWN0R3Jv dXApOwogCiBwcml2YXRlOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9ET01BZ2VudC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv RE9NQWdlbnQuanMKaW5kZXggNTAwMjFjYzlkOTE3MGU3ZWI1ODg0Y2ZkNTQ5YWFmZGRlMjJlNzNk Yi4uMzk0N2YwMDM2ZDhmMjI1MzI2OGNiMDhjMjM3YzVjMGVkZThjOWIyOSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9ET01BZ2VudC5qcworKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RPTUFnZW50LmpzCkBAIC0xMDQsNyArMTA0 LDcgQEAgV2ViSW5zcGVjdG9yLkRPTU5vZGUucHJvdG90eXBlID0gewogCiAgICAgc2V0Tm9kZU5h bWU6IGZ1bmN0aW9uKG5hbWUsIGNhbGxiYWNrKQogICAgIHsKLSAgICAgICAgRE9NQWdlbnQuc2V0 Tm9kZU5hbWUodGhpcy5pZCwgbmFtZSwgZXJyb3JGaWx0ZXIuYmluZChudWxsLCBjYWxsYmFjaykp OworICAgICAgICBET01BZ2VudC5zZXROb2RlTmFtZSh0aGlzLmlkLCBuYW1lLCBjYWxsYmFjayk7 CiAgICAgfSwKIAogICAgIGxvY2FsTmFtZTogZnVuY3Rpb24oKQpAQCAtMTE5LDcgKzExOSw3IEBA IFdlYkluc3BlY3Rvci5ET01Ob2RlLnByb3RvdHlwZSA9IHsKIAogICAgIHNldE5vZGVWYWx1ZTog ZnVuY3Rpb24odmFsdWUsIGNhbGxiYWNrKQogICAgIHsKLSAgICAgICAgRE9NQWdlbnQuc2V0Tm9k ZVZhbHVlKHRoaXMuaWQsIHZhbHVlLCBlcnJvckZpbHRlci5iaW5kKG51bGwsIGNhbGxiYWNrKSk7 CisgICAgICAgIERPTUFnZW50LnNldE5vZGVWYWx1ZSh0aGlzLmlkLCB2YWx1ZSwgY2FsbGJhY2sp OwogICAgIH0sCiAKICAgICBnZXRBdHRyaWJ1dGU6IGZ1bmN0aW9uKG5hbWUpCkBAIC0xNzIsNyAr MTcyLDcgQEAgV2ViSW5zcGVjdG9yLkRPTU5vZGUucHJvdG90eXBlID0gewogICAgICAgICBET01B Z2VudC5yZW1vdmVBdHRyaWJ1dGUodGhpcy5pZCwgbmFtZSwgbXljYWxsYmFjay5iaW5kKHRoaXMp KTsKICAgICB9LAogCi0gICAgY2hpbGROb2RlczogZnVuY3Rpb24oY2FsbGJhY2spCisgICAgZ2V0 Q2hpbGROb2RlczogZnVuY3Rpb24oY2FsbGJhY2spCiAgICAgewogICAgICAgICBpZiAodGhpcy5j aGlsZHJlbikgewogICAgICAgICAgICAgaWYgKGNhbGxiYWNrKQpAQCAtMTg0LDI3ICsxODQsMjcg QEAgV2ViSW5zcGVjdG9yLkRPTU5vZGUucHJvdG90eXBlID0gewogICAgICAgICAgICAgaWYgKCFl cnJvciAmJiBjYWxsYmFjaykKICAgICAgICAgICAgICAgICBjYWxsYmFjayh0aGlzLmNoaWxkcmVu KTsKICAgICAgICAgfQotICAgICAgICBET01BZ2VudC5jaGlsZE5vZGVzKHRoaXMuaWQsIG15Y2Fs bGJhY2suYmluZCh0aGlzKSk7CisgICAgICAgIERPTUFnZW50LmdldENoaWxkTm9kZXModGhpcy5p ZCwgbXljYWxsYmFjay5iaW5kKHRoaXMpKTsKICAgICB9LAogCi0gICAgb3V0ZXJIVE1MOiBmdW5j dGlvbihjYWxsYmFjaykKKyAgICBnZXRPdXRlckhUTUw6IGZ1bmN0aW9uKGNhbGxiYWNrKQogICAg IHsKLSAgICAgICAgRE9NQWdlbnQub3V0ZXJIVE1MKHRoaXMuaWQsIGVycm9yRmlsdGVyLmJpbmQo bnVsbCwgY2FsbGJhY2spKTsKKyAgICAgICAgRE9NQWdlbnQuZ2V0T3V0ZXJIVE1MKHRoaXMuaWQs IGNhbGxiYWNrKTsKICAgICB9LAogCiAgICAgc2V0T3V0ZXJIVE1MOiBmdW5jdGlvbihodG1sLCBj YWxsYmFjaykKICAgICB7Ci0gICAgICAgIERPTUFnZW50LnNldE91dGVySFRNTCh0aGlzLmlkLCBo dG1sLCBlcnJvckZpbHRlci5iaW5kKG51bGwsIGNhbGxiYWNrKSk7CisgICAgICAgIERPTUFnZW50 LnNldE91dGVySFRNTCh0aGlzLmlkLCBodG1sLCBjYWxsYmFjayk7CiAgICAgfSwKIAogICAgIHJl bW92ZU5vZGU6IGZ1bmN0aW9uKGNhbGxiYWNrKQogICAgIHsKLSAgICAgICAgRE9NQWdlbnQucmVt b3ZlTm9kZSh0aGlzLmlkLCBlcnJvckZpbHRlci5iaW5kKG51bGwsIGNhbGxiYWNrKSk7CisgICAg ICAgIERPTUFnZW50LnJlbW92ZU5vZGUodGhpcy5pZCwgY2FsbGJhY2spOwogICAgIH0sCiAKICAg ICBjb3B5Tm9kZTogZnVuY3Rpb24oY2FsbGJhY2spCiAgICAgewotICAgICAgICBET01BZ2VudC5j b3B5Tm9kZSh0aGlzLmlkLCBlcnJvckZpbHRlci5iaW5kKG51bGwsIGNhbGxiYWNrKSk7CisgICAg ICAgIERPTUFnZW50LmNvcHlOb2RlKHRoaXMuaWQsIGNhbGxiYWNrKTsKICAgICB9LAogCiAgICAg cGF0aDogZnVuY3Rpb24oKQpAQCAtMzU0LDI4ICszNTQsMzcgQEAgV2ViSW5zcGVjdG9yLkRPTUFn ZW50LnByb3RvdHlwZSA9IHsKIAogICAgIHB1c2hOb2RlVG9Gcm9udGVuZDogZnVuY3Rpb24ob2Jq ZWN0SWQsIGNhbGxiYWNrKQogICAgIHsKKyAgICAgICAgZnVuY3Rpb24gY2FsbGJhY2tXcmFwcGVy KGVycm9yLCBub2RlSWQpCisgICAgICAgIHsKKyAgICAgICAgICAgIGlmIChjYWxsYmFjaykKKyAg ICAgICAgICAgICAgICBjYWxsYmFjayhlcnJvciA/IDAgOiBub2RlSWQpOworICAgICAgICB9CisK ICAgICAgICAgZnVuY3Rpb24gbXljYWxsYmFjaygpCiAgICAgICAgIHsKICAgICAgICAgICAgIGlm ICh0aGlzLl9kb2N1bWVudCkKLSAgICAgICAgICAgICAgICBET01BZ2VudC5wdXNoTm9kZVRvRnJv bnRlbmQob2JqZWN0SWQsIGVycm9yRmlsdGVyLmJpbmQobnVsbCwgY2FsbGJhY2spKTsKLSAgICAg ICAgICAgIGVsc2UgewotICAgICAgICAgICAgICAgIGlmIChjYWxsYmFjaykKLSAgICAgICAgICAg ICAgICAgICAgY2FsbGJhY2soMCk7Ci0gICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgRE9N QWdlbnQucHVzaE5vZGVUb0Zyb250ZW5kKG9iamVjdElkLCBjYWxsYmFja1dyYXBwZXIpOworICAg ICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgIGNhbGxiYWNrV3JhcHBlcigiTm8gZG9jdW1l bnQiKTsKICAgICAgICAgfQorCiAgICAgICAgIHRoaXMucmVxdWVzdERvY3VtZW50KG15Y2FsbGJh Y2suYmluZCh0aGlzKSk7CiAgICAgfSwKIAogICAgIHB1c2hOb2RlQnlQYXRoVG9Gcm9udGVuZDog ZnVuY3Rpb24ocGF0aCwgY2FsbGJhY2spCiAgICAgeworICAgICAgICBmdW5jdGlvbiBjYWxsYmFj a1dyYXBwZXIoZXJyb3IsIG5vZGVJZCkKKyAgICAgICAgeworICAgICAgICAgICAgaWYgKGNhbGxi YWNrKQorICAgICAgICAgICAgICAgIGNhbGxiYWNrKGVycm9yID8gMCA6IG5vZGVJZCk7CisgICAg ICAgIH0KKwogICAgICAgICBmdW5jdGlvbiBteWNhbGxiYWNrKCkKICAgICAgICAgewogICAgICAg ICAgICAgaWYgKHRoaXMuX2RvY3VtZW50KQotICAgICAgICAgICAgICAgIERPTUFnZW50LnB1c2hO b2RlQnlQYXRoVG9Gcm9udGVuZChwYXRoLCBlcnJvckZpbHRlci5iaW5kKG51bGwsIGNhbGxiYWNr KSk7Ci0gICAgICAgICAgICBlbHNlIHsKLSAgICAgICAgICAgICAgICBpZiAoY2FsbGJhY2spCi0g ICAgICAgICAgICAgICAgICAgIGNhbGxiYWNrKDApOwotICAgICAgICAgICAgfQorICAgICAgICAg ICAgICAgIERPTUFnZW50LnB1c2hOb2RlQnlQYXRoVG9Gcm9udGVuZChwYXRoLCBjYWxsYmFja1dy YXBwZXIpOworICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgIGNhbGxiYWNrV3JhcHBl cigiTm8gZG9jdW1lbnQiKTsKICAgICAgICAgfQogICAgICAgICB0aGlzLnJlcXVlc3REb2N1bWVu dChteWNhbGxiYWNrLmJpbmQodGhpcykpOwogICAgIH0sCkBAIC02MzUsOSArNjQ0LDkgQEAgV2Vi SW5zcGVjdG9yLkNvb2tpZXMuY29va2llRG9tYWluTWF0Y2hlc1Jlc291cmNlRG9tYWluID0gZnVu Y3Rpb24oY29va2llRG9tYWluLAogCiBXZWJJbnNwZWN0b3IuRXZlbnRMaXN0ZW5lcnMgPSB7fQog Ci1XZWJJbnNwZWN0b3IuRXZlbnRMaXN0ZW5lcnMuZ2V0RXZlbnRMaXN0ZW5lcnNGb3JOb2RlQXN5 bmMgPSBmdW5jdGlvbihub2RlLCBjYWxsYmFjaykKK1dlYkluc3BlY3Rvci5FdmVudExpc3RlbmVy cy5nZXRFdmVudExpc3RlbmVyc0Zvck5vZGUgPSBmdW5jdGlvbihub2RlLCBjYWxsYmFjaykKIHsK ICAgICBpZiAoIW5vZGUpCiAgICAgICAgIHJldHVybjsKLSAgICBET01BZ2VudC5nZXRFdmVudExp c3RlbmVyc0Zvck5vZGUobm9kZS5pZCwgZXJyb3JGaWx0ZXIuYmluZCh0aGlzLCBjYWxsYmFjaykp OworICAgIERPTUFnZW50LmdldEV2ZW50TGlzdGVuZXJzRm9yTm9kZShub2RlLmlkLCBjYWxsYmFj ayk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RP TVN0b3JhZ2UuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RPTVN0b3Jh Z2UuanMKaW5kZXggODU3OWJhNWM4ZWRhYmY4ZTQyODdjOTZkMWE2NWRiOTVmMDRiZGFmOS4uZWEy NDkyMWY2ZDE2ZWVhNTYwZDEyMjE5Y2UyN2YxNGE4YjI1ODMwMiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9ET01TdG9yYWdlLmpzCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRE9NU3RvcmFnZS5qcwpAQCAtNTEsMTcgKzUxLDE3 IEBAIFdlYkluc3BlY3Rvci5ET01TdG9yYWdlLnByb3RvdHlwZSA9IHsKIAogICAgIGdldEVudHJp ZXM6IGZ1bmN0aW9uKGNhbGxiYWNrKQogICAgIHsKLSAgICAgICAgRE9NU3RvcmFnZUFnZW50Lmdl dERPTVN0b3JhZ2VFbnRyaWVzKHRoaXMuX2lkLCBlcnJvckZpbHRlci5iaW5kKG51bGwsIGNhbGxi YWNrKSk7CisgICAgICAgIERPTVN0b3JhZ2VBZ2VudC5nZXRET01TdG9yYWdlRW50cmllcyh0aGlz Ll9pZCwgY2FsbGJhY2spOwogICAgIH0sCiAgICAgCiAgICAgc2V0SXRlbTogZnVuY3Rpb24oa2V5 LCB2YWx1ZSwgY2FsbGJhY2spCiAgICAgewotICAgICAgICBET01TdG9yYWdlQWdlbnQuc2V0RE9N U3RvcmFnZUl0ZW0odGhpcy5faWQsIGtleSwgdmFsdWUsIGVycm9yRmlsdGVyLmJpbmQobnVsbCwg Y2FsbGJhY2spKTsKKyAgICAgICAgRE9NU3RvcmFnZUFnZW50LnNldERPTVN0b3JhZ2VJdGVtKHRo aXMuX2lkLCBrZXksIHZhbHVlLCBjYWxsYmFjayk7CiAgICAgfSwKICAgICAKICAgICByZW1vdmVJ dGVtOiBmdW5jdGlvbihrZXksIGNhbGxiYWNrKQogICAgIHsKLSAgICAgICAgRE9NU3RvcmFnZUFn ZW50LnJlbW92ZURPTVN0b3JhZ2VJdGVtKHRoaXMuX2lkLCBrZXksIGVycm9yRmlsdGVyLmJpbmQo bnVsbCwgY2FsbGJhY2spKTsKKyAgICAgICAgRE9NU3RvcmFnZUFnZW50LnJlbW92ZURPTVN0b3Jh Z2VJdGVtKHRoaXMuX2lkLCBrZXksIGNhbGxiYWNrKTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRE9NU3RvcmFnZUl0ZW1zVmlldy5q cyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRE9NU3RvcmFnZUl0ZW1zVmll dy5qcwppbmRleCBkYmQ3MzZiZjY5ZTg4NTg2MTViNzkyNTBlZGY4M2JjZDU1NDIyZjAzLi5iNjNi Yzk2Y2U0Y2U0OWEzMTViYTNlNmZmY2I1NTg1YzNlMzNjZTU2IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RPTVN0b3JhZ2VJdGVtc1ZpZXcuanMKKysrIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9ET01TdG9yYWdlSXRlbXNWaWV3Lmpz CkBAIC02MSwxMiArNjEsMTQgQEAgV2ViSW5zcGVjdG9yLkRPTVN0b3JhZ2VJdGVtc1ZpZXcucHJv dG90eXBlID0gewogICAgIHVwZGF0ZTogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgdGhpcy5l bGVtZW50LnJlbW92ZUNoaWxkcmVuKCk7Ci0gICAgICAgIHZhciBjYWxsYmFjayA9IHRoaXMuX3No b3dET01TdG9yYWdlRW50cmllcy5iaW5kKHRoaXMpOwotICAgICAgICB0aGlzLmRvbVN0b3JhZ2Uu Z2V0RW50cmllcyhjYWxsYmFjayk7CisgICAgICAgIHRoaXMuZG9tU3RvcmFnZS5nZXRFbnRyaWVz KHRoaXMuX3Nob3dET01TdG9yYWdlRW50cmllcy5iaW5kKHRoaXMpKTsKICAgICB9LAogCi0gICAg X3Nob3dET01TdG9yYWdlRW50cmllczogZnVuY3Rpb24oZW50cmllcykKKyAgICBfc2hvd0RPTVN0 b3JhZ2VFbnRyaWVzOiBmdW5jdGlvbihlcnJvciwgZW50cmllcykKICAgICB7CisgICAgICAgIGlm IChlcnJvcikKKyAgICAgICAgICAgIHJldHVybjsKKwogICAgICAgICB0aGlzLl9kYXRhR3JpZCA9 IHRoaXMuX2RhdGFHcmlkRm9yRE9NU3RvcmFnZUVudHJpZXMoZW50cmllcyk7CiAgICAgICAgIHRo aXMuZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9kYXRhR3JpZC5lbGVtZW50KTsKICAgICAgICAg dGhpcy5fZGF0YUdyaWQuYXV0b1NpemVDb2x1bW5zKDEwKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNUcmVlT3V0bGluZS5qcyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNUcmVlT3V0bGluZS5qcwppbmRl eCA2YzljZDcwMGI5NWQxNDEyZmUyZmYzODlmOTk2YWU3NmI1YmZhZjcyLi5hZTRkZTVmMzBiZGMx OTU0OTkzOTc4Mjc0ZjRjNjVjNTYxNDcwZWRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzVHJlZU91dGxpbmUuanMKKysrIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1RyZWVPdXRsaW5lLmpzCkBAIC00MDYs OSArNDA2LDkgQEAgV2ViSW5zcGVjdG9yLkVsZW1lbnRzVHJlZUVsZW1lbnQucHJvdG90eXBlID0g ewogICAgICAgICBpZiAoIW5vZGUubm9kZU5hbWUoKSB8fCBub2RlLm5vZGVOYW1lKCkudG9Mb3dl ckNhc2UoKSAhPT0gImltZyIpCiAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgZnVuY3Rp b24gc2V0VG9vbHRpcChyZXN1bHQpCisgICAgICAgIGZ1bmN0aW9uIHNldFRvb2x0aXAoZXJyb3Is IHJlc3VsdCkKICAgICAgICAgewotICAgICAgICAgICAgaWYgKCFyZXN1bHQgfHwgcmVzdWx0LnR5 cGUgIT09ICJzdHJpbmciKQorICAgICAgICAgICAgaWYgKGVycm9yIHx8ICFyZXN1bHQgfHwgcmVz dWx0LnR5cGUgIT09ICJzdHJpbmciKQogICAgICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAg ICAgICAgdHJ5IHsKQEAgLTQ5Miw3ICs0OTIsNyBAQCBXZWJJbnNwZWN0b3IuRWxlbWVudHNUcmVl RWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAgewogICAgICAgICBpZiAodGhpcy5fZWxlbWVudENs b3NlVGFnKQogICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB0aGlzLnJlcHJlc2VudGVkT2Jq ZWN0LmNoaWxkTm9kZXModGhpcy5fdXBkYXRlQ2hpbGRyZW4uYmluZCh0aGlzLCBmdWxsUmVmcmVz aCkpOworICAgICAgICB0aGlzLnJlcHJlc2VudGVkT2JqZWN0LmdldENoaWxkTm9kZXModGhpcy5f dXBkYXRlQ2hpbGRyZW4uYmluZCh0aGlzLCBmdWxsUmVmcmVzaCkpOwogICAgIH0sCiAKICAgICBp bnNlcnRDaGlsZEVsZW1lbnQ6IGZ1bmN0aW9uKGNoaWxkLCBpbmRleCwgY2xvc2luZ1RhZykKQEAg LTE0MjAsNyArMTQyMCw3IEBAIFdlYkluc3BlY3Rvci5FbGVtZW50c1RyZWVFbGVtZW50LnByb3Rv dHlwZSA9IHsKICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICB2YXIgc2VsZiA9IHRoaXM7 Ci0gICAgICAgIGZ1bmN0aW9uIHJlbW92ZU5vZGVDYWxsYmFjayhyZW1vdmVkTm9kZUlkKQorICAg ICAgICBmdW5jdGlvbiByZW1vdmVOb2RlQ2FsbGJhY2soZXJyb3IsIHJlbW92ZWROb2RlSWQpCiAg ICAgICAgIHsKICAgICAgICAgICAgIC8vIC0xIGlzIGFuIGVycm9yIGNvZGUsIHdoaWNoIG1lYW5z IHJlbW92aW5nIHRoZSBub2RlIGZyb20gdGhlIERPTSBmYWlsZWQsCiAgICAgICAgICAgICAvLyBz byB3ZSBzaG91bGRuJ3QgcmVtb3ZlIGl0IGZyb20gdGhlIHRyZWUuCkBAIC0xNDU2LDEyICsxNDU2 LDEzIEBAIFdlYkluc3BlY3Rvci5FbGVtZW50c1RyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAg ICAgICAgICAgIH0KICAgICAgICAgfQogCi0gICAgICAgIGZ1bmN0aW9uIGNvbW1pdENoYW5nZSh2 YWx1ZSkKKyAgICAgICAgZnVuY3Rpb24gY29tbWl0Q2hhbmdlKGVycm9yLCB2YWx1ZSkKICAgICAg ICAgewotICAgICAgICAgICAgbm9kZS5zZXRPdXRlckhUTUwodmFsdWUsIHNlbGVjdE5vZGUpOwor ICAgICAgICAgICAgaWYgKCFlcnJvcikKKyAgICAgICAgICAgICAgICBub2RlLnNldE91dGVySFRN TCh2YWx1ZSwgc2VsZWN0Tm9kZSk7CiAgICAgICAgIH0KIAotICAgICAgICBub2RlLm91dGVySFRN TCh0aGlzLl9zdGFydEVkaXRpbmdBc0hUTUwuYmluZCh0aGlzLCBjb21taXRDaGFuZ2UpKTsKKyAg ICAgICAgbm9kZS5nZXRPdXRlckhUTUwodGhpcy5fc3RhcnRFZGl0aW5nQXNIVE1MLmJpbmQodGhp cywgY29tbWl0Q2hhbmdlKSk7CiAgICAgfSwKIAogICAgIF9jb3B5SFRNTDogZnVuY3Rpb24oKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FdmVudExpc3Rl bmVyc1NpZGViYXJQYW5lLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9F dmVudExpc3RlbmVyc1NpZGViYXJQYW5lLmpzCmluZGV4IDAzMjc1MTA5ZWJlMDNiNjlkYzE4NTVi NjJiNjRhODMwODJiMmYzYTMuLmE5MTg5OTkxNmQ1ODFlNjU4MzdjY2Q4OTlhZjFlNDdlMGE2N2M2 MTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRXZlbnRM aXN0ZW5lcnNTaWRlYmFyUGFuZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0V2ZW50TGlzdGVuZXJzU2lkZWJhclBhbmUuanMKQEAgLTY1LDcgKzY1LDEwIEBAIFdl Ykluc3BlY3Rvci5FdmVudExpc3RlbmVyc1NpZGViYXJQYW5lLnByb3RvdHlwZSA9IHsKICAgICAg ICAgdGhpcy5zZWN0aW9ucyA9IFtdOwogCiAgICAgICAgIHZhciBzZWxmID0gdGhpczsKLSAgICAg ICAgZnVuY3Rpb24gY2FsbGJhY2sobm9kZUlkLCBldmVudExpc3RlbmVycykgeworICAgICAgICBm dW5jdGlvbiBjYWxsYmFjayhlcnJvciwgZXZlbnRMaXN0ZW5lcnMpIHsKKyAgICAgICAgICAgIGlm IChlcnJvcikKKyAgICAgICAgICAgICAgICByZXR1cm47CisKICAgICAgICAgICAgIHZhciBzZWN0 aW9uTmFtZXMgPSBbXTsKICAgICAgICAgICAgIHZhciBzZWN0aW9uTWFwID0ge307CiAgICAgICAg ICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGV2ZW50TGlzdGVuZXJzLmxlbmd0aDsgKytpKSB7CkBA IC03Nyw3ICs4MCw3IEBAIFdlYkluc3BlY3Rvci5FdmVudExpc3RlbmVyc1NpZGViYXJQYW5lLnBy b3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICB2YXIgdHlwZSA9IGV2ZW50TGlzdGVuZXIudHlw ZTsKICAgICAgICAgICAgICAgICB2YXIgc2VjdGlvbiA9IHNlY3Rpb25NYXBbdHlwZV07CiAgICAg ICAgICAgICAgICAgaWYgKCFzZWN0aW9uKSB7Ci0gICAgICAgICAgICAgICAgICAgIHNlY3Rpb24g PSBuZXcgV2ViSW5zcGVjdG9yLkV2ZW50TGlzdGVuZXJzU2VjdGlvbih0eXBlLCBub2RlSWQpOwor ICAgICAgICAgICAgICAgICAgICBzZWN0aW9uID0gbmV3IFdlYkluc3BlY3Rvci5FdmVudExpc3Rl bmVyc1NlY3Rpb24odHlwZSwgbm9kZS5pZCk7CiAgICAgICAgICAgICAgICAgICAgIHNlY3Rpb25N YXBbdHlwZV0gPSBzZWN0aW9uOwogICAgICAgICAgICAgICAgICAgICBzZWN0aW9uTmFtZXMucHVz aCh0eXBlKTsKICAgICAgICAgICAgICAgICAgICAgc2VsZi5zZWN0aW9ucy5wdXNoKHNlY3Rpb24p OwpAQCAtMTAxLDcgKzEwNCw3IEBAIFdlYkluc3BlY3Rvci5FdmVudExpc3RlbmVyc1NpZGViYXJQ YW5lLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIH0KICAgICAgICAgfQogCi0gICAgICAgIFdl Ykluc3BlY3Rvci5FdmVudExpc3RlbmVycy5nZXRFdmVudExpc3RlbmVyc0Zvck5vZGVBc3luYyhu b2RlLCBjYWxsYmFjayk7CisgICAgICAgIFdlYkluc3BlY3Rvci5FdmVudExpc3RlbmVycy5nZXRF dmVudExpc3RlbmVyc0Zvck5vZGUobm9kZSwgY2FsbGJhY2spOwogICAgIH0sCiAKICAgICBfY2hh bmdlU2V0dGluZzogZnVuY3Rpb24oZXZlbnQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL09iamVjdFByb3BlcnRpZXNTZWN0aW9uLmpzIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9PYmplY3RQcm9wZXJ0aWVzU2VjdGlvbi5qcwppbmRl eCA0YmZkZjg5OWI0OTVjZWFlY2I2YzEzNzQ0NDczMTJkZTYxZTA5MTViLi4xNzk1ODQzZThmOGZi ODI3NDkwMmNlNTFhOGUwYWEwZWI3NDc2MGM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL09iamVjdFByb3BlcnRpZXNTZWN0aW9uLmpzCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvT2JqZWN0UHJvcGVydGllc1NlY3Rpb24uanMK QEAgLTI3OCwyMyArMjc4LDIzIEBAIFdlYkluc3BlY3Rvci5PYmplY3RQcm9wZXJ0eVRyZWVFbGVt ZW50LnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAgIGV4cHJlc3Npb24gPSBleHByZXNzaW9u LnRyaW0oKTsKICAgICAgICAgdmFyIGV4cHJlc3Npb25MZW5ndGggPSBleHByZXNzaW9uLmxlbmd0 aDsKLSAgICAgICAgdmFyIHNlbGYgPSB0aGlzOwotICAgICAgICB2YXIgY2FsbGJhY2sgPSBmdW5j dGlvbihzdWNjZXNzKSB7CisgICAgICAgIGZ1bmN0aW9uIGNhbGxiYWNrKGVycm9yKQorICAgICAg ICB7CiAgICAgICAgICAgICBpZiAoIXVwZGF0ZUludGVyZmFjZSkKICAgICAgICAgICAgICAgICBy ZXR1cm47CiAKLSAgICAgICAgICAgIGlmICghc3VjY2VzcykKLSAgICAgICAgICAgICAgICBzZWxm LnVwZGF0ZSgpOworICAgICAgICAgICAgaWYgKGVycm9yKQorICAgICAgICAgICAgICAgIHRoaXMu dXBkYXRlKCk7CiAKICAgICAgICAgICAgIGlmICghZXhwcmVzc2lvbkxlbmd0aCkgewogICAgICAg ICAgICAgICAgIC8vIFRoZSBwcm9wZXJ0eSB3YXMgZGVsZXRlZCwgc28gcmVtb3ZlIHRoaXMgdHJl ZSBlbGVtZW50LgotICAgICAgICAgICAgICAgIHNlbGYucGFyZW50LnJlbW92ZUNoaWxkKHRoaXMp OworICAgICAgICAgICAgICAgIHRoaXMucGFyZW50LnJlbW92ZUNoaWxkKHRoaXMpOwogICAgICAg ICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgICAgICAvLyBDYWxsIHVwZGF0ZVNpYmxpbmdzIHNp bmNlIHRoZWlyIHZhbHVlIG1pZ2h0IGJlIGJhc2VkIG9uIHRoZSB2YWx1ZSB0aGF0IGp1c3QgY2hh bmdlZC4KLSAgICAgICAgICAgICAgICBzZWxmLnVwZGF0ZVNpYmxpbmdzKCk7CisgICAgICAgICAg ICAgICAgdGhpcy51cGRhdGVTaWJsaW5ncygpOwogICAgICAgICAgICAgfQogICAgICAgICB9Owot ICAgICAgICB0aGlzLnByb3BlcnR5LnBhcmVudE9iamVjdC5zZXRQcm9wZXJ0eVZhbHVlKHRoaXMu cHJvcGVydHkubmFtZSwgZXhwcmVzc2lvbi50cmltKCksIGNhbGxiYWNrKTsKKyAgICAgICAgdGhp cy5wcm9wZXJ0eS5wYXJlbnRPYmplY3Quc2V0UHJvcGVydHlWYWx1ZSh0aGlzLnByb3BlcnR5Lm5h bWUsIGV4cHJlc3Npb24udHJpbSgpLCBjYWxsYmFjay5iaW5kKHRoaXMpKTsKICAgICB9CiB9CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUHJvcGVydGll c1NpZGViYXJQYW5lLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9w ZXJ0aWVzU2lkZWJhclBhbmUuanMKaW5kZXggMGMzMTRiYzQ1MWZiMWQ0YTg5NzI4N2E5NWIzYWEx ZjM3NDk0MTIwOS4uNDMwOTBmNWQ1NDZhYzk4YTAzNjYyNDZlMmQ2MGU5NzY0OTRiMTBlNCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9wZXJ0aWVzU2lk ZWJhclBhbmUuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9w ZXJ0aWVzU2lkZWJhclBhbmUuanMKQEAgLTQ1LDkgKzQ1LDkgQEAgV2ViSW5zcGVjdG9yLlByb3Bl cnRpZXNTaWRlYmFyUGFuZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIFJ1bnRpbWVBZ2VudC5yZWxl YXNlT2JqZWN0R3JvdXAoMCwgImRvbS1zZWxlY3Rpb24iKTsKICAgICAgICAgV2ViSW5zcGVjdG9y LlJlbW90ZU9iamVjdC5yZXNvbHZlTm9kZShub2RlLCBub2RlUmVzb2x2ZWQuYmluZCh0aGlzKSk7 CiAKLSAgICAgICAgZnVuY3Rpb24gbm9kZVJlc29sdmVkKG9iamVjdFBheWxvYWQpCisgICAgICAg IGZ1bmN0aW9uIG5vZGVSZXNvbHZlZChlcnJvciwgb2JqZWN0UGF5bG9hZCkKICAgICAgICAgewot ICAgICAgICAgICAgaWYgKCFvYmplY3RQYXlsb2FkKQorICAgICAgICAgICAgaWYgKGVycm9yIHx8 ICFvYmplY3RQYXlsb2FkKQogICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIHZh ciBvYmplY3QgPSBXZWJJbnNwZWN0b3IuUmVtb3RlT2JqZWN0LmZyb21QYXlsb2FkKG9iamVjdFBh eWxvYWQpOwogICAgICAgICAgICAgb2JqZWN0LmV2YWx1YXRlKCJ2YXIgcHJvdG8gPSB0aGlzOyBy ZXN1bHQgPSB7fTsgdmFyIGNvdW50ZXIgPSAxOyB3aGlsZSAocHJvdG8pIHsgcmVzdWx0W2NvdW50 ZXIrK10gPSBwcm90bzsgcHJvdG8gPSBwcm90by5fX3Byb3RvX18gfTsgcmV0dXJuIHJlc3VsdDsi LCBub2RlUHJvdG90eXBlc1JlYWR5LmJpbmQodGhpcykpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZW1vdGVPYmplY3QuanMgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1JlbW90ZU9iamVjdC5qcwppbmRleCA0ZTkzM2M5M2JlMWE5 NGY5NzI2ODUwMDViYmFjNTI1Y2UyZjU4ZjE4Li5lMjk5ODVhMzQzZjZmNTdmNTZiMzdjOGE3MDI3 ZTkxNTI1OGFiMmI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1JlbW90ZU9iamVjdC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1JlbW90ZU9iamVjdC5qcwpAQCAtMTI4LDEwICsxMjgsMTAgQEAgV2ViSW5zcGVjdG9yLlJl bW90ZU9iamVjdC5wcm90b3R5cGUgPSB7CiAgICAgc2V0UHJvcGVydHlWYWx1ZTogZnVuY3Rpb24o bmFtZSwgdmFsdWUsIGNhbGxiYWNrKQogICAgIHsKICAgICAgICAgaWYgKCF0aGlzLl9vYmplY3RJ ZCkgewotICAgICAgICAgICAgY2FsbGJhY2soZmFsc2UpOworICAgICAgICAgICAgY2FsbGJhY2so IkNhbid0IGdldCBhIHByb3BlcnR5IG9mIG5vbi1vYmplY3QuIik7CiAgICAgICAgICAgICByZXR1 cm47CiAgICAgICAgIH0KLSAgICAgICAgUnVudGltZUFnZW50LnNldFByb3BlcnR5VmFsdWUodGhp cy5fb2JqZWN0SWQsIG5hbWUsIHZhbHVlLCBlcnJvckZpbHRlci5iaW5kKHRoaXMsIGNhbGxiYWNr KSk7CisgICAgICAgIFJ1bnRpbWVBZ2VudC5zZXRQcm9wZXJ0eVZhbHVlKHRoaXMuX29iamVjdElk LCBuYW1lLCB2YWx1ZSwgY2FsbGJhY2spOwogICAgIH0sCiAKICAgICBwdXNoTm9kZVRvRnJvbnRl bmQ6IGZ1bmN0aW9uKGNhbGxiYWNrKQpAQCAtMTQ0LDcgKzE0NCw3IEBAIFdlYkluc3BlY3Rvci5S ZW1vdGVPYmplY3QucHJvdG90eXBlID0gewogCiAgICAgZXZhbHVhdGU6IGZ1bmN0aW9uKGV4cHJl c3Npb24sIGNhbGxiYWNrKQogICAgIHsKLSAgICAgICAgUnVudGltZUFnZW50LmV2YWx1YXRlT24o dGhpcy5fb2JqZWN0SWQsIGV4cHJlc3Npb24sIGVycm9yRmlsdGVyLmJpbmQodGhpcywgY2FsbGJh Y2spKTsKKyAgICAgICAgUnVudGltZUFnZW50LmV2YWx1YXRlT24odGhpcy5fb2JqZWN0SWQsIGV4 cHJlc3Npb24sIGNhbGxiYWNrKTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKaW5kZXggZWE5ZGY1ZWVkYzdkZDI4NDViMTZj ZDczZjI2MGU3ZTc3YWUwMzlhZi4uMjU0MWYwY2FhYmMyYWUxN2FiMGE0NjAyOTdlZTNlMTZkMWRh MTc3MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNw ZWN0b3IuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0 b3IuanMKQEAgLTQ4LDE1ICs0OCw2IEBACiAgICAgKG5ldyBJbWFnZSgpKS5zcmMgPSAiSW1hZ2Vz L3VuZG9ja0J1dHRvbkdseXBoLnBuZyI7CiB9KSgpOwogCi1mdW5jdGlvbiBlcnJvckZpbHRlcigp Ci17Ci0gICAgdmFyIGFyZ3MgPSBBcnJheS5wcm90b3R5cGUuc2xpY2UuY2FsbChhcmd1bWVudHMp OwotICAgIHZhciBjYWxsYmFjayA9IGFyZ3Muc2hpZnQoKTsKLSAgICB2YXIgZXJyb3IgPSBhcmdz LnNoaWZ0KCk7Ci0gICAgaWYgKCFlcnJvcikKLSAgICAgICAgY2FsbGJhY2suYXBwbHkodGhpcywg YXJncyk7Ci19Ci0KIHZhciBXZWJJbnNwZWN0b3IgPSB7CiAgICAgcmVzb3VyY2VzOiB7fSwKICAg ICBtaXNzaW5nTG9jYWxpemVkU3RyaW5nczoge30sCg==