117669 2013-06-14 18:33:47 -0700 Web Inspector: Copying array or object output does not contain values 2013-06-19 10:30:23 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 graouts graouts commit-queue graouts joepeck timothy webkit-bug-importer oldest_to_newest 900723 0 graouts 2013-06-14 18:33:47 -0700 Copying a result which was an array produces "< Array [size]" instead of the values, which is what I really wanted. * STEPS TO REPRODUCE 1. js> ["one","two"] 2. Copy the resulting output row 3. Paste it somewhere => "< Array[2]" instead of the values "one" and "two" 900724 1 graouts 2013-06-14 18:34:05 -0700 <rdar://problem/13439854> 900725 2 204753 graouts 2013-06-14 18:38:22 -0700 Created attachment 204753 Patch 900730 3 204753 timothy 2013-06-14 19:02:39 -0700 Comment on attachment 204753 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=204753&action=review > Source/WebInspectorUI/UserInterface/ConsoleCommandResult.js:50 > + get clipboarPrefixString () Typo. > Source/WebInspectorUI/UserInterface/ConsoleMessageImpl.js:659 > + get clipboarPrefixString () Typo. > Source/WebInspectorUI/UserInterface/LogContentView.js:267 > + var usePrefix = messages.length > 1; I explicitly removed this logic before. I think the prefix is always useful for row selection and Commad-S. We now support text range selection if you don't want the prefix. 900731 4 graouts 2013-06-14 19:08:53 -0700 (In reply to comment #3) > (From update of attachment 204753 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=204753&action=review > > > Source/WebInspectorUI/UserInterface/ConsoleCommandResult.js:50 > > + get clipboarPrefixString () > > Typo. > > > Source/WebInspectorUI/UserInterface/ConsoleMessageImpl.js:659 > > + get clipboarPrefixString () > > Typo. Heh, at least it's consistent. > > Source/WebInspectorUI/UserInterface/LogContentView.js:267 > > + var usePrefix = messages.length > 1; > > I explicitly removed this logic before. I think the prefix is always useful for row selection and Commad-S. We now support text range selection if you don't want the prefix. Maybe we should only drop the prefix for a single command result or prompt. I remember Joe was annoyed by it. 900732 5 204753 timothy 2013-06-14 19:11:27 -0700 Comment on attachment 204753 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=204753&action=review >>> Source/WebInspectorUI/UserInterface/LogContentView.js:267 >>> + var usePrefix = messages.length > 1; >> >> I explicitly removed this logic before. I think the prefix is always useful for row selection and Commad-S. We now support text range selection if you don't want the prefix. > > Maybe we should only drop the prefix for a single command result or prompt. I remember Joe was annoyed by it. That would be fine for copy, but Command-S should always include all prefixes. 901773 6 graouts 2013-06-19 06:34:14 -0700 (In reply to comment #5) > (From update of attachment 204753 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=204753&action=review > > >>> Source/WebInspectorUI/UserInterface/LogContentView.js:267 > >>> + var usePrefix = messages.length > 1; > >> > >> I explicitly removed this logic before. I think the prefix is always useful for row selection and Commad-S. We now support text range selection if you don't want the prefix. > > > > Maybe we should only drop the prefix for a single command result or prompt. I remember Joe was annoyed by it. > > That would be fine for copy, but Command-S should always include all prefixes. Actually, upon further testing, the patch, as-is, does the right thing when saving the Console log via Cmd+S: all prefixes show up in the log. Could you re-review taking this into account? 901789 7 205004 graouts 2013-06-19 07:23:29 -0700 Created attachment 205004 Patch 901790 8 205004 timothy 2013-06-19 07:25:45 -0700 Comment on attachment 205004 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=205004&action=review > Source/WebInspectorUI/UserInterface/ConsoleCommandResult.js:37 > + this.enforcesClipboardPrefixString = false; This could go on the prototype. > Source/WebInspectorUI/UserInterface/ConsoleMessageImpl.js:41 > + this.enforcesClipboardPrefixString = true; Ditto. 901814 9 205010 graouts 2013-06-19 09:34:11 -0700 Created attachment 205010 Patch for landing 901838 10 205010 commit-queue 2013-06-19 10:30:21 -0700 Comment on attachment 205010 Patch for landing Clearing flags on attachment: 205010 Committed r151738: <http://trac.webkit.org/changeset/151738> 901839 11 commit-queue 2013-06-19 10:30:23 -0700 All reviewed patches have been landed. Closing bug. 204753 2013-06-14 18:38:22 -0700 2013-06-19 07:23:20 -0700 Patch bug-117669-20130614213639.patch text/plain 5679 graouts U3VidmVyc2lvbiBSZXZpc2lvbjogMTUxNTk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBj MzZlOWQ1ZWI1Nzg1MGFhYTZmMzFlYzJhYjUzYjQxYTQxODkwYTYzLi42NDhlYzBlZjhiYTA3NTM4 YzU4YjJkMzhjNDZkNTM1ZWM3YWQwNjVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzOCBAQAorMjAxMy0wNi0xNCAgQW50b2luZSBRdWludCAgPGdyYW91dHNAYXBwbGUuY29t PgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IENvcHlpbmcgYXJyYXkgb3Igb2JqZWN0IG91dHB1 dCBkb2VzIG5vdCBjb250YWluIHZhbHVlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTE3NjY5CisKKyAgICAgICAgQ29uc29sZUNvbW1hbmRSZXN1bHQg d2FzIG92ZXJyaWRpbmcgdG9DbGlwYm9hcmRTdHJpbmcoKSBidXQgd2Fzbid0IHVzaW5nIHRoZSBj b21wbGV4IGNvZGUKKyAgICAgICAgaW4gQ29uc29sZU1lc3NhZ2VJbXBsJ3MgdG9DbGlwYm9hcmRT dHJpbmcoKSB0byBwcm92aWRlIGEgbmljZWx5IGZvcm1hdHRlZCBvdXRwdXQgZm9yIG9iamVjdHMu CisgICAgICAgIFdlIG5vdyB1c2UgYSAiY2xpcGJvYXJQcmVmaXhTdHJpbmciIHByb3BlcnR5IHRv IGN1c3RvbWl6ZSB0aGUgcHJlZml4IHVzZWQgaW4gdGhlIGNsaXBib2FyZAorICAgICAgICBhbmQs IGFkZGl0aW9uYWxseSwgb25seSB1c2UgdGhhdCBwcmVmaXggaWYgd2UncmUgY29weWluZyBtb3Jl IHRoYW4gYSBzaW5nbGUgbWVzc2FnZSBzaW5jZSBpdCdzCisgICAgICAgIHRoZSBvbmx5IHNpdHVh dGlvbiB3aGVyZSBpdCdzIHVzZWZ1bCB0byBoYXZlIHRoZSAiPiIsICI8IiBvciBsb2cgbGV2ZWwg cHJlZml4IHNob3duLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogVXNlckludGVyZmFjZS9Db25zb2xlQ29tbWFuZC5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5Db25zb2xlQ29tbWFuZC5wcm90b3R5cGUudG9DbGlwYm9hcmRTdHJpbmcpOgorICAg ICAgICBIYW5kbGUgdGhlIG5ldyB1c2VQcmVmaXggYXJndW1lbnQuCisKKyAgICAgICAgKiBVc2Vy SW50ZXJmYWNlL0NvbnNvbGVDb21tYW5kUmVzdWx0LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkNvbnNvbGVDb21tYW5kUmVzdWx0LnByb3RvdHlwZS5nZXQgY2xpcGJvYXJQcmVmaXhTdHJpbmcp OgorICAgICAgICBSZW1vdmUgdGhlIGN1c3RvbSB0b0NsaXBib2FyZFN0cmluZygpIGltcGxlbWVu dGF0aW9uLCB3aGljaCB3b3VsZCBwcmV2ZW50CisgICAgICAgIHRoZSBjdXN0b20gb2JqZWN0IGxv Z2dpbmcgZnJvbSB3b3JraW5nLCBhbmQgaW5zdGVhZCBwcm92aWRlIGEgY3VzdG9tCisgICAgICAg ICJjbGlwYm9hclByZWZpeFN0cmluZyIgdmFsdWUuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNl L0NvbnNvbGVNZXNzYWdlSW1wbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlTWVz c2FnZUltcGwucHJvdG90eXBlLmdldCBjbGlwYm9hclByZWZpeFN0cmluZyk6CisgICAgICAgIE5l dyBwcm9wZXJ0eSB1c2VkIGJ5IHRvQ2xpcGJvYXJkU3RyaW5nKCkgdG8gcHJlZml4IGNsaXBib2Fy ZCBtZXNzYWdlcworICAgICAgICB3aGVuIG5lY2Vzc2FyeS4KKworICAgICAgICAoV2ViSW5zcGVj dG9yLkNvbnNvbGVNZXNzYWdlSW1wbC5wcm90b3R5cGUudG9DbGlwYm9hcmRTdHJpbmcpOgorICAg ICAgICBIYW5kbGUgdGhlIG5ldyB1c2VQcmVmaXggYXJndW1lbnQuCisKKyAgICAgICAgKiBVc2Vy SW50ZXJmYWNlL0xvZ0NvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkxvZ0Nv bnRlbnRWaWV3LnByb3RvdHlwZS5fZm9ybWF0TWVzc2FnZXNBc0RhdGEpOgorICAgICAgICBPbmx5 IHVzZSBwcmVmaXhlcyBpZiB3ZSdyZSBjb3B5aW5nIG1vcmUgdGhhbiBvbmUgbWVzc2FnZSB0byB0 aGUgY29uc29sZS4KKwogMjAxMy0wNi0xMyAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBw bGUuY29tPgogCiAgICAgICAgIDxodHRwOi8vd2Via2l0Lm9yZy9iLzExNzYxNT4gV2ViIEluc3Bl Y3RvcjogSlMgUHJldHR5UHJpbnRpbmcgU2hvdWxkIGhhdmUgc3BhY2UgYmV0d2VlbiAiZG8iIGFu ZCAieyIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Nv bnNvbGVDb21tYW5kLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29u c29sZUNvbW1hbmQuanMKaW5kZXggMjU0ZTIyOGUwOGIwM2M0YjFmZTM2MjFkYmRhNGFlYmRhODEx NGQyZS4uMGU3NjdiYmM1MTVjYzE5OGFhNzIwZDJkNGRmYzQzMjlmODM3NjNjZiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29uc29sZUNvbW1hbmQuanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29uc29sZUNvbW1hbmQu anMKQEAgLTg5LDkgKzg5LDkgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVDb21tYW5kLnByb3RvdHlw ZSA9IHsKICAgICAgICAgdGhpcy5fZm9ybWF0dGVkQ29tbWFuZC50ZXh0Q29udGVudCA9IHRoaXMu Y29tbWFuZDsKICAgICB9LAogICAgIAotICAgIHRvQ2xpcGJvYXJkU3RyaW5nOiBmdW5jdGlvbigp CisgICAgdG9DbGlwYm9hcmRTdHJpbmc6IGZ1bmN0aW9uKHVzZVByZWZpeCkKICAgICB7Ci0gICAg ICAgIHJldHVybiAiPiAiICsgdGhpcy5jb21tYW5kOworICAgICAgICByZXR1cm4gKHVzZVByZWZp eCA/ICI+ICIgOiAiIikgKyB0aGlzLmNvbW1hbmQ7CiAgICAgfQogfTsKIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29uc29sZUNvbW1hbmRSZXN1bHQu anMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db25zb2xlQ29tbWFuZFJl c3VsdC5qcwppbmRleCBjNjIyNDcyNjNlZjFiOTM2YTFjOTU3ODAxM2E2MDAyNmUyYjEyMTQ2Li5l ZTJhMTVlYzRlNjBjYThjMjZhYmE4MWFiYzQ2MTFiNTA4ZGRmOWFhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db25zb2xlQ29tbWFuZFJlc3VsdC5qcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db25zb2xlQ29tbWFuZFJl c3VsdC5qcwpAQCAtNDYsMTAgKzQ2LDEwIEBAIFdlYkluc3BlY3Rvci5Db25zb2xlQ29tbWFuZFJl c3VsdC5wcm90b3R5cGUgPSB7CiAgICAgICAgIGVsZW1lbnQuY2xhc3NMaXN0LmFkZCgiY29uc29s ZS11c2VyLWNvbW1hbmQtcmVzdWx0Iik7CiAgICAgICAgIHJldHVybiBlbGVtZW50OwogICAgIH0s Ci0gICAgCi0gICAgdG9DbGlwYm9hcmRTdHJpbmc6IGZ1bmN0aW9uKCkKKworICAgIGdldCBjbGlw Ym9hclByZWZpeFN0cmluZyAoKQogICAgIHsKLSAgICAgICAgcmV0dXJuICI8ICIgKyB0aGlzLl9w YXJhbWV0ZXJzWzBdLmRlc2NyaXB0aW9uOworICAgICAgICByZXR1cm4gIjwgIjsKICAgICB9CiB9 OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db25z b2xlTWVzc2FnZUltcGwuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9D b25zb2xlTWVzc2FnZUltcGwuanMKaW5kZXggOTk2ZjZlOWU5MDEwNDY0Yjk5YzliN2YzNzViZTVl NGQ4YTE2OGY0Mi4uOTQwMDYzZjg5ZmEwNWJjY2ZhYmI1MzJlMGE0MTQ3MTEyMjhiZmY2OSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29uc29sZU1lc3Nh Z2VJbXBsLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnNv bGVNZXNzYWdlSW1wbC5qcwpAQCAtNjU2LDcgKzY1NiwxMiBAQCBXZWJJbnNwZWN0b3IuQ29uc29s ZU1lc3NhZ2VJbXBsLnByb3RvdHlwZSA9IHsKICAgICAgICAgfQogICAgIH0sCiAKLSAgICB0b0Ns aXBib2FyZFN0cmluZzogZnVuY3Rpb24oKQorICAgIGdldCBjbGlwYm9hclByZWZpeFN0cmluZyAo KQorICAgIHsKKyAgICAgICAgcmV0dXJuICJbIiArIHRoaXMubGV2ZWxTdHJpbmcgKyAiXSAiOwor ICAgIH0sCisKKyAgICB0b0NsaXBib2FyZFN0cmluZzogZnVuY3Rpb24odXNlUHJlZml4KQogICAg IHsKICAgICAgICAgdmFyIGlzVHJhY2UgPSB0aGlzLl9zaG91bGREdW1wU3RhY2tUcmFjZSgpOwog ICAgICAgICAKQEAgLTY2Niw3ICs2NzEsOCBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2VJ bXBsLnByb3RvdHlwZSA9IHsKICAgICAgICAgZWxzZQogICAgICAgICAgICAgY2xpcGJvYXJkU3Ry aW5nID0gdGhpcy50eXBlID09PSBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZVR5 cGUuVHJhY2UgPyAiY29uc29sZS50cmFjZSgpIiA6IHRoaXMuX21lc3NhZ2UgfHwgdGhpcy5fbWVz c2FnZVRleHQ7CiAKLSAgICAgICAgY2xpcGJvYXJkU3RyaW5nID0gIlsiICsgdGhpcy5sZXZlbFN0 cmluZyArICJdICIgKyBjbGlwYm9hcmRTdHJpbmc7CisgICAgICAgIGlmICh1c2VQcmVmaXgpCisg ICAgICAgICAgICBjbGlwYm9hcmRTdHJpbmcgPSB0aGlzLmNsaXBib2FyUHJlZml4U3RyaW5nICsg Y2xpcGJvYXJkU3RyaW5nOwogCiAgICAgICAgIGlmIChpc1RyYWNlKSB7CiAgICAgICAgICAgICB0 aGlzLl9zdGFja1RyYWNlLmZvckVhY2goZnVuY3Rpb24oZnJhbWUpIHsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0xvZ0NvbnRlbnRWaWV3LmpzIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTG9nQ29udGVudFZpZXcuanMKaW5kZXgg NzM3YmI2MTIxZGQxN2ZhMDMyZmI1NzE4OWZmYzJkNWU5ODNkNWQyZS4uNzhlYjU0Y2RlYzAzMjI1 ZWNjMGViYWM5MWRiMTk0YjY5NjlmM2FiZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvTG9nQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvTG9nQ29udGVudFZpZXcuanMKQEAgLTI2NCw2ICsyNjQsNyBA QCBXZWJJbnNwZWN0b3IuTG9nQ29udGVudFZpZXcucHJvdG90eXBlID0gewogCiAgICAgICAgIHZh ciBkYXRhID0gIiI7CiAKKyAgICAgICAgdmFyIHVzZVByZWZpeCA9IG1lc3NhZ2VzLmxlbmd0aCA+ IDE7CiAgICAgICAgIG1lc3NhZ2VzLmZvckVhY2goZnVuY3Rpb24gKG1lc3NhZ2VFbGVtZW50LCBp bmRleCkgewogICAgICAgICAgICAgdmFyIG1lc3NhZ2VPYmplY3QgPSBtZXNzYWdlRWxlbWVudC5t ZXNzYWdlOwogICAgICAgICAgICAgaWYgKCFtZXNzYWdlT2JqZWN0KQpAQCAtMjczLDcgKzI3NCw3 IEBAIFdlYkluc3BlY3Rvci5Mb2dDb250ZW50Vmlldy5wcm90b3R5cGUgPSB7CiAKICAgICAgICAg ICAgIGlmIChpbmRleCA+IDApCiAgICAgICAgICAgICAgICAgZGF0YSArPSAiXG4iCi0gICAgICAg ICAgICBkYXRhICs9IG1lc3NhZ2VPYmplY3QudG9DbGlwYm9hcmRTdHJpbmcoKTsKKyAgICAgICAg ICAgIGRhdGEgKz0gbWVzc2FnZU9iamVjdC50b0NsaXBib2FyZFN0cmluZyh1c2VQcmVmaXgpOwog ICAgICAgICB9KTsKIAogICAgICAgICByZXR1cm4gZGF0YTsK 205004 2013-06-19 07:23:29 -0700 2013-06-19 09:34:04 -0700 Patch bug-117669-20130619162138.patch text/plain 7082 graouts U3VidmVyc2lvbiBSZXZpc2lvbjogMTUxNjgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBj MzZlOWQ1ZWI1Nzg1MGFhYTZmMzFlYzJhYjUzYjQxYTQxODkwYTYzLi5mYTQ5ZjA2YmM1NGE3NmUy MmM3MzEyMTA0YzA5NzY0YWQ3NGE1YTExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSw0NiBAQAorMjAxMy0wNi0xOSAgQW50b2luZSBRdWludCAgPGdyYW91dHNAYXBwbGUuY29t PgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IENvcHlpbmcgYXJyYXkgb3Igb2JqZWN0IG91dHB1 dCBkb2VzIG5vdCBjb250YWluIHZhbHVlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTE3NjY5CisKKyAgICAgICAgQ29uc29sZUNvbW1hbmRSZXN1bHQg d2FzIG92ZXJyaWRpbmcgdG9DbGlwYm9hcmRTdHJpbmcoKSBidXQgd2Fzbid0IHVzaW5nIHRoZSBj b21wbGV4IGNvZGUKKyAgICAgICAgaW4gQ29uc29sZU1lc3NhZ2VJbXBsJ3MgdG9DbGlwYm9hcmRT dHJpbmcoKSB0byBwcm92aWRlIGEgbmljZWx5IGZvcm1hdHRlZCBvdXRwdXQgZm9yIG9iamVjdHMu CisgICAgICAgIFdlIG5vdyB1c2UgYSAiY2xpcGJvYXJQcmVmaXhTdHJpbmciIHByb3BlcnR5IHRv IGN1c3RvbWl6ZSB0aGUgcHJlZml4IHVzZWQgaW4gdGhlIGNsaXBib2FyZAorICAgICAgICBhbmQs IGFkZGl0aW9uYWxseSwgb25seSB1c2UgdGhhdCBwcmVmaXggaWYgd2UncmUgY29weWluZyBtb3Jl IHRoYW4gYSBzaW5nbGUgbWVzc2FnZSBzaW5jZSBpdCdzCisgICAgICAgIHRoZSBvbmx5IHNpdHVh dGlvbiB3aGVyZSBpdCdzIHVzZWZ1bCB0byBoYXZlIHRoZSAiPiIgb3IgIjwiIHByZWZpeCBzaG93 bi4gQ29uc29sZSBtZXNzYWdlcyB3aXRoCisgICAgICAgIGEgbG9nIGxldmVsIGFsd2F5cyBwcmlu dCB0aGUgbGV2ZWwgYW5kIHdoZW4gc2F2aW5nIHRoZSBjb25zb2xlIGxvZyB1c2luZyBDbWQrUywg YWxsIG1lc3NhZ2VzCisgICAgICAgIGNvbnRhaW4gdGhlaXIgcHJlZml4IGFzIHdlbGwuCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL0NvbnNvbGVDb21tYW5kLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVDb21t YW5kLnByb3RvdHlwZS50b0NsaXBib2FyZFN0cmluZyk6CisgICAgICAgIEhhbmRsZSB0aGUgbmV3 IGlzUHJlZml4T3B0aW9uYWwgYXJndW1lbnQuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0Nv bnNvbGVDb21tYW5kUmVzdWx0LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVDb21t YW5kUmVzdWx0KToKKyAgICAgICAgUHJvdmlkZSBhIGN1c3RvbSAiPCAiIHByZWZpeCBhbmQgc2V0 ICJlbmZvcmNlc0NsaXBib2FyZFByZWZpeFN0cmluZyIgdG8gZmFsc2Ugc3VjaCB0aGF0CisgICAg ICAgIHRoZSBwcmVmaXggaXNuJ3QgcHJpbnRlZCBvdXQgaW4gc2l0dWF0aW9ucyB3aGVuIGl0IG1h eSBub3QuCisKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlQ29tbWFuZFJlc3VsdC5wcm90 b3R5cGUuZ2V0IGNsaXBib2FyUHJlZml4U3RyaW5nKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNl L0NvbnNvbGVNZXNzYWdlSW1wbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlTWVz c2FnZUltcGwpOgorICAgICAgICBTZXQgImVuZm9yY2VzQ2xpcGJvYXJkUHJlZml4U3RyaW5nIiB0 byB0cnVlIHNpbmNlIHdlIGFsd2F5cyB3YW50IHRvIGxvZyB0aGUgbG9nIGxldmVsCisgICAgICAg IHByZWZpeCBpbiBhbGwgc2l0dWF0aW9ucy4KKworICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNv bGVNZXNzYWdlSW1wbC5wcm90b3R5cGUuZ2V0IGNsaXBib2FyUHJlZml4U3RyaW5nKToKKyAgICAg ICAgSW1wbGVtZW50IHRoaXMgbmV3IGdldHRlciB0byByZXR1cm4gb3VyIGNsaXBib2FyZCBzdHJp bmcgc3VjaCB0aGF0IHN1YmNsYXNzZXMgbWF5CisgICAgICAgIGN1c3RvbWl6ZSBpdC4KKworICAg ICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlSW1wbC5wcm90b3R5cGUudG9DbGlwYm9h cmRTdHJpbmcpOgorICAgICAgICBUYWtlIGludG8gYWNjb3VudCBib3RoIGlzUHJlZml4T3B0aW9u YWwgYW5kIHRoZSAiZW5mb3JjZXNDbGlwYm9hcmRQcmVmaXhTdHJpbmciIHByb3BlcnR5CisgICAg ICAgIHRvIG9ubHkgbG9nIHRoZSBwcmVmaXggaWYgbmVjZXNzYXJ5LgorCisgICAgICAgICogVXNl ckludGVyZmFjZS9Mb2dDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Mb2dD b250ZW50Vmlldy5wcm90b3R5cGUuX2Zvcm1hdE1lc3NhZ2VzQXNEYXRhKToKKyAgICAgICAgTWFr ZSB0aGUgbG9nZ2luZyBvZiBwcmVmaXggb3B0aW9uYWwgd2hlbiB3ZSBoYXZlIGEgc2luZ2xlIG1l c3NhZ2Ugc2VsZWN0ZWQgYW5kIHdlJ3JlCisgICAgICAgIG5vdCBzYXZpbmcgdmlhIENtZCtTLgor CiAyMDEzLTA2LTEzICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKICAg ICAgICAgPGh0dHA6Ly93ZWJraXQub3JnL2IvMTE3NjE1PiBXZWIgSW5zcGVjdG9yOiBKUyBQcmV0 dHlQcmludGluZyBTaG91bGQgaGF2ZSBzcGFjZSBiZXR3ZWVuICJkbyIgYW5kICJ7IgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29uc29sZUNvbW1hbmQu anMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db25zb2xlQ29tbWFuZC5q cwppbmRleCAyNTRlMjI4ZTA4YjAzYzRiMWZlMzYyMWRiZGE0YWViZGE4MTE0ZDJlLi4zOWMxM2Rj ZDg4OGIwMGI3NTA4ZGE5NzMzNmM5MjI5MjkwYWU1ODY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db25zb2xlQ29tbWFuZC5qcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db25zb2xlQ29tbWFuZC5qcwpAQCAtODksOSAr ODksOSBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZUNvbW1hbmQucHJvdG90eXBlID0gewogICAgICAg ICB0aGlzLl9mb3JtYXR0ZWRDb21tYW5kLnRleHRDb250ZW50ID0gdGhpcy5jb21tYW5kOwogICAg IH0sCiAgICAgCi0gICAgdG9DbGlwYm9hcmRTdHJpbmc6IGZ1bmN0aW9uKCkKKyAgICB0b0NsaXBi b2FyZFN0cmluZzogZnVuY3Rpb24oaXNQcmVmaXhPcHRpb25hbCkKICAgICB7Ci0gICAgICAgIHJl dHVybiAiPiAiICsgdGhpcy5jb21tYW5kOworICAgICAgICByZXR1cm4gKGlzUHJlZml4T3B0aW9u YWwgPyAiIiA6ICI+ICIpICsgdGhpcy5jb21tYW5kOwogICAgIH0KIH07CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnNvbGVDb21tYW5kUmVzdWx0 LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29uc29sZUNvbW1hbmRS ZXN1bHQuanMKaW5kZXggYzYyMjQ3MjYzZWYxYjkzNmExYzk1NzgwMTNhNjAwMjZlMmIxMjE0Ni4u YWVmMjkzNGY3MjZiZGZlZjJlNGI3YTkyYjQxZjIyY2Y5MjZjOTQ4MSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29uc29sZUNvbW1hbmRSZXN1bHQuanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29uc29sZUNvbW1hbmRS ZXN1bHQuanMKQEAgLTMzLDYgKzMzLDggQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVDb21tYW5kUmVz dWx0ID0gZnVuY3Rpb24ocmVzdWx0LCB3YXNUaHJvd24sIG9yaWdpbmF0aW5nQ29tbWEKICAgICB0 aGlzLm9yaWdpbmF0aW5nQ29tbWFuZCA9IG9yaWdpbmF0aW5nQ29tbWFuZDsKIAogICAgIFdlYklu c3BlY3Rvci5Db25zb2xlTWVzc2FnZUltcGwuY2FsbCh0aGlzLCBXZWJJbnNwZWN0b3IuQ29uc29s ZU1lc3NhZ2UuTWVzc2FnZVNvdXJjZS5KUywgbGV2ZWwsICIiLCBudWxsLCBXZWJJbnNwZWN0b3Iu Q29uc29sZU1lc3NhZ2UuTWVzc2FnZVR5cGUuUmVzdWx0LCB1bmRlZmluZWQsIHVuZGVmaW5lZCwg dW5kZWZpbmVkLCB1bmRlZmluZWQsIFtyZXN1bHRdKTsKKworICAgIHRoaXMuZW5mb3JjZXNDbGlw Ym9hcmRQcmVmaXhTdHJpbmcgPSBmYWxzZTsKIH07CiAKIFdlYkluc3BlY3Rvci5Db25zb2xlQ29t bWFuZFJlc3VsdC5wcm90b3R5cGUgPSB7CkBAIC00NiwxMCArNDgsMTAgQEAgV2ViSW5zcGVjdG9y LkNvbnNvbGVDb21tYW5kUmVzdWx0LnByb3RvdHlwZSA9IHsKICAgICAgICAgZWxlbWVudC5jbGFz c0xpc3QuYWRkKCJjb25zb2xlLXVzZXItY29tbWFuZC1yZXN1bHQiKTsKICAgICAgICAgcmV0dXJu IGVsZW1lbnQ7CiAgICAgfSwKLSAgICAKLSAgICB0b0NsaXBib2FyZFN0cmluZzogZnVuY3Rpb24o KQorCisgICAgZ2V0IGNsaXBib2FyUHJlZml4U3RyaW5nICgpCiAgICAgewotICAgICAgICByZXR1 cm4gIjwgIiArIHRoaXMuX3BhcmFtZXRlcnNbMF0uZGVzY3JpcHRpb247CisgICAgICAgIHJldHVy biAiPCAiOwogICAgIH0KIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL0NvbnNvbGVNZXNzYWdlSW1wbC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL0NvbnNvbGVNZXNzYWdlSW1wbC5qcwppbmRleCA5OTZmNmU5ZTkwMTA0 NjRiOTljOWI3ZjM3NWJlNWU0ZDhhMTY4ZjQyLi5lNGViYTE5Zjc0MjYxZWVjYWE4MDMyNDJiNWFl ZjFkOTM0YjBlZjIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9Db25zb2xlTWVzc2FnZUltcGwuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvQ29uc29sZU1lc3NhZ2VJbXBsLmpzCkBAIC0zOCw2ICszOCw3IEBAIFdlYklu c3BlY3Rvci5Db25zb2xlTWVzc2FnZUltcGwgPSBmdW5jdGlvbihzb3VyY2UsIGxldmVsLCBtZXNz YWdlLCBsaW5raWZpZXIsIHR5CiAgICAgdGhpcy5fcGFyYW1ldGVycyA9IHBhcmFtZXRlcnM7CiAg ICAgdGhpcy5fc3RhY2tUcmFjZSA9IHN0YWNrVHJhY2U7CiAgICAgdGhpcy5fcmVxdWVzdCA9IHJl cXVlc3Q7CisgICAgdGhpcy5lbmZvcmNlc0NsaXBib2FyZFByZWZpeFN0cmluZyA9IHRydWU7CiAK ICAgICB0aGlzLl9jdXN0b21Gb3JtYXR0ZXJzID0gewogICAgICAgICAib2JqZWN0IjogdGhpcy5f Zm9ybWF0UGFyYW1ldGVyQXNPYmplY3QsCkBAIC02NTYsNyArNjU3LDEyIEBAIFdlYkluc3BlY3Rv ci5Db25zb2xlTWVzc2FnZUltcGwucHJvdG90eXBlID0gewogICAgICAgICB9CiAgICAgfSwKIAot ICAgIHRvQ2xpcGJvYXJkU3RyaW5nOiBmdW5jdGlvbigpCisgICAgZ2V0IGNsaXBib2FyUHJlZml4 U3RyaW5nICgpCisgICAgeworICAgICAgICByZXR1cm4gIlsiICsgdGhpcy5sZXZlbFN0cmluZyAr ICJdICI7CisgICAgfSwKKworICAgIHRvQ2xpcGJvYXJkU3RyaW5nOiBmdW5jdGlvbihpc1ByZWZp eE9wdGlvbmFsKQogICAgIHsKICAgICAgICAgdmFyIGlzVHJhY2UgPSB0aGlzLl9zaG91bGREdW1w U3RhY2tUcmFjZSgpOwogICAgICAgICAKQEAgLTY2Niw3ICs2NzIsOCBAQCBXZWJJbnNwZWN0b3Iu Q29uc29sZU1lc3NhZ2VJbXBsLnByb3RvdHlwZSA9IHsKICAgICAgICAgZWxzZQogICAgICAgICAg ICAgY2xpcGJvYXJkU3RyaW5nID0gdGhpcy50eXBlID09PSBXZWJJbnNwZWN0b3IuQ29uc29sZU1l c3NhZ2UuTWVzc2FnZVR5cGUuVHJhY2UgPyAiY29uc29sZS50cmFjZSgpIiA6IHRoaXMuX21lc3Nh Z2UgfHwgdGhpcy5fbWVzc2FnZVRleHQ7CiAKLSAgICAgICAgY2xpcGJvYXJkU3RyaW5nID0gIlsi ICsgdGhpcy5sZXZlbFN0cmluZyArICJdICIgKyBjbGlwYm9hcmRTdHJpbmc7CisgICAgICAgIGlm ICghaXNQcmVmaXhPcHRpb25hbCB8fCB0aGlzLmVuZm9yY2VzQ2xpcGJvYXJkUHJlZml4U3RyaW5n KQorICAgICAgICAgICAgY2xpcGJvYXJkU3RyaW5nID0gdGhpcy5jbGlwYm9hclByZWZpeFN0cmlu ZyArIGNsaXBib2FyZFN0cmluZzsKIAogICAgICAgICBpZiAoaXNUcmFjZSkgewogICAgICAgICAg ICAgdGhpcy5fc3RhY2tUcmFjZS5mb3JFYWNoKGZ1bmN0aW9uKGZyYW1lKSB7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Mb2dDb250ZW50Vmlldy5qcyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0xvZ0NvbnRlbnRWaWV3LmpzCmlu ZGV4IDczN2JiNjEyMWRkMTdmYTAzMmZiNTcxODlmZmMyZDVlOTgzZDVkMmUuLmE2ODQ3MmQ1NGEy M2I1YTA2MWE3NGVkYjUzZGZiMjhhMjA1ZTgxOTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0xvZ0NvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0xvZ0NvbnRlbnRWaWV3LmpzCkBAIC0yNjQsNiArMjY0 LDcgQEAgV2ViSW5zcGVjdG9yLkxvZ0NvbnRlbnRWaWV3LnByb3RvdHlwZSA9IHsKIAogICAgICAg ICB2YXIgZGF0YSA9ICIiOwogCisgICAgICAgIHZhciBpc1ByZWZpeE9wdGlvbmFsID0gbWVzc2Fn ZXMubGVuZ3RoIDw9IDEgJiYgb25seVNlbGVjdGVkOwogICAgICAgICBtZXNzYWdlcy5mb3JFYWNo KGZ1bmN0aW9uIChtZXNzYWdlRWxlbWVudCwgaW5kZXgpIHsKICAgICAgICAgICAgIHZhciBtZXNz YWdlT2JqZWN0ID0gbWVzc2FnZUVsZW1lbnQubWVzc2FnZTsKICAgICAgICAgICAgIGlmICghbWVz c2FnZU9iamVjdCkKQEAgLTI3Myw3ICsyNzQsNyBAQCBXZWJJbnNwZWN0b3IuTG9nQ29udGVudFZp ZXcucHJvdG90eXBlID0gewogCiAgICAgICAgICAgICBpZiAoaW5kZXggPiAwKQogICAgICAgICAg ICAgICAgIGRhdGEgKz0gIlxuIgotICAgICAgICAgICAgZGF0YSArPSBtZXNzYWdlT2JqZWN0LnRv Q2xpcGJvYXJkU3RyaW5nKCk7CisgICAgICAgICAgICBkYXRhICs9IG1lc3NhZ2VPYmplY3QudG9D bGlwYm9hcmRTdHJpbmcoaXNQcmVmaXhPcHRpb25hbCk7CiAgICAgICAgIH0pOwogCiAgICAgICAg IHJldHVybiBkYXRhOwo= 205010 2013-06-19 09:34:11 -0700 2013-06-19 10:30:21 -0700 Patch for landing bug-117669-20130619183223.patch text/plain 6689 graouts U3VidmVyc2lvbiBSZXZpc2lvbjogMTUxNjgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBj MzZlOWQ1ZWI1Nzg1MGFhYTZmMzFlYzJhYjUzYjQxYTQxODkwYTYzLi42YTBkMmE1M2MxZTNkYWZi OTY1MzU3ODZkNmFiYmRhN2E3YmI2YzY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSw0NCBAQAorMjAxMy0wNi0xOSAgQW50b2luZSBRdWludCAgPGdyYW91dHNAYXBwbGUuY29t PgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IENvcHlpbmcgYXJyYXkgb3Igb2JqZWN0IG91dHB1 dCBkb2VzIG5vdCBjb250YWluIHZhbHVlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTE3NjY5CisKKyAgICAgICAgQ29uc29sZUNvbW1hbmRSZXN1bHQg d2FzIG92ZXJyaWRpbmcgdG9DbGlwYm9hcmRTdHJpbmcoKSBidXQgd2Fzbid0IHVzaW5nIHRoZSBj b21wbGV4IGNvZGUKKyAgICAgICAgaW4gQ29uc29sZU1lc3NhZ2VJbXBsJ3MgdG9DbGlwYm9hcmRT dHJpbmcoKSB0byBwcm92aWRlIGEgbmljZWx5IGZvcm1hdHRlZCBvdXRwdXQgZm9yIG9iamVjdHMu CisgICAgICAgIFdlIG5vdyB1c2UgYSAiY2xpcGJvYXJQcmVmaXhTdHJpbmciIHByb3BlcnR5IHRv IGN1c3RvbWl6ZSB0aGUgcHJlZml4IHVzZWQgaW4gdGhlIGNsaXBib2FyZAorICAgICAgICBhbmQs IGFkZGl0aW9uYWxseSwgb25seSB1c2UgdGhhdCBwcmVmaXggaWYgd2UncmUgY29weWluZyBtb3Jl IHRoYW4gYSBzaW5nbGUgbWVzc2FnZSBzaW5jZSBpdCdzCisgICAgICAgIHRoZSBvbmx5IHNpdHVh dGlvbiB3aGVyZSBpdCdzIHVzZWZ1bCB0byBoYXZlIHRoZSAiPiIgb3IgIjwiIHByZWZpeCBzaG93 bi4gQ29uc29sZSBtZXNzYWdlcyB3aXRoCisgICAgICAgIGEgbG9nIGxldmVsIGFsd2F5cyBwcmlu dCB0aGUgbGV2ZWwgYW5kIHdoZW4gc2F2aW5nIHRoZSBjb25zb2xlIGxvZyB1c2luZyBDbWQrUywg YWxsIG1lc3NhZ2VzCisgICAgICAgIGNvbnRhaW4gdGhlaXIgcHJlZml4IGFzIHdlbGwuCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgVGltb3RoeSBIYXRjaGVyLgorCisgICAgICAgICogVXNlckludGVy ZmFjZS9Db25zb2xlQ29tbWFuZC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlQ29t bWFuZC5wcm90b3R5cGUudG9DbGlwYm9hcmRTdHJpbmcpOgorICAgICAgICBIYW5kbGUgdGhlIG5l dyBpc1ByZWZpeE9wdGlvbmFsIGFyZ3VtZW50LgorCisgICAgICAgICogVXNlckludGVyZmFjZS9D b25zb2xlQ29tbWFuZFJlc3VsdC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlQ29t bWFuZFJlc3VsdC5wcm90b3R5cGUuZ2V0IGNsaXBib2FyUHJlZml4U3RyaW5nKToKKyAgICAgICAg UHJvdmlkZSBhIGN1c3RvbSAiPCAiIHByZWZpeCBhbmQgc2V0ICJlbmZvcmNlc0NsaXBib2FyZFBy ZWZpeFN0cmluZyIgdG8gZmFsc2Ugc3VjaCB0aGF0CisgICAgICAgIHRoZSBwcmVmaXggaXNuJ3Qg cHJpbnRlZCBvdXQgaW4gc2l0dWF0aW9ucyB3aGVuIGl0IG1heSBub3QuCisKKyAgICAgICAgKiBV c2VySW50ZXJmYWNlL0NvbnNvbGVNZXNzYWdlSW1wbC5qczoKKyAgICAgICAgU2V0ICJlbmZvcmNl c0NsaXBib2FyZFByZWZpeFN0cmluZyIgdG8gdHJ1ZSBzaW5jZSB3ZSBhbHdheXMgd2FudCB0byBs b2cgdGhlIGxvZyBsZXZlbAorICAgICAgICBwcmVmaXggaW4gYWxsIHNpdHVhdGlvbnMuCisKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZUltcGwucHJvdG90eXBlLmdldCBjbGlw Ym9hclByZWZpeFN0cmluZyk6CisgICAgICAgIEltcGxlbWVudCB0aGlzIG5ldyBnZXR0ZXIgdG8g cmV0dXJuIG91ciBjbGlwYm9hcmQgc3RyaW5nIHN1Y2ggdGhhdCBzdWJjbGFzc2VzIG1heQorICAg ICAgICBjdXN0b21pemUgaXQuCisKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2Fn ZUltcGwucHJvdG90eXBlLnRvQ2xpcGJvYXJkU3RyaW5nKToKKyAgICAgICAgVGFrZSBpbnRvIGFj Y291bnQgYm90aCBpc1ByZWZpeE9wdGlvbmFsIGFuZCB0aGUgImVuZm9yY2VzQ2xpcGJvYXJkUHJl Zml4U3RyaW5nIiBwcm9wZXJ0eQorICAgICAgICB0byBvbmx5IGxvZyB0aGUgcHJlZml4IGlmIG5l Y2Vzc2FyeS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvTG9nQ29udGVudFZpZXcuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuTG9nQ29udGVudFZpZXcucHJvdG90eXBlLl9mb3JtYXRNZXNz YWdlc0FzRGF0YSk6CisgICAgICAgIE1ha2UgdGhlIGxvZ2dpbmcgb2YgcHJlZml4IG9wdGlvbmFs IHdoZW4gd2UgaGF2ZSBhIHNpbmdsZSBtZXNzYWdlIHNlbGVjdGVkIGFuZCB3ZSdyZQorICAgICAg ICBub3Qgc2F2aW5nIHZpYSBDbWQrUy4KKwogMjAxMy0wNi0xMyAgSm9zZXBoIFBlY29yYXJvICA8 cGVjb3Jhcm9AYXBwbGUuY29tPgogCiAgICAgICAgIDxodHRwOi8vd2Via2l0Lm9yZy9iLzExNzYx NT4gV2ViIEluc3BlY3RvcjogSlMgUHJldHR5UHJpbnRpbmcgU2hvdWxkIGhhdmUgc3BhY2UgYmV0 d2VlbiAiZG8iIGFuZCAieyIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL0NvbnNvbGVDb21tYW5kLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvQ29uc29sZUNvbW1hbmQuanMKaW5kZXggMjU0ZTIyOGUwOGIwM2M0YjFmZTM2MjFk YmRhNGFlYmRhODExNGQyZS4uMzljMTNkY2Q4ODhiMDBiNzUwOGRhOTczMzZjOTIyOTI5MGFlNTg2 NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29uc29s ZUNvbW1hbmQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29u c29sZUNvbW1hbmQuanMKQEAgLTg5LDkgKzg5LDkgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVDb21t YW5kLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5fZm9ybWF0dGVkQ29tbWFuZC50ZXh0Q29u dGVudCA9IHRoaXMuY29tbWFuZDsKICAgICB9LAogICAgIAotICAgIHRvQ2xpcGJvYXJkU3RyaW5n OiBmdW5jdGlvbigpCisgICAgdG9DbGlwYm9hcmRTdHJpbmc6IGZ1bmN0aW9uKGlzUHJlZml4T3B0 aW9uYWwpCiAgICAgewotICAgICAgICByZXR1cm4gIj4gIiArIHRoaXMuY29tbWFuZDsKKyAgICAg ICAgcmV0dXJuIChpc1ByZWZpeE9wdGlvbmFsID8gIiIgOiAiPiAiKSArIHRoaXMuY29tbWFuZDsK ICAgICB9CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9Db25zb2xlQ29tbWFuZFJlc3VsdC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL0NvbnNvbGVDb21tYW5kUmVzdWx0LmpzCmluZGV4IGM2MjI0NzI2M2VmMWI5MzZh MWM5NTc4MDEzYTYwMDI2ZTJiMTIxNDYuLjBiYjFhMDg5YjFhZGQzOWY4ZjRhY2Y0MmRmZWZhOWEz ZmM3NDNiODYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L0NvbnNvbGVDb21tYW5kUmVzdWx0LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL0NvbnNvbGVDb21tYW5kUmVzdWx0LmpzCkBAIC00MCwxNiArNDAsMTggQEAgV2Vi SW5zcGVjdG9yLkNvbnNvbGVDb21tYW5kUmVzdWx0LnByb3RvdHlwZSA9IHsKIAogICAgIC8vIFB1 YmxpYwogCisgICAgZW5mb3JjZXNDbGlwYm9hcmRQcmVmaXhTdHJpbmc6IGZhbHNlLAorCiAgICAg dG9NZXNzYWdlRWxlbWVudDogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgdmFyIGVsZW1lbnQg PSBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2VJbXBsLnByb3RvdHlwZS50b01lc3NhZ2VFbGVt ZW50LmNhbGwodGhpcyk7CiAgICAgICAgIGVsZW1lbnQuY2xhc3NMaXN0LmFkZCgiY29uc29sZS11 c2VyLWNvbW1hbmQtcmVzdWx0Iik7CiAgICAgICAgIHJldHVybiBlbGVtZW50OwogICAgIH0sCi0g ICAgCi0gICAgdG9DbGlwYm9hcmRTdHJpbmc6IGZ1bmN0aW9uKCkKKworICAgIGdldCBjbGlwYm9h clByZWZpeFN0cmluZyAoKQogICAgIHsKLSAgICAgICAgcmV0dXJuICI8ICIgKyB0aGlzLl9wYXJh bWV0ZXJzWzBdLmRlc2NyaXB0aW9uOworICAgICAgICByZXR1cm4gIjwgIjsKICAgICB9CiB9Owog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db25zb2xl TWVzc2FnZUltcGwuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db25z b2xlTWVzc2FnZUltcGwuanMKaW5kZXggOTk2ZjZlOWU5MDEwNDY0Yjk5YzliN2YzNzViZTVlNGQ4 YTE2OGY0Mi4uNjA5ZDkxMTVlNjQwOWY5YzdkMDRiMGZlNzBmYjkxMmM3YWUyZmIyNyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29uc29sZU1lc3NhZ2VJ bXBsLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnNvbGVN ZXNzYWdlSW1wbC5qcwpAQCAtNDgsNiArNDgsOSBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3Nh Z2VJbXBsID0gZnVuY3Rpb24oc291cmNlLCBsZXZlbCwgbWVzc2FnZSwgbGlua2lmaWVyLCB0eQog fQogCiBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2VJbXBsLnByb3RvdHlwZSA9IHsKKworICAg IGVuZm9yY2VzQ2xpcGJvYXJkUHJlZml4U3RyaW5nOiB0cnVlLAorCiAgICAgX2Zvcm1hdE1lc3Nh Z2U6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIHRoaXMuX2Zvcm1hdHRlZE1lc3NhZ2UgPSBk b2N1bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIik7CkBAIC02NTYsNyArNjU5LDEyIEBAIFdlYklu c3BlY3Rvci5Db25zb2xlTWVzc2FnZUltcGwucHJvdG90eXBlID0gewogICAgICAgICB9CiAgICAg fSwKIAotICAgIHRvQ2xpcGJvYXJkU3RyaW5nOiBmdW5jdGlvbigpCisgICAgZ2V0IGNsaXBib2Fy UHJlZml4U3RyaW5nICgpCisgICAgeworICAgICAgICByZXR1cm4gIlsiICsgdGhpcy5sZXZlbFN0 cmluZyArICJdICI7CisgICAgfSwKKworICAgIHRvQ2xpcGJvYXJkU3RyaW5nOiBmdW5jdGlvbihp c1ByZWZpeE9wdGlvbmFsKQogICAgIHsKICAgICAgICAgdmFyIGlzVHJhY2UgPSB0aGlzLl9zaG91 bGREdW1wU3RhY2tUcmFjZSgpOwogICAgICAgICAKQEAgLTY2Niw3ICs2NzQsOCBAQCBXZWJJbnNw ZWN0b3IuQ29uc29sZU1lc3NhZ2VJbXBsLnByb3RvdHlwZSA9IHsKICAgICAgICAgZWxzZQogICAg ICAgICAgICAgY2xpcGJvYXJkU3RyaW5nID0gdGhpcy50eXBlID09PSBXZWJJbnNwZWN0b3IuQ29u c29sZU1lc3NhZ2UuTWVzc2FnZVR5cGUuVHJhY2UgPyAiY29uc29sZS50cmFjZSgpIiA6IHRoaXMu X21lc3NhZ2UgfHwgdGhpcy5fbWVzc2FnZVRleHQ7CiAKLSAgICAgICAgY2xpcGJvYXJkU3RyaW5n ID0gIlsiICsgdGhpcy5sZXZlbFN0cmluZyArICJdICIgKyBjbGlwYm9hcmRTdHJpbmc7CisgICAg ICAgIGlmICghaXNQcmVmaXhPcHRpb25hbCB8fCB0aGlzLmVuZm9yY2VzQ2xpcGJvYXJkUHJlZml4 U3RyaW5nKQorICAgICAgICAgICAgY2xpcGJvYXJkU3RyaW5nID0gdGhpcy5jbGlwYm9hclByZWZp eFN0cmluZyArIGNsaXBib2FyZFN0cmluZzsKIAogICAgICAgICBpZiAoaXNUcmFjZSkgewogICAg ICAgICAgICAgdGhpcy5fc3RhY2tUcmFjZS5mb3JFYWNoKGZ1bmN0aW9uKGZyYW1lKSB7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Mb2dDb250ZW50Vmll dy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0xvZ0NvbnRlbnRWaWV3 LmpzCmluZGV4IDczN2JiNjEyMWRkMTdmYTAzMmZiNTcxODlmZmMyZDVlOTgzZDVkMmUuLmE2ODQ3 MmQ1NGEyM2I1YTA2MWE3NGVkYjUzZGZiMjhhMjA1ZTgxOTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0xvZ0NvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0xvZ0NvbnRlbnRWaWV3LmpzCkBAIC0yNjQs NiArMjY0LDcgQEAgV2ViSW5zcGVjdG9yLkxvZ0NvbnRlbnRWaWV3LnByb3RvdHlwZSA9IHsKIAog ICAgICAgICB2YXIgZGF0YSA9ICIiOwogCisgICAgICAgIHZhciBpc1ByZWZpeE9wdGlvbmFsID0g bWVzc2FnZXMubGVuZ3RoIDw9IDEgJiYgb25seVNlbGVjdGVkOwogICAgICAgICBtZXNzYWdlcy5m b3JFYWNoKGZ1bmN0aW9uIChtZXNzYWdlRWxlbWVudCwgaW5kZXgpIHsKICAgICAgICAgICAgIHZh ciBtZXNzYWdlT2JqZWN0ID0gbWVzc2FnZUVsZW1lbnQubWVzc2FnZTsKICAgICAgICAgICAgIGlm ICghbWVzc2FnZU9iamVjdCkKQEAgLTI3Myw3ICsyNzQsNyBAQCBXZWJJbnNwZWN0b3IuTG9nQ29u dGVudFZpZXcucHJvdG90eXBlID0gewogCiAgICAgICAgICAgICBpZiAoaW5kZXggPiAwKQogICAg ICAgICAgICAgICAgIGRhdGEgKz0gIlxuIgotICAgICAgICAgICAgZGF0YSArPSBtZXNzYWdlT2Jq ZWN0LnRvQ2xpcGJvYXJkU3RyaW5nKCk7CisgICAgICAgICAgICBkYXRhICs9IG1lc3NhZ2VPYmpl Y3QudG9DbGlwYm9hcmRTdHJpbmcoaXNQcmVmaXhPcHRpb25hbCk7CiAgICAgICAgIH0pOwogCiAg ICAgICAgIHJldHVybiBkYXRhOwo=