57525 2011-03-30 23:01:24 -0700 Web Inspector: disable properties abbreviation. 2011-03-31 13:12:42 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman webkit-unassigned apavlov bweinstein commit-queue joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 376959 0 pfeldman 2011-03-30 23:01:24 -0700 I am experimenting with disabling property abbreviation. It can result in more time spent while expanding dom node properties and such, but the upside is that debugging becomes much more pleasant. 376963 1 87670 pfeldman 2011-03-30 23:37:46 -0700 Created attachment 87670 Patch 377387 2 87670 commit-queue 2011-03-31 13:12:37 -0700 Comment on attachment 87670 Patch Clearing flags on attachment: 87670 Committed r82609: <http://trac.webkit.org/changeset/82609> 377388 3 commit-queue 2011-03-31 13:12:42 -0700 All reviewed patches have been landed. Closing bug. 87670 2011-03-30 23:37:46 -0700 2011-03-31 13:12:37 -0700 Patch bug-57525-20110331103743.patch text/plain 23314 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogODI0MjAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBkNTc0YjI5YzE1YTYyOGEyMzkwMWM0 ZWJkYTljODBiZThiOTEwMjIzLi4zZmIyMDM5M2I0NjNmMzI3OGQ0YjU0Yzg1MzIwMThjYTMyNDYx NmM3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMDMtMzAgIFBhdmVsIEZlbGRtYW4gIDxw ZmVsZG1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogZGlzYWJsZSBwcm9wZXJ0aWVzIGFiYnJldmlh dGlvbi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU3 NTI1CisKKyAgICAgICAgKiBpbnNwZWN0b3IvY29uc29sZS9jb25zb2xlLWRpci1nbG9iYWwuaHRt bDoKKyAgICAgICAgKiBpbnNwZWN0b3IvcHJvdG9jb2wvcnVudGltZS1hZ2VudC1leHBlY3RlZC50 eHQ6CisgICAgICAgICogaW5zcGVjdG9yL3Byb3RvY29sL3J1bnRpbWUtYWdlbnQuaHRtbDoKKwog MjAxMS0wMy0zMCAgWWFlbCBBaGFyb24gIDx5YWVsLmFoYXJvbkBub2tpYS5jb20+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNw ZWN0b3IvY29uc29sZS9jb25zb2xlLWRpci1nbG9iYWwuaHRtbCBiL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9jb25zb2xlL2NvbnNvbGUtZGlyLWdsb2JhbC5odG1sCmluZGV4IDQ0OTk2OTFjMWZkMDhm YmViNTZjMjhkMjFiMTQ0MDdhOTQ5NGIxOTIuLjdmMDY4NTEzNTM0MDBkMTc3M2RiZDdiYWU4ZTBk MTZlOTJkODE2ZjMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9jb25zb2xlL2Nv bnNvbGUtZGlyLWdsb2JhbC5odG1sCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9jb25zb2xl L2NvbnNvbGUtZGlyLWdsb2JhbC5odG1sCkBAIC0yMyw3ICsyMyw3IEBAIGZ1bmN0aW9uIHRlc3Qo KQogICAgICAgICBpZiAocmVzdWx0LnR5cGUgPT09ICJlcnJvciIpCiAgICAgICAgICAgICB0ZXN0 Q29udHJvbGxlci5ub3RpZnlEb25lKCJFeGNlcHRpb246IiArIHJlc3VsdCk7CiAgICAgICAgIHZh ciBvYmplY3RQcm94eSA9IFdlYkluc3BlY3Rvci5SZW1vdGVPYmplY3QuZnJvbVBheWxvYWQocmVz dWx0KTsKLSAgICAgICAgb2JqZWN0UHJveHkuZ2V0UHJvcGVydGllcyhmYWxzZSwgdHJ1ZSwgZ2V0 UHJvcGVydGllc0NhbGxiYWNrKTsKKyAgICAgICAgb2JqZWN0UHJveHkuZ2V0T3duUHJvcGVydGll cyhnZXRQcm9wZXJ0aWVzQ2FsbGJhY2spOwogICAgIH0KIAogICAgIGZ1bmN0aW9uIGdldFByb3Bl cnRpZXNDYWxsYmFjayhwcm9wZXJ0aWVzKQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVj dG9yL3Byb3RvY29sL3J1bnRpbWUtYWdlbnQtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW5z cGVjdG9yL3Byb3RvY29sL3J1bnRpbWUtYWdlbnQtZXhwZWN0ZWQudHh0CmluZGV4IDBkNzVmMmFi NWIwZjFiMTFiNjgxYWE0ZGM0N2Y5NDNiNWU2YzJmNDYuLjVmNGJmNjQwMWQyNWI2ZWIxYTcyOTY2 ZWQyNmM5NDgzNDYwZjVkNTAgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9wcm90 b2NvbC9ydW50aW1lLWFnZW50LWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0 b3IvcHJvdG9jb2wvcnVudGltZS1hZ2VudC1leHBlY3RlZC50eHQKQEAgLTk0LDcgKzk0LDcgQEAg cmVzcG9uc2U6CiB9CiAKIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tCi1SdW50aW1lQWdlbnQuZ2V0UHJvcGVydGllcyg8c3RyaW5nPixm YWxzZSxmYWxzZSkKK1J1bnRpbWVBZ2VudC5nZXRQcm9wZXJ0aWVzKDxzdHJpbmc+LGZhbHNlKQog CiByZXF1ZXN0OgogewpAQCAtMTA0LDcgKzEwNCw2IEBAIHJlcXVlc3Q6CiAgICAgYXJndW1lbnRz IDogewogICAgICAgICBvYmplY3RJZCA6IDxzdHJpbmc+CiAgICAgICAgIGlnbm9yZUhhc093blBy b3BlcnR5IDogZmFsc2UKLSAgICAgICAgYWJicmV2aWF0ZSA6IGZhbHNlCiAgICAgfQogfQogCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvcHJvdG9jb2wvcnVudGltZS1hZ2VudC5o dG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3Byb3RvY29sL3J1bnRpbWUtYWdlbnQuaHRtbApp bmRleCBmYjhkYjQ0MmEzNzRhMjM3NDg4YTFlNGFjNjMyODVmNWNhZjU4MjBmLi5iNjc5Yjc0Mjgy OGU0ZDlkMDcxY2Y5NTk1NGZmOGQxMzFlOGU2ZmYzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9p bnNwZWN0b3IvcHJvdG9jb2wvcnVudGltZS1hZ2VudC5odG1sCisrKyBiL0xheW91dFRlc3RzL2lu c3BlY3Rvci9wcm90b2NvbC9ydW50aW1lLWFnZW50Lmh0bWwKQEAgLTIyLDcgKzIyLDcgQEAgZnVu Y3Rpb24gdGVzdCgpCiAgICAgICAgICAgICBbIlJ1bnRpbWVBZ2VudCIsICJldmFsdWF0ZU9uIiwg cmVzdWx0Lm9iamVjdElkLCAndGhpcy5hc3NpZ25lZEJ5RXZhbHVhdGVPbiA9ICJldmFsdWF0ZU9u IGZ1bmN0aW9uIHdvcmtzIGZpbmUiOyddLAogICAgICAgICAgICAgWyJSdW50aW1lQWdlbnQiLCAi c2V0UHJvcGVydHlWYWx1ZSIsIHJlc3VsdC5vYmplY3RJZCwgJ2Fzc2lnbmVkQnlTZXRQcm9wZXJ0 eVZhbHVlJywgJ3RydWUnXSwKICAgICAgICAgICAgIFsiUnVudGltZUFnZW50IiwgInNldFByb3Bl cnR5VmFsdWUiLCByZXN1bHQub2JqZWN0SWQsICdyZW1vdmVkQnlTZXRQcm9wZXJ0eVZhbHVlJywg JyddLAotICAgICAgICAgICAgWyJSdW50aW1lQWdlbnQiLCAiZ2V0UHJvcGVydGllcyIsIHJlc3Vs dC5vYmplY3RJZCwgZmFsc2UsIGZhbHNlXSwKKyAgICAgICAgICAgIFsiUnVudGltZUFnZW50Iiwg ImdldFByb3BlcnRpZXMiLCByZXN1bHQub2JqZWN0SWQsIGZhbHNlXSwKICAgICAgICAgICAgIFsi UnVudGltZUFnZW50IiwgInJlbGVhc2VPYmplY3QiLCByZXN1bHQub2JqZWN0SWRdLAogICAgICAg ICAgICAgWyJSdW50aW1lQWdlbnQiLCAicmVsZWFzZU9iamVjdEdyb3VwIiwgJ3Rlc3QnXV07CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0YmZkOTgxODE5ZWNhMTA0MGIyZDBiZjBiYjliMTA1ZTU3NjljYTI2Li40 ZjExNDhkYjNlYmJkMGM0ODFmZGNhNGY0OWJiNjQ4OGU1OTdmMzU0IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDUgKzEsNDIgQEAKIDIwMTEtMDMtMzAgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1 bS5vcmc+CiAKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg V2ViIEluc3BlY3RvcjogZGlzYWJsZSBwcm9wZXJ0aWVzIGFiYnJldmlhdGlvbi4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU3NTI1CisKKyAgICAgICAg KiBpbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5qZWN0 ZWRTY3JpcHQ6OmdldFByb3BlcnRpZXMpOgorICAgICAgICAqIGluc3BlY3Rvci9JbmplY3RlZFNj cmlwdC5oOgorICAgICAgICAqIGluc3BlY3Rvci9JbmplY3RlZFNjcmlwdFNvdXJjZS5qczoKKyAg ICAgICAgKC4pOgorICAgICAgICAoKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yLmpz b246CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvclJ1bnRpbWVBZ2VudC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpJbnNwZWN0b3JSdW50aW1lQWdlbnQ6OmdldFByb3BlcnRpZXMpOgorICAg ICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JSdW50aW1lQWdlbnQuaDoKKyAgICAgICAgKiBpbnNw ZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNv bnNvbGVWaWV3LnByb3RvdHlwZS5jb21wbGV0aW9ucy5ldmFsdWF0ZWQpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkNvbnNvbGVWaWV3LnByb3RvdHlwZS5fZm9ybWF0YXJyYXkpOgorICAgICAgICAq IGluc3BlY3Rvci9mcm9udC1lbmQvT2JqZWN0UHJvcGVydGllc1NlY3Rpb24uanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuT2JqZWN0UHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlLnVwZGF0ZS5j YWxsYmFjayk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuT2JqZWN0UHJvcGVydGllc1NlY3Rpb24u cHJvdG90eXBlLnVwZGF0ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuT2JqZWN0UHJvcGVydHlU cmVlRWxlbWVudC5wcm90b3R5cGUub25wb3B1bGF0ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu T2JqZWN0UHJvcGVydHlUcmVlRWxlbWVudC5wcm90b3R5cGUudXBkYXRlKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5PYmplY3RQcm9wZXJ0eVRyZWVFbGVtZW50LnByb3RvdHlwZS5zdGFydEVkaXRp bmcpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUHJvcGVydGllc1NpZGViYXJQYW5l LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlByb3BlcnRpZXNTaWRlYmFyUGFuZS5wcm90b3R5 cGUudXBkYXRlLm5vZGVQcm90b3R5cGVzUmVhZHkpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9u dC1lbmQvUmVtb3RlT2JqZWN0LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlbW90ZU9iamVj dC5wcm90b3R5cGUuZ2V0T3duUHJvcGVydGllcyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVt b3RlT2JqZWN0LnByb3RvdHlwZS5nZXRBbGxQcm9wZXJ0aWVzKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5SZW1vdGVPYmplY3QucHJvdG90eXBlLl9nZXRQcm9wZXJ0aWVzKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5Mb2NhbEpTT05PYmplY3QucHJvdG90eXBlLmdldE93blByb3BlcnRpZXMpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkxvY2FsSlNPTk9iamVjdC5wcm90b3R5cGUuZ2V0QWxsUHJv cGVydGllcyk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuY3NzOgor ICAgICAgICAoLmNvbnNvbGUtZm9ybWF0dGVkLXN0cmluZywgLmNvbnNvbGUtZm9ybWF0dGVkLXJl Z2V4cCk6CisKKzIwMTEtMDMtMzAgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5v cmc+CisKICAgICAgICAgTm90IHJldmlld2VkOiBmaXhpbmcgdHlwbyBpbiB0aGUgaW5zcGVjdG9y IGZyb250LWVuZC4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBSRUdSRVNTSU9OOiBCcm9rZW4g bGl2ZSBlZGl0IGVycm9ycyBoYW5kbGluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0luamVjdGVkU2NyaXB0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Jbmpl Y3RlZFNjcmlwdC5jcHAKaW5kZXggZWUyZTM1YWIwYjg3MWRiMGU4MTBhZDg2M2YzNGEwODI1MmQ3 Nzc3Yy4uMmM2MmUyZTUxMzhiNTAwZGY4Y2U0MTNjZjMyMzViMTM5MjdlMDU4NCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHQuY3BwCkBAIC03NSwxMiArNzUsMTEg QEAgdm9pZCBJbmplY3RlZFNjcmlwdDo6ZXZhbHVhdGVPbkNhbGxGcmFtZShFcnJvclN0cmluZyog ZXJyb3JTdHJpbmcsIGNvbnN0IFN0cmluZyYKICAgICBtYWtlT2JqZWN0Q2FsbChlcnJvclN0cmlu ZywgZnVuY3Rpb24sIHJlc3VsdCk7CiB9CiAKLXZvaWQgSW5qZWN0ZWRTY3JpcHQ6OmdldFByb3Bl cnRpZXMoRXJyb3JTdHJpbmcqIGVycm9yU3RyaW5nLCBjb25zdCBTdHJpbmcmIG9iamVjdElkLCBi b29sIGlnbm9yZUhhc093blByb3BlcnR5LCBib29sIGFiYnJldmlhdGUsIFJlZlB0cjxJbnNwZWN0 b3JBcnJheT4qIHByb3BlcnRpZXMpCit2b2lkIEluamVjdGVkU2NyaXB0OjpnZXRQcm9wZXJ0aWVz KEVycm9yU3RyaW5nKiBlcnJvclN0cmluZywgY29uc3QgU3RyaW5nJiBvYmplY3RJZCwgYm9vbCBp Z25vcmVIYXNPd25Qcm9wZXJ0eSwgUmVmUHRyPEluc3BlY3RvckFycmF5PiogcHJvcGVydGllcykK IHsKICAgICBTY3JpcHRGdW5jdGlvbkNhbGwgZnVuY3Rpb24obV9pbmplY3RlZFNjcmlwdE9iamVj dCwgImdldFByb3BlcnRpZXMiKTsKICAgICBmdW5jdGlvbi5hcHBlbmRBcmd1bWVudChvYmplY3RJ ZCk7CiAgICAgZnVuY3Rpb24uYXBwZW5kQXJndW1lbnQoaWdub3JlSGFzT3duUHJvcGVydHkpOwot ICAgIGZ1bmN0aW9uLmFwcGVuZEFyZ3VtZW50KGFiYnJldmlhdGUpOwogCiAgICAgUmVmUHRyPElu c3BlY3RvclZhbHVlPiByZXN1bHQ7IAogICAgIG1ha2VDYWxsKGZ1bmN0aW9uLCAmcmVzdWx0KTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdC5oIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0LmgKaW5kZXggZTE2NWU5Y2M4 ODBjNjg4ZjkxNmRmMWI3Njg1ODFkM2FiNjExZmFiNi4uNDFjMmRjMDUzYmM3MjljOWExYmY1ZDBk ZWI3NzA0ZmRkMWYyMTYwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu amVjdGVkU2NyaXB0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luamVjdGVkU2Ny aXB0LmgKQEAgLTU4LDcgKzU4LDcgQEAgcHVibGljOgogICAgIHZvaWQgZXZhbHVhdGUoRXJyb3JT dHJpbmcqLCBjb25zdCBTdHJpbmcmIGV4cHJlc3Npb24sIGNvbnN0IFN0cmluZyYgb2JqZWN0R3Jv dXAsIGJvb2wgaW5jbHVkZUNvbW1hbmRMaW5lQVBJLCBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0Piog cmVzdWx0KTsKICAgICB2b2lkIGV2YWx1YXRlT24oRXJyb3JTdHJpbmcqLCBjb25zdCBTdHJpbmcm IG9iamVjdElkLCBjb25zdCBTdHJpbmcmIGV4cHJlc3Npb24sIFJlZlB0cjxJbnNwZWN0b3JPYmpl Y3Q+KiByZXN1bHQpOwogICAgIHZvaWQgZXZhbHVhdGVPbkNhbGxGcmFtZShFcnJvclN0cmluZyos IGNvbnN0IFN0cmluZyYgY2FsbEZyYW1lSWQsIGNvbnN0IFN0cmluZyYgZXhwcmVzc2lvbiwgY29u c3QgU3RyaW5nJiBvYmplY3RHcm91cCwgYm9vbCBpbmNsdWRlQ29tbWFuZExpbmVBUEksIFJlZlB0 cjxJbnNwZWN0b3JPYmplY3Q+KiByZXN1bHQpOwotICAgIHZvaWQgZ2V0UHJvcGVydGllcyhFcnJv clN0cmluZyosIGNvbnN0IFN0cmluZyYgb2JqZWN0SWQsIGJvb2wgaWdub3JlSGFzT3duUHJvcGVy dHksIGJvb2wgYWJicmV2aWF0ZSwgUmVmUHRyPEluc3BlY3RvckFycmF5PiogcmVzdWx0KTsKKyAg ICB2b2lkIGdldFByb3BlcnRpZXMoRXJyb3JTdHJpbmcqLCBjb25zdCBTdHJpbmcmIG9iamVjdElk LCBib29sIGlnbm9yZUhhc093blByb3BlcnR5LCBSZWZQdHI8SW5zcGVjdG9yQXJyYXk+KiByZXN1 bHQpOwogICAgIE5vZGUqIG5vZGVGb3JPYmplY3RJZChjb25zdCBTdHJpbmcmIG9iamVjdElkKTsK ICAgICB2b2lkIHNldFByb3BlcnR5VmFsdWUoRXJyb3JTdHJpbmcqLCBjb25zdCBTdHJpbmcmIG9i amVjdElkLCBjb25zdCBTdHJpbmcmIHByb3BlcnR5TmFtZSwgY29uc3QgU3RyaW5nJiBleHByZXNz aW9uKTsKICAgICB2b2lkIHJlbGVhc2VPYmplY3QoY29uc3QgU3RyaW5nJiBvYmplY3RJZCk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRTb3VyY2Uu anMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRTb3VyY2UuanMKaW5k ZXggZjQ5OWExNzZkNDQ0NTJhNTljYTdlNWRiZjZhZmNjNTc4YTAwMGQzZC4uZTY3ZWYyY2Y4MWRj NWU3Y2Y0OTMzNzE5ZDRjZGFhZjAzODdhMjVlNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luamVjdGVkU2NyaXB0U291cmNlLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbmplY3RlZFNjcmlwdFNvdXJjZS5qcwpAQCAtNzEsNyArNzEsNyBAQCBJbmplY3Rl ZFNjcmlwdC5wcm90b3R5cGUgPSB7CiAgICAgICAgIGlmIChhcmd1bWVudHMubGVuZ3RoID09PSAw KQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIHZhciBvYmplY3RJZCA9IHRoaXMuX3dy YXBPYmplY3Qob2JqZWN0LCAiIiwgZmFsc2UpOworICAgICAgICB2YXIgb2JqZWN0SWQgPSB0aGlz Ll93cmFwT2JqZWN0KG9iamVjdCwgIiIpOwogICAgICAgICB2YXIgaGludHMgPSB7fTsKIAogICAg ICAgICBzd2l0Y2ggKGluamVjdGVkU2NyaXB0Ll9kZXNjcmliZShvYmplY3QpKSB7CkBAIC05MCw3 ICs5MCw3IEBAIEluamVjdGVkU2NyaXB0LnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIG9i amVjdDsKICAgICB9LAogCi0gICAgX3dyYXBPYmplY3Q6IGZ1bmN0aW9uKG9iamVjdCwgb2JqZWN0 R3JvdXBOYW1lLCBhYmJyZXZpYXRlKQorICAgIF93cmFwT2JqZWN0OiBmdW5jdGlvbihvYmplY3Qs IG9iamVjdEdyb3VwTmFtZSkKICAgICB7CiAgICAgICAgIHRyeSB7CiAgICAgICAgICAgICBpZiAo dHlwZW9mIG9iamVjdCA9PT0gIm9iamVjdCIgfHwgdHlwZW9mIG9iamVjdCA9PT0gImZ1bmN0aW9u IiB8fCB0aGlzLl9pc0hUTUxBbGxDb2xsZWN0aW9uKG9iamVjdCkpIHsKQEAgLTEwNyw3ICsxMDcs NyBAQCBJbmplY3RlZFNjcmlwdC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgICAgIHRo aXMuX2lkVG9PYmplY3RHcm91cE5hbWVbaWRdID0gb2JqZWN0R3JvdXBOYW1lOwogICAgICAgICAg ICAgICAgIH0KICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIHJldHVybiBJbmplY3RlZFNjcmlw dC5SZW1vdGVPYmplY3QuZnJvbU9iamVjdChvYmplY3QsIG9iamVjdElkLCBhYmJyZXZpYXRlKTsK KyAgICAgICAgICAgIHJldHVybiBJbmplY3RlZFNjcmlwdC5SZW1vdGVPYmplY3QuZnJvbU9iamVj dChvYmplY3QsIG9iamVjdElkKTsKICAgICAgICAgfSBjYXRjaCAoZSkgewogICAgICAgICAgICAg cmV0dXJuIEluamVjdGVkU2NyaXB0LlJlbW90ZU9iamVjdC5mcm9tT2JqZWN0KCJbIEV4Y2VwdGlv bjogIiArIGUudG9TdHJpbmcoKSArICIgXSIpOwogICAgICAgICB9CkBAIC0xMzksNyArMTM5LDcg QEAgSW5qZWN0ZWRTY3JpcHQucHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4gcmVzdWx0Owog ICAgIH0sCiAKLSAgICBnZXRQcm9wZXJ0aWVzOiBmdW5jdGlvbihvYmplY3RJZCwgaWdub3JlSGFz T3duUHJvcGVydHksIGFiYnJldmlhdGUpCisgICAgZ2V0UHJvcGVydGllczogZnVuY3Rpb24ob2Jq ZWN0SWQsIGlnbm9yZUhhc093blByb3BlcnR5KQogICAgIHsKICAgICAgICAgdmFyIHBhcnNlZE9i amVjdElkID0gdGhpcy5fcGFyc2VPYmplY3RJZChvYmplY3RJZCk7CiAgICAgICAgIHZhciBvYmpl Y3QgPSB0aGlzLl9vYmplY3RGb3JJZChwYXJzZWRPYmplY3RJZCk7CkBAIC0xNjIsNyArMTYyLDcg QEAgSW5qZWN0ZWRTY3JpcHQucHJvdG90eXBlID0gewogICAgICAgICAgICAgdmFyIGlzR2V0dGVy ID0gb2JqZWN0WyJfX2xvb2t1cEdldHRlcl9fIl0gJiYgb2JqZWN0Ll9fbG9va3VwR2V0dGVyX18o cHJvcGVydHlOYW1lKTsKICAgICAgICAgICAgIGlmICghaXNHZXR0ZXIpIHsKICAgICAgICAgICAg ICAgICB0cnkgewotICAgICAgICAgICAgICAgICAgICBwcm9wZXJ0eS52YWx1ZSA9IHRoaXMuX3dy YXBPYmplY3Qob2JqZWN0W3Byb3BlcnR5TmFtZV0sIG9iamVjdEdyb3VwTmFtZSwgYWJicmV2aWF0 ZSk7CisgICAgICAgICAgICAgICAgICAgIHByb3BlcnR5LnZhbHVlID0gdGhpcy5fd3JhcE9iamVj dChvYmplY3RbcHJvcGVydHlOYW1lXSwgb2JqZWN0R3JvdXBOYW1lKTsKICAgICAgICAgICAgICAg ICB9IGNhdGNoKGUpIHsKICAgICAgICAgICAgICAgICAgICAgcHJvcGVydHkudmFsdWUgPSBuZXcg SW5qZWN0ZWRTY3JpcHQuUmVtb3RlT2JqZWN0LmZyb21FeGNlcHRpb24oZSk7CiAgICAgICAgICAg ICAgICAgfQpAQCAtNDAyLDEyICs0MDIsMTMgQEAgSW5qZWN0ZWRTY3JpcHQucHJvdG90eXBlID0g ewogICAgICAgICByZXR1cm4gdHlwZTsKICAgICB9LAogCi0gICAgX2Rlc2NyaWJlOiBmdW5jdGlv bihvYmosIGFiYnJldmlhdGVkKQorICAgIF9kZXNjcmliZTogZnVuY3Rpb24ob2JqKQogICAgIHsK ICAgICAgICAgdmFyIHR5cGUgPSB0aGlzLl90eXBlKG9iaik7CiAKICAgICAgICAgc3dpdGNoICh0 eXBlKSB7CiAgICAgICAgIGNhc2UgIm9iamVjdCI6CisgICAgICAgICAgICAvLyBGYWxsIHRocm91 Z2guCiAgICAgICAgIGNhc2UgIm5vZGUiOgogICAgICAgICAgICAgdmFyIHJlc3VsdCA9IEluamVj dGVkU2NyaXB0SG9zdC5pbnRlcm5hbENvbnN0cnVjdG9yTmFtZShvYmopOwogICAgICAgICAgICAg aWYgKHJlc3VsdCA9PT0gIk9iamVjdCIpIHsKQEAgLTQyNCwxNCArNDI1LDkgQEAgSW5qZWN0ZWRT Y3JpcHQucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgIGNsYXNzTmFtZSArPSAiWyIgKyBv YmoubGVuZ3RoICsgIl0iOwogICAgICAgICAgICAgcmV0dXJuIGNsYXNzTmFtZTsKICAgICAgICAg Y2FzZSAic3RyaW5nIjoKLSAgICAgICAgICAgIGlmIChhYmJyZXZpYXRlZCAmJiBvYmoubGVuZ3Ro ID4gMTAwKQotICAgICAgICAgICAgICAgIHJldHVybiBvYmouc3Vic3RyaW5nKDAsIDEwMCkgKyAi XHUyMDI2IjsKICAgICAgICAgICAgIHJldHVybiBvYmo7CiAgICAgICAgIGNhc2UgImZ1bmN0aW9u IjoKLSAgICAgICAgICAgIHZhciBvYmplY3RUZXh0ID0gdGhpcy5fdG9TdHJpbmcob2JqKTsKLSAg ICAgICAgICAgIGlmIChhYmJyZXZpYXRlZCkKLSAgICAgICAgICAgICAgICBvYmplY3RUZXh0ID0g Ly4qLy5leGVjKG9iamVjdFRleHQpWzBdLnJlcGxhY2UoLyArJC9nLCAiIik7Ci0gICAgICAgICAg ICByZXR1cm4gb2JqZWN0VGV4dDsKKyAgICAgICAgICAgIC8vIEZhbGwgdGhyb3VnaC4KICAgICAg ICAgZGVmYXVsdDoKICAgICAgICAgICAgIHJldHVybiB0aGlzLl90b1N0cmluZyhvYmopOwogICAg ICAgICB9CkBAIC00NjEsMTQgKzQ1NywxNCBAQCBJbmplY3RlZFNjcmlwdC5SZW1vdGVPYmplY3Qu ZnJvbUV4Y2VwdGlvbiA9IGZ1bmN0aW9uKGUpCiAgICAgcmV0dXJuIG5ldyBJbmplY3RlZFNjcmlw dC5SZW1vdGVPYmplY3QobnVsbCwgImVycm9yIiwgZS50b1N0cmluZygpKTsKIH0KIAotSW5qZWN0 ZWRTY3JpcHQuUmVtb3RlT2JqZWN0LmZyb21PYmplY3QgPSBmdW5jdGlvbihvYmplY3QsIG9iamVj dElkLCBhYmJyZXZpYXRlKQorSW5qZWN0ZWRTY3JpcHQuUmVtb3RlT2JqZWN0LmZyb21PYmplY3Qg PSBmdW5jdGlvbihvYmplY3QsIG9iamVjdElkKQogewogICAgIHZhciB0eXBlID0gaW5qZWN0ZWRT Y3JpcHQuX3R5cGUob2JqZWN0KTsKICAgICB2YXIgcmF3VHlwZSA9IHR5cGVvZiBvYmplY3Q7CiAg ICAgdmFyIGhhc0NoaWxkcmVuID0gKHJhd1R5cGUgPT09ICJvYmplY3QiICYmIG9iamVjdCAhPT0g bnVsbCAmJiAoISFPYmplY3QuZ2V0T3duUHJvcGVydHlOYW1lcyhvYmplY3QpLmxlbmd0aCB8fCAh IW9iamVjdC5fX3Byb3RvX18pKSB8fCByYXdUeXBlID09PSAiZnVuY3Rpb24iOwogICAgIHZhciBk ZXNjcmlwdGlvbiA9ICIiOwogICAgIHRyeSB7Ci0gICAgICAgIHZhciBkZXNjcmlwdGlvbiA9IGlu amVjdGVkU2NyaXB0Ll9kZXNjcmliZShvYmplY3QsIGFiYnJldmlhdGUpOworICAgICAgICB2YXIg ZGVzY3JpcHRpb24gPSBpbmplY3RlZFNjcmlwdC5fZGVzY3JpYmUob2JqZWN0KTsKICAgICAgICAg cmV0dXJuIG5ldyBJbmplY3RlZFNjcmlwdC5SZW1vdGVPYmplY3Qob2JqZWN0SWQsIHR5cGUsIGRl c2NyaXB0aW9uLCBoYXNDaGlsZHJlbik7CiAgICAgfSBjYXRjaCAoZSkgewogICAgICAgICByZXR1 cm4gSW5qZWN0ZWRTY3JpcHQuUmVtb3RlT2JqZWN0LmZyb21FeGNlcHRpb24oZSk7CkBAIC01MDEs MTMgKzQ5NywxMyBAQCBJbmplY3RlZFNjcmlwdC5DYWxsRnJhbWVQcm94eS5wcm90b3R5cGUgPSB7 CiAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgc2NvcGVDaGFpbi5sZW5ndGg7IGkrKykgewog ICAgICAgICAgICAgdmFyIHNjb3BlVHlwZSA9IGNhbGxGcmFtZS5zY29wZVR5cGUoaSk7CiAgICAg ICAgICAgICB2YXIgc2NvcGVPYmplY3QgPSBzY29wZUNoYWluW2ldOwotICAgICAgICAgICAgdmFy IHNjb3BlT2JqZWN0UHJveHkgPSBpbmplY3RlZFNjcmlwdC5fd3JhcE9iamVjdChzY29wZU9iamVj dCwgImJhY2t0cmFjZSIsIHRydWUpOworICAgICAgICAgICAgdmFyIHNjb3BlT2JqZWN0UHJveHkg PSBpbmplY3RlZFNjcmlwdC5fd3JhcE9iamVjdChzY29wZU9iamVjdCwgImJhY2t0cmFjZSIpOwog CiAgICAgICAgICAgICBzd2l0Y2goc2NvcGVUeXBlKSB7CiAgICAgICAgICAgICAgICAgY2FzZSBM T0NBTF9TQ09QRTogewogICAgICAgICAgICAgICAgICAgICBmb3VuZExvY2FsU2NvcGUgPSB0cnVl OwogICAgICAgICAgICAgICAgICAgICBzY29wZU9iamVjdFByb3h5LmlzTG9jYWwgPSB0cnVlOwot ICAgICAgICAgICAgICAgICAgICBzY29wZU9iamVjdFByb3h5LnRoaXNPYmplY3QgPSBpbmplY3Rl ZFNjcmlwdC5fd3JhcE9iamVjdChjYWxsRnJhbWUudGhpc09iamVjdCwgImJhY2t0cmFjZSIsIHRy dWUpOworICAgICAgICAgICAgICAgICAgICBzY29wZU9iamVjdFByb3h5LnRoaXNPYmplY3QgPSBp bmplY3RlZFNjcmlwdC5fd3JhcE9iamVjdChjYWxsRnJhbWUudGhpc09iamVjdCwgImJhY2t0cmFj ZSIpOwogICAgICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgICAgICB9CiAgICAg ICAgICAgICAgICAgY2FzZSBDTE9TVVJFX1NDT1BFOiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24gYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yLmpzb24KaW5kZXggZWQ1OTI5ZWEwMGQ2NGJjMzkwMDQ1MjlkOTY0OTMxMDdmMDZh NjUzMy4uOWViYTdkZjUyNTAxNjAzZDNjNDIwYWZjOWVkZmFiNzk1NDg2N2Y3MCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgpAQCAtMTYwLDcgKzE2MCw2IEBACiAgICAg ICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBbCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUi OiAib2JqZWN0SWQiLCAidHlwZSI6ICJzdHJpbmciIH0sCiAgICAgICAgICAgICAgICAgICAgIHsg Im5hbWUiOiAiaWdub3JlSGFzT3duUHJvcGVydHkiLCAidHlwZSI6ICJib29sZWFuIiB9LAotICAg ICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImFiYnJldmlhdGUiLCAidHlwZSI6ICJib29sZWFu IiB9CiAgICAgICAgICAgICAgICAgXSwKICAgICAgICAgICAgICAgICAicmV0dXJucyI6IFsKICAg ICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJyZXN1bHQiLCAidHlwZSI6ICJhcnJheSIsICJp dGVtcyI6IHsgIiRyZWYiIDogIlJ1bnRpbWVQcm9wZXJ0eSJ9IH0KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSdW50aW1lQWdlbnQuY3BwIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJ1bnRpbWVBZ2VudC5jcHAKaW5kZXggMDRmZWQ5ZGQy YWI1ZTgxYjllNDQ1YjhiZWUwNTY2NGZiZGQ1ZGJkZC4uYWVlY2IxZmE4NTY3ZjM3NWNlN2YyNzQ5 Y2QxOTNkOGQzN2EzYWJiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvclJ1bnRpbWVBZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvclJ1bnRpbWVBZ2VudC5jcHAKQEAgLTcyLDExICs3MiwxMSBAQCB2b2lkIEluc3BlY3Rv clJ1bnRpbWVBZ2VudDo6ZXZhbHVhdGVPbihFcnJvclN0cmluZyogZXJyb3JTdHJpbmcsIGNvbnN0 IFN0cmluZyYgbwogICAgICAgICBpbmplY3RlZFNjcmlwdC5ldmFsdWF0ZU9uKGVycm9yU3RyaW5n LCBvYmplY3RJZCwgZXhwcmVzc2lvbiwgcmVzdWx0KTsKIH0KIAotdm9pZCBJbnNwZWN0b3JSdW50 aW1lQWdlbnQ6OmdldFByb3BlcnRpZXMoRXJyb3JTdHJpbmcqIGVycm9yU3RyaW5nLCBjb25zdCBT dHJpbmcmIG9iamVjdElkLCBib29sIGlnbm9yZUhhc093blByb3BlcnR5LCBib29sIGFiYnJldmlh dGUsIFJlZlB0cjxJbnNwZWN0b3JBcnJheT4qIHJlc3VsdCkKK3ZvaWQgSW5zcGVjdG9yUnVudGlt ZUFnZW50OjpnZXRQcm9wZXJ0aWVzKEVycm9yU3RyaW5nKiBlcnJvclN0cmluZywgY29uc3QgU3Ry aW5nJiBvYmplY3RJZCwgYm9vbCBpZ25vcmVIYXNPd25Qcm9wZXJ0eSwgUmVmUHRyPEluc3BlY3Rv ckFycmF5PiogcmVzdWx0KQogewogICAgIEluamVjdGVkU2NyaXB0IGluamVjdGVkU2NyaXB0ID0g bV9pbmplY3RlZFNjcmlwdE1hbmFnZXItPmluamVjdGVkU2NyaXB0Rm9yT2JqZWN0SWQob2JqZWN0 SWQpOwogICAgIGlmICghaW5qZWN0ZWRTY3JpcHQuaGFzTm9WYWx1ZSgpKQotICAgICAgICBpbmpl Y3RlZFNjcmlwdC5nZXRQcm9wZXJ0aWVzKGVycm9yU3RyaW5nLCBvYmplY3RJZCwgaWdub3JlSGFz T3duUHJvcGVydHksIGFiYnJldmlhdGUsIHJlc3VsdCk7CisgICAgICAgIGluamVjdGVkU2NyaXB0 LmdldFByb3BlcnRpZXMoZXJyb3JTdHJpbmcsIG9iamVjdElkLCBpZ25vcmVIYXNPd25Qcm9wZXJ0 eSwgcmVzdWx0KTsKIH0KIAogdm9pZCBJbnNwZWN0b3JSdW50aW1lQWdlbnQ6OnNldFByb3BlcnR5 VmFsdWUoRXJyb3JTdHJpbmcqIGVycm9yU3RyaW5nLCBjb25zdCBTdHJpbmcmIG9iamVjdElkLCBj b25zdCBTdHJpbmcmIHByb3BlcnR5TmFtZSwgY29uc3QgU3RyaW5nJiBleHByZXNzaW9uKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJ1bnRpbWVBZ2VudC5o IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJ1bnRpbWVBZ2VudC5oCmluZGV4 IDQ4ZjM2NzA3MTdlNWUwOTBlOWM1NzI0MjIzOGFiMjY1ZmE5NzNkYzMuLjMyYmZjN2ExYjdlYmQ0 MWZmOGViZTM1ZGRhYmIzYjhmN2Q4ZjcyNGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JSdW50aW1lQWdlbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yUnVudGltZUFnZW50LmgKQEAgLTU2LDcgKzU2LDcgQEAgcHVibGljOgog ICAgIHZvaWQgZXZhbHVhdGUoRXJyb3JTdHJpbmcqLCBjb25zdCBTdHJpbmcmIGV4cHJlc3Npb24s IGNvbnN0IFN0cmluZyYgb2JqZWN0R3JvdXAsIGJvb2wgaW5jbHVkZUNvbW1hbmRMaW5lQVBJLCBS ZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiogcmVzdWx0KTsKICAgICB2b2lkIGV2YWx1YXRlT24oRXJy b3JTdHJpbmcqLCBjb25zdCBTdHJpbmcmIG9iamVjdElkLCBjb25zdCBTdHJpbmcmIGV4cHJlc3Np b24sIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+KiByZXN1bHQpOwogICAgIHZvaWQgcmVsZWFzZU9i amVjdChFcnJvclN0cmluZyosIGNvbnN0IFN0cmluZyYgb2JqZWN0SWQpOwotICAgIHZvaWQgZ2V0 UHJvcGVydGllcyhFcnJvclN0cmluZyosIGNvbnN0IFN0cmluZyYgb2JqZWN0SWQsIGJvb2wgaWdu b3JlSGFzT3duUHJvcGVydHksIGJvb2wgYWJicmV2aWF0ZSwgUmVmUHRyPEluc3BlY3RvckFycmF5 PiogcmVzdWx0KTsKKyAgICB2b2lkIGdldFByb3BlcnRpZXMoRXJyb3JTdHJpbmcqLCBjb25zdCBT dHJpbmcmIG9iamVjdElkLCBib29sIGlnbm9yZUhhc093blByb3BlcnR5LCBSZWZQdHI8SW5zcGVj dG9yQXJyYXk+KiByZXN1bHQpOwogICAgIHZvaWQgc2V0UHJvcGVydHlWYWx1ZShFcnJvclN0cmlu ZyosIGNvbnN0IFN0cmluZyYgb2JqZWN0SWQsIGNvbnN0IFN0cmluZyYgcHJvcGVydHlOYW1lLCBj b25zdCBTdHJpbmcmIGV4cHJlc3Npb24pOwogICAgIHZvaWQgcmVsZWFzZU9iamVjdEdyb3VwKEVy cm9yU3RyaW5nKiwgY29uc3QgU3RyaW5nJiBvYmplY3RHcm91cCk7CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanMgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzCmluZGV4IGYzZTM0MjU0 ZWVmMGZlMzIyNWQ1MDI5NjAxOWExZjEzZDdhYzQxNjAuLjk2Y2E1NTQ5YzJhYmQ0NDEyODQyOWVi ZTZiNDMzZTFjMWQ5MmViZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvQ29uc29sZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9Db25zb2xlVmlldy5qcwpAQCAtMzYyLDcgKzM2Miw3IEBAIFdlYkluc3BlY3Rvci5D b25zb2xlVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgIHsKICAgICAgICAgICAgIGlmICghcmVz dWx0KQogICAgICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgICAgIHJlc3VsdC5nZXRQcm9w ZXJ0aWVzKHRydWUsIGZhbHNlLCBldmFsdWF0ZWRQcm9wZXJ0aWVzLmJpbmQodGhpcykpOworICAg ICAgICAgICAgcmVzdWx0LmdldEFsbFByb3BlcnRpZXMoZXZhbHVhdGVkUHJvcGVydGllcy5iaW5k KHRoaXMpKTsKICAgICAgICAgfQogCiAgICAgICAgIGZ1bmN0aW9uIGV2YWx1YXRlZFByb3BlcnRp ZXMocHJvcGVydGllcykKQEAgLTYyMyw3ICs2MjMsNyBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZVZp ZXcucHJvdG90eXBlID0gewogCiAgICAgX2Zvcm1hdGFycmF5OiBmdW5jdGlvbihhcnIsIGVsZW0p CiAgICAgewotICAgICAgICBhcnIuZ2V0T3duUHJvcGVydGllcyhmYWxzZSwgdGhpcy5fcHJpbnRB cnJheS5iaW5kKHRoaXMsIGVsZW0pKTsKKyAgICAgICAgYXJyLmdldE93blByb3BlcnRpZXModGhp cy5fcHJpbnRBcnJheS5iaW5kKHRoaXMsIGVsZW0pKTsKICAgICB9LAogCiAgICAgX2Zvcm1hdHN0 cmluZzogZnVuY3Rpb24ob3V0cHV0LCBlbGVtKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9PYmplY3RQcm9wZXJ0aWVzU2VjdGlvbi5qcyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvT2JqZWN0UHJvcGVydGllc1NlY3Rpb24uanMKaW5k ZXggMTc5NTg0M2U4ZjhmYjgyNzQ5MDJjZTUxYThlMGFhMGViNzQ3NjBjOC4uYjQyYmVhMzk4NjI3 ZWIzMjI4NGI4MzI0ZWNlNDRlYjk5ZWYzZWNiYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9PYmplY3RQcm9wZXJ0aWVzU2VjdGlvbi5qcworKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL09iamVjdFByb3BlcnRpZXNTZWN0aW9uLmpz CkBAIC00NSwxMiArNDUsMTYgQEAgV2ViSW5zcGVjdG9yLk9iamVjdFByb3BlcnRpZXNTZWN0aW9u LnByb3RvdHlwZSA9IHsKICAgICB1cGRhdGU6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIHZh ciBzZWxmID0gdGhpczsKLSAgICAgICAgdmFyIGNhbGxiYWNrID0gZnVuY3Rpb24ocHJvcGVydGll cykgeworICAgICAgICBmdW5jdGlvbiBjYWxsYmFjayhwcm9wZXJ0aWVzKQorICAgICAgICB7CiAg ICAgICAgICAgICBpZiAoIXByb3BlcnRpZXMpCiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAg ICAgICAgICAgc2VsZi51cGRhdGVQcm9wZXJ0aWVzKHByb3BlcnRpZXMpOwotICAgICAgICB9Owot ICAgICAgICB0aGlzLm9iamVjdC5nZXRQcm9wZXJ0aWVzKHRoaXMuaWdub3JlSGFzT3duUHJvcGVy dHksIHRydWUsIGNhbGxiYWNrKTsKKyAgICAgICAgfQorICAgICAgICBpZiAodGhpcy5pZ25vcmVI YXNPd25Qcm9wZXJ0eSkKKyAgICAgICAgICAgIHRoaXMub2JqZWN0LmdldEFsbFByb3BlcnRpZXMo Y2FsbGJhY2spOworICAgICAgICBlbHNlCisgICAgICAgICAgICB0aGlzLm9iamVjdC5nZXRPd25Q cm9wZXJ0aWVzKGNhbGxiYWNrKTsKICAgICB9LAogCiAgICAgdXBkYXRlUHJvcGVydGllczogZnVu Y3Rpb24ocHJvcGVydGllcywgcm9vdFRyZWVFbGVtZW50Q29uc3RydWN0b3IsIHJvb3RQcm9wZXJ0 eUNvbXBhcmVyKQpAQCAtMTU1LDcgKzE1OSw3IEBAIFdlYkluc3BlY3Rvci5PYmplY3RQcm9wZXJ0 eVRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICB0aGlzLmFwcGVuZENo aWxkKG5ldyB0aGlzLnRyZWVPdXRsaW5lLnNlY3Rpb24udHJlZUVsZW1lbnRDb25zdHJ1Y3Rvcihw cm9wZXJ0aWVzW2ldKSk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH07Ci0gICAgICAgIHRoaXMu cHJvcGVydHkudmFsdWUuZ2V0T3duUHJvcGVydGllcyh0cnVlLCBjYWxsYmFjay5iaW5kKHRoaXMp KTsKKyAgICAgICAgdGhpcy5wcm9wZXJ0eS52YWx1ZS5nZXRPd25Qcm9wZXJ0aWVzKGNhbGxiYWNr LmJpbmQodGhpcykpOwogICAgIH0sCiAKICAgICBvbmRibGNsaWNrOiBmdW5jdGlvbihldmVudCkK QEAgLTE4Myw5ICsxODcsMTQgQEAgV2ViSW5zcGVjdG9yLk9iamVjdFByb3BlcnR5VHJlZUVsZW1l bnQucHJvdG90eXBlID0gewogCiAgICAgICAgIHZhciBkZXNjcmlwdGlvbiA9IHRoaXMucHJvcGVy dHkudmFsdWUuZGVzY3JpcHRpb247CiAgICAgICAgIC8vIFJlbmRlciBcbiBhcyBhIG5pY2UgdW5p Y29kZSBjciBzeW1ib2wuCi0gICAgICAgIGlmICh0aGlzLnByb3BlcnR5LnZhbHVlLnR5cGUgPT09 ICJzdHJpbmciICYmIHR5cGVvZiBkZXNjcmlwdGlvbiA9PT0gInN0cmluZyIpCi0gICAgICAgICAg ICBkZXNjcmlwdGlvbiA9ICJcIiIgKyBkZXNjcmlwdGlvbi5yZXBsYWNlKC9cbi9nLCAiXHUyMUI1 IikgKyAiXCIiOwotICAgICAgICB0aGlzLnZhbHVlRWxlbWVudC50ZXh0Q29udGVudCA9IGRlc2Ny aXB0aW9uOworICAgICAgICBpZiAodGhpcy5wcm9wZXJ0eS52YWx1ZS50eXBlID09PSAic3RyaW5n IiAmJiB0eXBlb2YgZGVzY3JpcHRpb24gPT09ICJzdHJpbmciKSB7CisgICAgICAgICAgICB0aGlz LnZhbHVlRWxlbWVudC50ZXh0Q29udGVudCA9ICJcIiIgKyBkZXNjcmlwdGlvbi5yZXBsYWNlKC9c bi9nLCAiXHUyMUI1IikgKyAiXCIiOworICAgICAgICAgICAgdGhpcy52YWx1ZUVsZW1lbnQuX29y aWdpbmFsVGV4dENvbnRlbnQgPSAiXCIiICsgZGVzY3JpcHRpb24gKyAiXCIiOworICAgICAgICB9 IGVsc2UgaWYgKHRoaXMucHJvcGVydHkudmFsdWUudHlwZSA9PT0gImZ1bmN0aW9uIiAmJiB0eXBl b2YgZGVzY3JpcHRpb24gPT09ICJzdHJpbmciKSB7CisgICAgICAgICAgICB0aGlzLnZhbHVlRWxl bWVudC50ZXh0Q29udGVudCA9IC8uKi8uZXhlYyhkZXNjcmlwdGlvbilbMF0ucmVwbGFjZSgvICsk L2csICIiKTsKKyAgICAgICAgICAgIHRoaXMudmFsdWVFbGVtZW50Ll9vcmlnaW5hbFRleHRDb250 ZW50ID0gZGVzY3JpcHRpb247CisgICAgICAgIH0gZWxzZQorICAgICAgICAgICAgdGhpcy52YWx1 ZUVsZW1lbnQudGV4dENvbnRlbnQgPSBkZXNjcmlwdGlvbjsKIAogICAgICAgICBpZiAodGhpcy5w cm9wZXJ0eS5pc0dldHRlcikKICAgICAgICAgICAgIHRoaXMudmFsdWVFbGVtZW50LmFkZFN0eWxl Q2xhc3MoImRpbW1lZCIpOwpAQCAtMjQzLDYgKzI1MiwxMCBAQCBXZWJJbnNwZWN0b3IuT2JqZWN0 UHJvcGVydHlUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgdGhpcy5saXN0SXRl bUVsZW1lbnQuYWRkU3R5bGVDbGFzcygiZWRpdGluZy1zdWItcGFydCIpOwogCisgICAgICAgIC8v IEVkaXQgb3JpZ2luYWwgc291cmNlLgorICAgICAgICBpZiAodHlwZW9mIHRoaXMudmFsdWVFbGVt ZW50Ll9vcmlnaW5hbFRleHRDb250ZW50ID09PSAic3RyaW5nIikKKyAgICAgICAgICAgIHRoaXMu dmFsdWVFbGVtZW50LnRleHRDb250ZW50ID0gdGhpcy52YWx1ZUVsZW1lbnQuX29yaWdpbmFsVGV4 dENvbnRlbnQ7CisKICAgICAgICAgV2ViSW5zcGVjdG9yLnN0YXJ0RWRpdGluZyh0aGlzLnZhbHVl RWxlbWVudCwgewogICAgICAgICAgICAgY29udGV4dDogY29udGV4dCwKICAgICAgICAgICAgIGNv bW1pdEhhbmRsZXI6IHRoaXMuZWRpdGluZ0NvbW1pdHRlZC5iaW5kKHRoaXMpLApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9wZXJ0aWVzU2lkZWJhclBh bmUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Byb3BlcnRpZXNTaWRl YmFyUGFuZS5qcwppbmRleCA0ZGYzMTNjZmRmY2M1YTg2NmE0YzkzNTYzMTkxMGExNGIyM2I0Nzhi Li5lNmNlMGIyNmZlMTU3ZGVhZjE1MzQ4Y2NkNzQ1YzM0ODVlNjZlYjkxIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Byb3BlcnRpZXNTaWRlYmFyUGFuZS5q cworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Byb3BlcnRpZXNTaWRl YmFyUGFuZS5qcwpAQCAtNTcsNyArNTcsNyBAQCBXZWJJbnNwZWN0b3IuUHJvcGVydGllc1NpZGVi YXJQYW5lLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIGlmIChlcnJvciB8fCAhb2JqZWN0UGF5 bG9hZCkKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB2YXIgb2JqZWN0ID0g V2ViSW5zcGVjdG9yLlJlbW90ZU9iamVjdC5mcm9tUGF5bG9hZChvYmplY3RQYXlsb2FkKTsKLSAg ICAgICAgICAgIG9iamVjdC5nZXRPd25Qcm9wZXJ0aWVzKGZhbHNlLCBmaWxsU2VjdGlvbi5iaW5k KHRoaXMpKTsKKyAgICAgICAgICAgIG9iamVjdC5nZXRPd25Qcm9wZXJ0aWVzKGZpbGxTZWN0aW9u LmJpbmQodGhpcykpOwogICAgICAgICB9CiAKICAgICAgICAgZnVuY3Rpb24gZmlsbFNlY3Rpb24o cHJvdG90eXBlcykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvUmVtb3RlT2JqZWN0LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9S ZW1vdGVPYmplY3QuanMKaW5kZXggMjk0YmU1MDg3NWI1MzQ5YjUzMDgxZWI4MWI4ZmUzYTVmOGEz YmM2ZS4uYjYwMzhjYTdhOTU5NWE3ZjNiNmJmODhlNmZjMjM3N2U2MzI3M2M4MSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZW1vdGVPYmplY3QuanMKKysr IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZW1vdGVPYmplY3QuanMKQEAg LTEwNywxMiArMTA3LDE3IEBAIFdlYkluc3BlY3Rvci5SZW1vdGVPYmplY3QucHJvdG90eXBlID0g ewogICAgICAgICByZXR1cm4gdGhpcy5fdHlwZSA9PT0gImVycm9yIjsKICAgICB9LAogCi0gICAg Z2V0T3duUHJvcGVydGllczogZnVuY3Rpb24oYWJicmV2aWF0ZSwgY2FsbGJhY2spCisgICAgZ2V0 T3duUHJvcGVydGllczogZnVuY3Rpb24oY2FsbGJhY2spCiAgICAgewotICAgICAgICB0aGlzLmdl dFByb3BlcnRpZXMoZmFsc2UsIGFiYnJldmlhdGUsIGNhbGxiYWNrKTsKKyAgICAgICAgdGhpcy5f Z2V0UHJvcGVydGllcyhmYWxzZSwgY2FsbGJhY2spOwogICAgIH0sCiAKLSAgICBnZXRQcm9wZXJ0 aWVzOiBmdW5jdGlvbihpZ25vcmVIYXNPd25Qcm9wZXJ0eSwgYWJicmV2aWF0ZSwgY2FsbGJhY2sp CisgICAgZ2V0QWxsUHJvcGVydGllczogZnVuY3Rpb24oY2FsbGJhY2spCisgICAgeworICAgICAg ICB0aGlzLl9nZXRQcm9wZXJ0aWVzKHRydWUsIGNhbGxiYWNrKTsKKyAgICB9LAorCisgICAgX2dl dFByb3BlcnRpZXM6IGZ1bmN0aW9uKGlnbm9yZUhhc093blByb3BlcnR5LCBjYWxsYmFjaykKICAg ICB7CiAgICAgICAgIGlmICghdGhpcy5fb2JqZWN0SWQpIHsKICAgICAgICAgICAgIGNhbGxiYWNr KFtdKTsKQEAgLTEyNiw3ICsxMzEsNyBAQCBXZWJJbnNwZWN0b3IuUmVtb3RlT2JqZWN0LnByb3Rv dHlwZSA9IHsKICAgICAgICAgICAgICAgICBwcm9wZXJ0aWVzW2ldLnZhbHVlID0gV2ViSW5zcGVj dG9yLlJlbW90ZU9iamVjdC5mcm9tUGF5bG9hZChwcm9wZXJ0aWVzW2ldLnZhbHVlKTsKICAgICAg ICAgICAgIGNhbGxiYWNrKHByb3BlcnRpZXMpOwogICAgICAgICB9Ci0gICAgICAgIFJ1bnRpbWVB Z2VudC5nZXRQcm9wZXJ0aWVzKHRoaXMuX29iamVjdElkLCAhIWlnbm9yZUhhc093blByb3BlcnR5 LCBhYmJyZXZpYXRlLCByZW1vdGVPYmplY3RCaW5kZXIpOworICAgICAgICBSdW50aW1lQWdlbnQu Z2V0UHJvcGVydGllcyh0aGlzLl9vYmplY3RJZCwgISFpZ25vcmVIYXNPd25Qcm9wZXJ0eSwgcmVt b3RlT2JqZWN0QmluZGVyKTsKICAgICB9LAogCiAgICAgc2V0UHJvcGVydHlWYWx1ZTogZnVuY3Rp b24obmFtZSwgdmFsdWUsIGNhbGxiYWNrKQpAQCAtMjM3LDEyICsyNDIsMTIgQEAgV2ViSW5zcGVj dG9yLkxvY2FsSlNPTk9iamVjdC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiB0eXBlb2Yg dGhpcy5fdmFsdWUgPT09ICJvYmplY3QiICYmIHRoaXMuX3ZhbHVlICE9PSBudWxsICYmIE9iamVj dC5rZXlzKHRoaXMuX3ZhbHVlKS5sZW5ndGg7CiAgICAgfSwKIAotICAgIGdldE93blByb3BlcnRp ZXM6IGZ1bmN0aW9uKGFiYnJldmlhdGUsIGNhbGxiYWNrKQorICAgIGdldE93blByb3BlcnRpZXM6 IGZ1bmN0aW9uKGNhbGxiYWNrKQogICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuZ2V0UHJvcGVy dGllcyhmYWxzZSwgYWJicmV2aWF0ZSwgY2FsbGJhY2spOworICAgICAgICBjYWxsYmFjayh0aGlz Ll9jaGlsZHJlbigpKTsKICAgICB9LAogCi0gICAgZ2V0UHJvcGVydGllczogZnVuY3Rpb24oaWdu b3JlSGFzT3duUHJvcGVydHksIGFiYnJldmlhdGUsIGNhbGxiYWNrKQorICAgIGdldEFsbFByb3Bl cnRpZXM6IGZ1bmN0aW9uKGNhbGxiYWNrKQogICAgIHsKICAgICAgICAgY2FsbGJhY2sodGhpcy5f Y2hpbGRyZW4oKSk7CiAgICAgfSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvaW5zcGVjdG9yLmNzcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvaW5zcGVjdG9yLmNzcwppbmRleCAwMzExZjIyNzMxMzBhNzRiMzI3NmE0OWU5YmRmZmYz MDE3ZjIzODZmLi5hNjg1NGVkYzU5ODY3YTFhYTgzOTQ4MjAyZDg5YzEzY2M0YzU4MDI1IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5jc3MK KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuY3NzCkBA IC04NzIsNyArODcyLDcgQEAgYm9keS5wbGF0Zm9ybS1saW51eCAubW9ub3NwYWNlLCBib2R5LnBs YXRmb3JtLWxpbnV4IC5zb3VyY2UtY29kZSB7CiAKIC5jb25zb2xlLWZvcm1hdHRlZC1zdHJpbmcs IC5jb25zb2xlLWZvcm1hdHRlZC1yZWdleHAgewogICAgIGNvbG9yOiByZ2IoMTk2LCAyNiwgMjIp OwotICAgIHdoaXRlLXNwYWNlOiBwcmUtd3JhcDsKKyAgICB3aGl0ZS1zcGFjZTogcHJlOwogfQog CiAuY29uc29sZS1mb3JtYXR0ZWQtbnVsbCwgLmNvbnNvbGUtZm9ybWF0dGVkLXVuZGVmaW5lZCB7 Cg==