141812 2015-02-19 13:54:42 -0800 Web Inspector: Introduce FormattedValue helpers and use them in Console/ObjectTree 2015-02-19 17:11:29 -0800 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck commit-queue graouts joepeck jonowells mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1070517 0 joepeck 2015-02-19 13:54:42 -0800 * SUMMARY Introduce FormattedValue helpers and use them in Console/ObjectTree. This helps create formatted value elements. I suppose I could make this a class, but I'm not sure it is really worth it at the moment. 1070518 1 webkit-bug-importer 2015-02-19 13:54:52 -0800 <rdar://problem/19893849> 1070525 2 246919 joepeck 2015-02-19 14:08:40 -0800 Created attachment 246919 [PATCH] Proposed Fix 1070550 3 246919 commit-queue 2015-02-19 16:37:43 -0800 Comment on attachment 246919 [PATCH] Proposed Fix Clearing flags on attachment: 246919 Committed r180371: <http://trac.webkit.org/changeset/180371> 1070552 4 commit-queue 2015-02-19 16:37:48 -0800 All reviewed patches have been landed. Closing bug. 1070569 5 joepeck 2015-02-19 17:11:29 -0800 Follow-up fix for: js> Symbol() <https://trac.webkit.org/r180373> 246919 2015-02-19 14:08:40 -0800 2015-02-19 16:37:43 -0800 [PATCH] Proposed Fix formattedvalue.patch text/plain 27807 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGRkNmRkZTcuLmM1M2ZiMmIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDcxIEBACiAyMDE1LTAyLTE5ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogSW50cm9k dWNlIEZvcm1hdHRlZFZhbHVlIGhlbHBlcnMgYW5kIHVzZSB0aGVtIGluIENvbnNvbGUvT2JqZWN0 VHJlZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQx ODEyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhl cmUgd2VyZSBhIGZldyBkaWZmZXJlbnQgd2F5cyB0byBnZXQgc3R5bGVkIHZhbHVlcy4gVHJ5IHRv IGNvbnNvbGlkYXRlIHRoZW0KKyAgICAgICAgYWxsIGluIEZvcm1hdHRlZFZhbHVlLiBUaGF0IGlz IGFsc28gYSBjb252ZW5pZW50IHBsYWNlIHRvIGhhdmUgdGhlIHN0eWxlcy4KKworICAgICAgICAq IFVzZXJJbnRlcmZhY2UvTWFpbi5odG1sOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3Mv Q29uc29sZU1lc3NhZ2VJbXBsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNz YWdlSW1wbC5wcm90b3R5cGUuX2Zvcm1hdE1lc3NhZ2UpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkNvbnNvbGVNZXNzYWdlSW1wbC5wcm90b3R5cGUuX2Zvcm1hdFBhcmFtZXRlcik6CisgICAgICAg IChXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2VJbXBsLnByb3RvdHlwZS5fZm9ybWF0UGFyYW1l dGVyQXNWYWx1ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2VJbXBsLnBy b3RvdHlwZS5fZm9ybWF0UGFyYW1ldGVyQXNTdHJpbmcpOgorCisgICAgICAgIChXZWJJbnNwZWN0 b3IuQ29uc29sZU1lc3NhZ2VJbXBsLnByb3RvdHlwZS5fdXNlclByb3ZpZGVkQ29sdW1uTmFtZXMp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlSW1wbC5wcm90b3R5cGUuX2Zv cm1hdFBhcmFtZXRlckFzVGFibGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNz YWdlSW1wbC5wcm90b3R5cGUuX3BvcHVsYXRlU3RhY2tUcmFjZVRyZWVFbGVtZW50KToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZUltcGwucHJvdG90eXBlLl9wcm9wZXJ0eVBy ZXZpZXdFbGVtZW50KTogRGVsZXRlZC4KKyAgICAgICAgRml4IGNvbnNvbGUudGFibGUgYWZ0ZXIg cmVuYW1pbmcgT2JqZWN0UHJldmlldy5wcm9wZXJ0aWVzIHRvIE9iamVjdFByZXZpZXcucHJvcGVy dHlQcmV2aWV3cy4KKyAgICAgICAgQWxzbywgdXNlIEZvcm1hdHRlZFZhbHVlIHRvIGNyZWF0ZSB0 aGUgdmFsdWUgZWxlbWVudHMuIEFsc28sIHJlbW92ZSBjbGFzcworICAgICAgICAic291cmNlLWNv ZGUiIGFzIEkgZG8gbm90IHNlZSBpdCBhY3R1YWxseSBiZWluZyB1c2VkIGluIGEgbWVhbmluZ2Z1 bCB3YXkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0Zvcm1hdHRlZFZhbHVlLmNz czogQWRkZWQuCisgICAgICAgICguZm9ybWF0dGVkLW9iamVjdCwgLmZvcm1hdHRlZC1ub2RlLCAu Zm9ybWF0dGVkLWVycm9yLCAuZm9ybWF0dGVkLW1hcCwgLmZvcm1hdHRlZC1zZXQsIC5mb3JtYXR0 ZWQtd2Vha21hcCk6CisgICAgICAgICguZm9ybWF0dGVkLW51bWJlcik6CisgICAgICAgICguZm9y bWF0dGVkLXN0cmluZywgLmZvcm1hdHRlZC1yZWdleHApOgorICAgICAgICAoLmZvcm1hdHRlZC1z dHJpbmcpOgorICAgICAgICAoLmZvcm1hdHRlZC1yZWdleHApOgorICAgICAgICAoLmZvcm1hdHRl ZC1zeW1ib2wpOgorICAgICAgICAoLmZvcm1hdHRlZC1udWxsLCAuZm9ybWF0dGVkLXVuZGVmaW5l ZCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Gb3JtYXR0ZWRWYWx1ZS5qczogQWRk ZWQuCisgICAgICAgIChXZWJJbnNwZWN0b3IuRm9ybWF0dGVkVmFsdWUuY2xhc3NOYW1lRm9yVHlw ZXMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZvcm1hdHRlZFZhbHVlLmNsYXNzTmFtZUZvck9i amVjdCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRm9ybWF0dGVkVmFsdWUuY3JlYXRlTGlua2lm aWVkRWxlbWVudFN0cmluZyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRm9ybWF0dGVkVmFsdWUu Y3JlYXRlRWxlbWVudEZvclR5cGVzQW5kVmFsdWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZv cm1hdHRlZFZhbHVlLmNyZWF0ZUVsZW1lbnRGb3JSZW1vdGVPYmplY3QpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkZvcm1hdHRlZFZhbHVlLmNyZWF0ZUVsZW1lbnRGb3JPYmplY3RQcmV2aWV3KToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5Gb3JtYXR0ZWRWYWx1ZS5jcmVhdGVFbGVtZW50Rm9yUHJv cGVydHlQcmV2aWV3KToKKyAgICAgICAgU3R5bGVzIGFuZCBmb3JtYXR0ZWQgdmFsdWUgZWxlbWVu dCBjcmVhdGlvbi4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTG9nQ29udGVudFZp ZXcuY3NzOgorICAgICAgICAoLmV4cGFuZGFibGUuc291cmNlLWNvZGUpOiBEZWxldGVkLgorICAg ICAgICBSZW1vdmUgIi5zb3VyY2UtY29kZSIuIEkgZG8gbm90IHNlZSBpdCBhY3R1YWxseSBiZWlu ZyB1c2VkIGluIGEgbWVhbmluZ2Z1bCB3YXkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1Zp ZXdzL09iamVjdFByZXZpZXdWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk9iamVjdFBy ZXZpZXdWaWV3LnByb3RvdHlwZS5fYXBwZW5kUHJvcGVydHlQcmV2aWV3cyk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuT2JqZWN0UHJldmlld1ZpZXcucHJvdG90eXBlLl9hcHBlbmRWYWx1ZVByZXZp ZXcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk9iamVjdFByZXZpZXdWaWV3LnByb3RvdHlwZS5f Zm9ybWF0dGVkT2JqZWN0RWxlbWVudEZvclByZXZpZXcpOiBEZWxldGVkLgorICAgICAgICAqIFVz ZXJJbnRlcmZhY2UvVmlld3MvT2JqZWN0VHJlZVByb3BlcnR5VHJlZUVsZW1lbnQuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuT2JqZWN0VHJlZVByb3BlcnR5VHJlZUVsZW1lbnQucHJvdG90eXBl Ll91cGRhdGVUaXRsZVByb3BlcnR5U3R5bGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk9iamVj dFRyZWVQcm9wZXJ0eVRyZWVFbGVtZW50LnByb3RvdHlwZS5fZGVzY3JpcHRpb25TdHJpbmcpOiBE ZWxldGVkLgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvT2JqZWN0VHJlZVZpZXcuY3Nz OgorICAgICAgICAoLmZvcm1hdHRlZC1vYmplY3QsIC5mb3JtYXR0ZWQtbm9kZSwgLmZvcm1hdHRl ZC1lcnJvciwgLmZvcm1hdHRlZC1tYXAsIC5mb3JtYXR0ZWQtc2V0LCAuZm9ybWF0dGVkLXdlYWtt YXApOiBEZWxldGVkLgorICAgICAgICAoLmZvcm1hdHRlZC1udW1iZXIpOiBEZWxldGVkLgorICAg ICAgICAoLmZvcm1hdHRlZC1zdHJpbmcsIC5mb3JtYXR0ZWQtcmVnZXhwKTogRGVsZXRlZC4KKyAg ICAgICAgKC5mb3JtYXR0ZWQtc3RyaW5nKTogRGVsZXRlZC4KKyAgICAgICAgKC5mb3JtYXR0ZWQt cmVnZXhwKTogRGVsZXRlZC4KKyAgICAgICAgKC5mb3JtYXR0ZWQtc3ltYm9sKTogRGVsZXRlZC4K KyAgICAgICAgKC5mb3JtYXR0ZWQtbnVsbCwgLmZvcm1hdHRlZC11bmRlZmluZWQpOiBEZWxldGVk LgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvT2JqZWN0VHJlZVZpZXcuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuT2JqZWN0VHJlZVZpZXcuY2xhc3NOYW1lRm9yT2JqZWN0KTogRGVs ZXRlZC4KKyAgICAgICAgRXh0cmFjdCBzdHlsZXMgYW5kIHZhbHVlIGZvcm1hdHRpbmcgdG8gRm9y bWF0dGVkVmFsdWUgaGVscGVycy4KKworMjAxNS0wMi0xOSAgSm9zZXBoIFBlY29yYXJvICA8cGVj b3Jhcm9AYXBwbGUuY29tPgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IERpc2FibGUgRE9NIFRy ZWUgRWRpdGluZyAvIFN0eWxlcyBFZGl0aW5nIG9mIFNoYWRvdyBET00gTm9kZXMKICAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MTc5MwogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9NYWluLmh0bWwgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9NYWluLmh0bWwKaW5kZXggZjY2N2VlYi4u MjgxZTM4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv TWFpbi5odG1sCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01haW4u aHRtbApAQCAtNzksNiArNzksNyBAQAogICAgIDxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0i Vmlld3MvRmxleGlibGVTcGFjZU5hdmlnYXRpb25JdGVtLmNzcyI+CiAgICAgPGxpbmsgcmVsPSJz dHlsZXNoZWV0IiBocmVmPSJWaWV3cy9Gb2xkZXJJY29uLmNzcyI+CiAgICAgPGxpbmsgcmVsPSJz dHlsZXNoZWV0IiBocmVmPSJWaWV3cy9Gb250UmVzb3VyY2VDb250ZW50Vmlldy5jc3MiPgorICAg IDxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0iVmlld3MvRm9ybWF0dGVkVmFsdWUuY3NzIj4K ICAgICA8bGluayByZWw9InN0eWxlc2hlZXQiIGhyZWY9IlZpZXdzL0dvVG9MaW5lRGlhbG9nLmNz cyI+CiAgICAgPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSJWaWV3cy9HcmFkaWVudFNsaWRl ci5jc3MiPgogICAgIDxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0iVmlld3MvSGllcmFyY2hp Y2FsUGF0aENvbXBvbmVudC5jc3MiPgpAQCAtMzYwLDE2ICszNjEsMTYgQEAKICAgICA8c2NyaXB0 IHNyYz0iVmlld3MvRE9NVHJlZU91dGxpbmUuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3Jj PSJWaWV3cy9ET01UcmVlVXBkYXRlci5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCBzcmM9IlZp ZXdzL0Rhc2hib2FyZENvbnRhaW5lclZpZXcuanMiPjwvc2NyaXB0PgorICAgIDxzY3JpcHQgc3Jj PSJWaWV3cy9EYXNoYm9hcmRWaWV3LmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHNyYz0iVmll d3MvRGF0YWJhc2VDb250ZW50Vmlldy5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCBzcmM9IlZp ZXdzL0RhdGFiYXNlSG9zdFRyZWVFbGVtZW50LmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHNy Yz0iVmlld3MvRGF0YWJhc2VUYWJsZUNvbnRlbnRWaWV3LmpzIj48L3NjcmlwdD4KICAgICA8c2Ny aXB0IHNyYz0iVmlld3MvRGF0YWJhc2VUYWJsZVRyZWVFbGVtZW50LmpzIj48L3NjcmlwdD4KICAg ICA8c2NyaXB0IHNyYz0iVmlld3MvRGF0YWJhc2VUcmVlRWxlbWVudC5qcyI+PC9zY3JpcHQ+Ci0g ICAgPHNjcmlwdCBzcmM9IlZpZXdzL0RlYnVnZ2VyU2lkZWJhclBhbmVsLmpzIj48L3NjcmlwdD4K LSAgICA8c2NyaXB0IHNyYz0iVmlld3MvRGV0YWlsc1NlY3Rpb24uanMiPjwvc2NyaXB0PgotICAg IDxzY3JpcHQgc3JjPSJWaWV3cy9EYXNoYm9hcmRWaWV3LmpzIj48L3NjcmlwdD4KICAgICA8c2Ny aXB0IHNyYz0iVmlld3MvRGVidWdnZXJEYXNoYm9hcmRWaWV3LmpzIj48L3NjcmlwdD4KKyAgICA8 c2NyaXB0IHNyYz0iVmlld3MvRGVidWdnZXJTaWRlYmFyUGFuZWwuanMiPjwvc2NyaXB0PgogICAg IDxzY3JpcHQgc3JjPSJWaWV3cy9EZWZhdWx0RGFzaGJvYXJkVmlldy5qcyI+PC9zY3JpcHQ+Cisg ICAgPHNjcmlwdCBzcmM9IlZpZXdzL0RldGFpbHNTZWN0aW9uLmpzIj48L3NjcmlwdD4KICAgICA8 c2NyaXB0IHNyYz0iVmlld3MvRGV0YWlsc1NlY3Rpb25EYXRhR3JpZFJvdy5qcyI+PC9zY3JpcHQ+ CiAgICAgPHNjcmlwdCBzcmM9IlZpZXdzL0RldGFpbHNTZWN0aW9uR3JvdXAuanMiPjwvc2NyaXB0 PgogICAgIDxzY3JpcHQgc3JjPSJWaWV3cy9EZXRhaWxzU2VjdGlvblByb3BlcnRpZXNSb3cuanMi Pjwvc2NyaXB0PgpAQCAtMzg0LDYgKzM4NSw3IEBACiAgICAgPHNjcmlwdCBzcmM9IlZpZXdzL0Zs ZXhpYmxlU3BhY2VOYXZpZ2F0aW9uSXRlbS5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCBzcmM9 IlZpZXdzL0ZvbGRlclRyZWVFbGVtZW50LmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHNyYz0i Vmlld3MvRm9udFJlc291cmNlQ29udGVudFZpZXcuanMiPjwvc2NyaXB0PgorICAgIDxzY3JpcHQg c3JjPSJWaWV3cy9Gb3JtYXR0ZWRWYWx1ZS5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCBzcmM9 IlZpZXdzL0ZyYW1lQ29udGVudFZpZXcuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3JjPSJW aWV3cy9GcmFtZURPTVRyZWVDb250ZW50Vmlldy5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCBz cmM9IlZpZXdzL0ZyYW1lVHJlZUVsZW1lbnQuanMiPjwvc2NyaXB0PgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29uc29sZU1lc3NhZ2VJbXBs LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29uc29sZU1l c3NhZ2VJbXBsLmpzCmluZGV4IGUzYTBhZTkuLjU1MGFiZWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnNvbGVNZXNzYWdlSW1wbC5qcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db25zb2xlTWVz c2FnZUltcGwuanMKQEAgLTU4LDcgKzU4LDcgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdl SW1wbC5wcm90b3R5cGUgPSB7CiAgICAgX2Zvcm1hdE1lc3NhZ2U6IGZ1bmN0aW9uKCkKICAgICB7 CiAgICAgICAgIHRoaXMuX2Zvcm1hdHRlZE1lc3NhZ2UgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50 KCJzcGFuIik7Ci0gICAgICAgIHRoaXMuX2Zvcm1hdHRlZE1lc3NhZ2UuY2xhc3NOYW1lID0gImNv bnNvbGUtbWVzc2FnZS10ZXh0IHNvdXJjZS1jb2RlIjsKKyAgICAgICAgdGhpcy5fZm9ybWF0dGVk TWVzc2FnZS5jbGFzc05hbWUgPSAiY29uc29sZS1tZXNzYWdlLXRleHQiOwogCiAgICAgICAgIHZh ciBtZXNzYWdlVGV4dDsKICAgICAgICAgaWYgKHRoaXMuc291cmNlID09PSBXZWJJbnNwZWN0b3Iu Q29uc29sZU1lc3NhZ2UuTWVzc2FnZVNvdXJjZS5Db25zb2xlQVBJKSB7CkBAIC0yODMsNyArMjgz LDcgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlSW1wbC5wcm90b3R5cGUgPSB7CiAgICAg ICAgIH0KIAogICAgICAgICB2YXIgc3BhbiA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInNwYW4i KTsKLSAgICAgICAgc3Bhbi5jbGFzc05hbWUgPSAiY29uc29sZS1mb3JtYXR0ZWQtIiArIHR5cGUg KyAiIHNvdXJjZS1jb2RlIjsKKyAgICAgICAgc3Bhbi5jbGFzc05hbWUgPSAiY29uc29sZS1mb3Jt YXR0ZWQtIiArIHR5cGU7CiAKICAgICAgICAgaWYgKHRoaXMuX2lzRXhwYW5kYWJsZShvdXRwdXQp KQogICAgICAgICAgICAgc3Bhbi5jbGFzc0xpc3QuYWRkKCJleHBhbmRhYmxlIik7CkBAIC0yOTIs OSArMjkyLDkgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlSW1wbC5wcm90b3R5cGUgPSB7 CiAgICAgICAgIHJldHVybiBzcGFuOwogICAgIH0sCiAKLSAgICBfZm9ybWF0UGFyYW1ldGVyQXNW YWx1ZTogZnVuY3Rpb24odmFsLCBlbGVtKQorICAgIF9mb3JtYXRQYXJhbWV0ZXJBc1ZhbHVlOiBm dW5jdGlvbih2YWx1ZSwgZWxlbSkKICAgICB7Ci0gICAgICAgIGVsZW0uYXBwZW5kQ2hpbGQoZG9j dW1lbnQuY3JlYXRlVGV4dE5vZGUodmFsKSk7CisgICAgICAgIGVsZW0uYXBwZW5kQ2hpbGQoV2Vi SW5zcGVjdG9yLkZvcm1hdHRlZFZhbHVlLmNyZWF0ZUVsZW1lbnRGb3JSZW1vdGVPYmplY3QodmFs dWUpKTsKICAgICB9LAogCiAgICAgX2Zvcm1hdFBhcmFtZXRlckFzT2JqZWN0OiBmdW5jdGlvbihv YmosIGVsZW0sIGZvcmNlRXhwYW5zaW9uKQpAQCAtMzAzLDI1ICszMDMsMTEgQEAgV2ViSW5zcGVj dG9yLkNvbnNvbGVNZXNzYWdlSW1wbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIGVsZW0uYXBwZW5k Q2hpbGQob2JqZWN0VHJlZS5lbGVtZW50KTsKICAgICB9LAogCi0gICAgX3Byb3BlcnR5UHJldmll d0VsZW1lbnQ6IGZ1bmN0aW9uKHByb3BlcnR5KQorICAgIF9mb3JtYXRQYXJhbWV0ZXJBc1N0cmlu ZzogZnVuY3Rpb24ob3V0cHV0LCBlbGVtKQogICAgIHsKLSAgICAgICAgLy8gRklYTUU6IFVzZWQg YnkgY29uc29sZS50YWJsZS4gV2Ugc2hvdWxkIGJlIGFibGUgdG8gZWxpbWluYXRlIHRoaXMgaW4g ZmF2b3Igb2YgT2JqZWN0UHJldmlldy4KLQotICAgICAgICB2YXIgc3BhbiA9IGRvY3VtZW50LmNy ZWF0ZUVsZW1lbnQoInNwYW4iKTsKLSAgICAgICAgc3Bhbi5jbGFzc0xpc3QuYWRkKFdlYkluc3Bl Y3Rvci5PYmplY3RUcmVlVmlldy5jbGFzc05hbWVGb3JPYmplY3QocHJvcGVydHkpKTsKLQotICAg ICAgICBpZiAocHJvcGVydHkudHlwZSA9PT0gInN0cmluZyIpIHsKLSAgICAgICAgICAgIHNwYW4u dGV4dENvbnRlbnQgPSAiXCIiICsgcHJvcGVydHkudmFsdWUucmVwbGFjZSgvXG4vZywgIlx1MjFC NSIpLnJlcGxhY2UoLyIvZywgIlxcXCIiKSArICJcIiI7Ci0gICAgICAgICAgICByZXR1cm4gc3Bh bjsKLSAgICAgICAgfQotCi0gICAgICAgIGlmIChwcm9wZXJ0eS50eXBlID09PSAiZnVuY3Rpb24i KSB7Ci0gICAgICAgICAgICBzcGFuLnRleHRDb250ZW50ID0gImZ1bmN0aW9uIjsKLSAgICAgICAg ICAgIHJldHVybiBzcGFuOwotICAgICAgICB9Ci0KLSAgICAgICAgc3Bhbi50ZXh0Q29udGVudCA9 IHByb3BlcnR5LnZhbHVlOwotICAgICAgICByZXR1cm4gc3BhbjsKKyAgICAgICAgdmFyIHNwYW4g PSBXZWJJbnNwZWN0b3IuRm9ybWF0dGVkVmFsdWUuY3JlYXRlTGlua2lmaWVkRWxlbWVudFN0cmlu ZyhvdXRwdXQuZGVzY3JpcHRpb24pOworICAgICAgICBlbGVtLmNsYXNzTGlzdC5yZW1vdmUoImNv bnNvbGUtZm9ybWF0dGVkLXN0cmluZyIpOworICAgICAgICBlbGVtLmFwcGVuZENoaWxkKHNwYW4p OwogICAgIH0sCiAKICAgICBfZm9ybWF0UGFyYW1ldGVyQXNOb2RlOiBmdW5jdGlvbihvYmplY3Qs IGVsZW0pCkBAIC0zNjMsMTIgKzM0OSwxMiBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2VJ bXBsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHJldHVybiBbU3RyaW5nKGNvbHVtbk5hbWVz QXJndW1lbnQudmFsdWUpXTsKIAogICAgICAgICAvLyBJZ25vcmUgZXZlcnl0aGluZyB0aGF0IGlz IG5vdCBhbiBhcnJheSB3aXRoIHByb3BlcnR5IHByZXZpZXdzLgotICAgICAgICBpZiAocmVtb3Rl T2JqZWN0LnR5cGUgIT09ICJvYmplY3QiIHx8IHJlbW90ZU9iamVjdC5zdWJ0eXBlICE9PSAiYXJy YXkiIHx8ICFyZW1vdGVPYmplY3QucHJldmlldyB8fCAhcmVtb3RlT2JqZWN0LnByZXZpZXcucHJv cGVydGllcykKKyAgICAgICAgaWYgKHJlbW90ZU9iamVjdC50eXBlICE9PSAib2JqZWN0IiB8fCBy ZW1vdGVPYmplY3Quc3VidHlwZSAhPT0gImFycmF5IiB8fCAhcmVtb3RlT2JqZWN0LnByZXZpZXcg fHwgIXJlbW90ZU9iamVjdC5wcmV2aWV3LnByb3BlcnR5UHJldmlld3MpCiAgICAgICAgICAgICBy ZXR1cm4gbnVsbDsKIAogICAgICAgICAvLyBBcnJheS4gTG9vayBpbnRvIHRoZSBwcmV2aWV3IGFu ZCBnZXQgc3RyaW5nIHZhbHVlcy4KICAgICAgICAgdmFyIGV4dHJhY3RlZENvbHVtbk5hbWVzID0g W107Ci0gICAgICAgIGZvciAodmFyIHByb3BlcnR5UHJldmlldyBvZiByZW1vdGVPYmplY3QucHJl dmlldy5wcm9wZXJ0aWVzKSB7CisgICAgICAgIGZvciAodmFyIHByb3BlcnR5UHJldmlldyBvZiBy ZW1vdGVPYmplY3QucHJldmlldy5wcm9wZXJ0eVByZXZpZXdzKSB7CiAgICAgICAgICAgICBpZiAo cHJvcGVydHlQcmV2aWV3LnR5cGUgPT09ICJzdHJpbmciIHx8IHByb3BlcnR5UHJldmlldy50eXBl ID09PSAibnVtYmVyIikKICAgICAgICAgICAgICAgICBleHRyYWN0ZWRDb2x1bW5OYW1lcy5wdXNo KFN0cmluZyhwcm9wZXJ0eVByZXZpZXcudmFsdWUpKTsKICAgICAgICAgfQpAQCAtMzk3LDI3ICsz ODMsMjkgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlSW1wbC5wcm90b3R5cGUgPSB7CiAg ICAgICAgIH0KIAogICAgICAgICAvLyBDaGVjayBmaXJzdCBmb3IgdmFsdWVQcmV2aWV3cyBpbiB0 aGUgcHJvcGVydGllcyBtZWFuaW5nIHRoaXMgd2FzIGFuIGFycmF5IG9mIG9iamVjdHMuCi0gICAg ICAgIGZvciAodmFyIGkgPSAwOyBpIDwgcHJldmlldy5wcm9wZXJ0aWVzLmxlbmd0aDsgKytpKSB7 Ci0gICAgICAgICAgICB2YXIgcm93UHJvcGVydHkgPSBwcmV2aWV3LnByb3BlcnRpZXNbaV07Ci0g ICAgICAgICAgICB2YXIgcm93UHJldmlldyA9IHJvd1Byb3BlcnR5LnZhbHVlUHJldmlldzsKLSAg ICAgICAgICAgIGlmICghcm93UHJldmlldykKLSAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAg ICAgICAgaWYgKHByZXZpZXcucHJvcGVydHlQcmV2aWV3cykgeworICAgICAgICAgICAgZm9yICh2 YXIgaSA9IDA7IGkgPCBwcmV2aWV3LnByb3BlcnR5UHJldmlld3MubGVuZ3RoOyArK2kpIHsKKyAg ICAgICAgICAgICAgICB2YXIgcm93UHJvcGVydHkgPSBwcmV2aWV3LnByb3BlcnR5UHJldmlld3Nb aV07CisgICAgICAgICAgICAgICAgdmFyIHJvd1ByZXZpZXcgPSByb3dQcm9wZXJ0eS52YWx1ZVBy ZXZpZXc7CisgICAgICAgICAgICAgICAgaWYgKCFyb3dQcmV2aWV3KQorICAgICAgICAgICAgICAg ICAgICBjb250aW51ZTsKIAotICAgICAgICAgICAgdmFyIHJvd1ZhbHVlID0ge307Ci0gICAgICAg ICAgICBjb25zdCBtYXhDb2x1bW5zVG9SZW5kZXIgPSAxMDsKLSAgICAgICAgICAgIGZvciAodmFy IGogPSAwOyBqIDwgcm93UHJldmlldy5wcm9wZXJ0aWVzLmxlbmd0aDsgKytqKSB7Ci0gICAgICAg ICAgICAgICAgdmFyIGNlbGxQcm9wZXJ0eSA9IHJvd1ByZXZpZXcucHJvcGVydGllc1tqXTsKLSAg ICAgICAgICAgICAgICB2YXIgY29sdW1uUmVuZGVyZWQgPSBjb2x1bW5OYW1lcy5jb250YWlucyhj ZWxsUHJvcGVydHkubmFtZSk7Ci0gICAgICAgICAgICAgICAgaWYgKCFjb2x1bW5SZW5kZXJlZCkg ewotICAgICAgICAgICAgICAgICAgICBpZiAodXNlclByb3ZpZGVkQ29sdW1uTmFtZXMgfHwgY29s dW1uTmFtZXMubGVuZ3RoID09PSBtYXhDb2x1bW5zVG9SZW5kZXIpCi0gICAgICAgICAgICAgICAg ICAgICAgICBjb250aW51ZTsKLSAgICAgICAgICAgICAgICAgICAgY29sdW1uUmVuZGVyZWQgPSB0 cnVlOwotICAgICAgICAgICAgICAgICAgICBjb2x1bW5OYW1lcy5wdXNoKGNlbGxQcm9wZXJ0eS5u YW1lKTsKKyAgICAgICAgICAgICAgICB2YXIgcm93VmFsdWUgPSB7fTsKKyAgICAgICAgICAgICAg ICBjb25zdCBtYXhDb2x1bW5zVG9SZW5kZXIgPSAxMDsKKyAgICAgICAgICAgICAgICBmb3IgKHZh ciBqID0gMDsgaiA8IHJvd1ByZXZpZXcucHJvcGVydHlQcmV2aWV3cy5sZW5ndGg7ICsraikgewor ICAgICAgICAgICAgICAgICAgICB2YXIgY2VsbFByb3BlcnR5ID0gcm93UHJldmlldy5wcm9wZXJ0 eVByZXZpZXdzW2pdOworICAgICAgICAgICAgICAgICAgICB2YXIgY29sdW1uUmVuZGVyZWQgPSBj b2x1bW5OYW1lcy5jb250YWlucyhjZWxsUHJvcGVydHkubmFtZSk7CisgICAgICAgICAgICAgICAg ICAgIGlmICghY29sdW1uUmVuZGVyZWQpIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIGlmICh1 c2VyUHJvdmlkZWRDb2x1bW5OYW1lcyB8fCBjb2x1bW5OYW1lcy5sZW5ndGggPT09IG1heENvbHVt bnNUb1JlbmRlcikKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAg ICAgICAgICAgICAgICAgICAgIGNvbHVtblJlbmRlcmVkID0gdHJ1ZTsKKyAgICAgICAgICAgICAg ICAgICAgICAgIGNvbHVtbk5hbWVzLnB1c2goY2VsbFByb3BlcnR5Lm5hbWUpOworICAgICAgICAg ICAgICAgICAgICB9CisKKyAgICAgICAgICAgICAgICAgICAgcm93VmFsdWVbY2VsbFByb3BlcnR5 Lm5hbWVdID0gV2ViSW5zcGVjdG9yLkZvcm1hdHRlZFZhbHVlLmNyZWF0ZUVsZW1lbnRGb3JQcm9w ZXJ0eVByZXZpZXcoY2VsbFByb3BlcnR5KTsKICAgICAgICAgICAgICAgICB9Ci0KLSAgICAgICAg ICAgICAgICByb3dWYWx1ZVtjZWxsUHJvcGVydHkubmFtZV0gPSB0aGlzLl9wcm9wZXJ0eVByZXZp ZXdFbGVtZW50KGNlbGxQcm9wZXJ0eSk7CisgICAgICAgICAgICAgICAgcm93cy5wdXNoKFtyb3dQ cm9wZXJ0eS5uYW1lLCByb3dWYWx1ZV0pOwogICAgICAgICAgICAgfQotICAgICAgICAgICAgcm93 cy5wdXNoKFtyb3dQcm9wZXJ0eS5uYW1lLCByb3dWYWx1ZV0pOwogICAgICAgICB9CiAKICAgICAg ICAgLy8gSWYgdGhlcmUgd2VyZSB2YWx1ZVByZXZpZXdzLCBjb252ZXJ0IHRvIGEgZmxhdCBsaXN0 LgpAQCAtNDM5LDkgKzQyNyw5IEBAIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZUltcGwucHJv dG90eXBlID0gewogICAgICAgICB9CiAKICAgICAgICAgLy8gSWYgdGhlcmUgd2VyZSBubyB2YWx1 ZSBQcmV2aWV3cywgdGhlbiBjaGVjayBmb3IgYW4gYXJyYXkgb2YgdmFsdWVzLgotICAgICAgICBp ZiAoIWZsYXRWYWx1ZXMubGVuZ3RoKSB7Ci0gICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8 IHByZXZpZXcucHJvcGVydGllcy5sZW5ndGg7ICsraSkgewotICAgICAgICAgICAgICAgIHZhciBy b3dQcm9wZXJ0eSA9IHByZXZpZXcucHJvcGVydGllc1tpXTsKKyAgICAgICAgaWYgKCFmbGF0VmFs dWVzLmxlbmd0aCAmJiBwcmV2aWV3LnByb3BlcnR5UHJldmlld3MpIHsKKyAgICAgICAgICAgIGZv ciAodmFyIGkgPSAwOyBpIDwgcHJldmlldy5wcm9wZXJ0eVByZXZpZXdzLmxlbmd0aDsgKytpKSB7 CisgICAgICAgICAgICAgICAgdmFyIHJvd1Byb3BlcnR5ID0gcHJldmlldy5wcm9wZXJ0eVByZXZp ZXdzW2ldOwogICAgICAgICAgICAgICAgIGlmICghKCJ2YWx1ZSIgaW4gcm93UHJvcGVydHkpKQog ICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKIApAQCAtNDUxLDEzICs0MzksMTMgQEAgV2Vi SW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlSW1wbC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAg ICAgfQogCiAgICAgICAgICAgICAgICAgZmxhdFZhbHVlcy5wdXNoKHJvd1Byb3BlcnR5Lm5hbWUp OwotICAgICAgICAgICAgICAgIGZsYXRWYWx1ZXMucHVzaCh0aGlzLl9wcm9wZXJ0eVByZXZpZXdF bGVtZW50KHJvd1Byb3BlcnR5KSk7CisgICAgICAgICAgICAgICAgZmxhdFZhbHVlcy5wdXNoKFdl Ykluc3BlY3Rvci5Gb3JtYXR0ZWRWYWx1ZS5jcmVhdGVFbGVtZW50Rm9yUHJvcGVydHlQcmV2aWV3 KHJvd1Byb3BlcnR5KSk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KIAogICAgICAgICAvLyBJ ZiBsb3NzbGVzcyBvciBub3QgdGFibGUgZGF0YSwgb3V0cHV0IHRoZSBvYmplY3Qgc28gZnVsbCBk YXRhIGNhbiBiZSBnb3R0ZW4uCiAgICAgICAgIGlmICghcHJldmlldy5sb3NzbGVzcyB8fCAhZmxh dFZhbHVlcy5sZW5ndGgpIHsKLSAgICAgICAgICAgIGVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5f Zm9ybWF0UGFyYW1ldGVyKHRhYmxlLCB0cnVlKSk7CisgICAgICAgICAgICBlbGVtZW50LmFwcGVu ZENoaWxkKHRoaXMuX2Zvcm1hdFBhcmFtZXRlcih0YWJsZSkpOwogICAgICAgICAgICAgaWYgKCFm bGF0VmFsdWVzLmxlbmd0aCkKICAgICAgICAgICAgICAgICByZXR1cm4gZWxlbWVudDsKICAgICAg ICAgfQpAQCAtNDcwLDE4ICs0NTgsNiBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2VJbXBs LnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIGVsZW1lbnQ7CiAgICAgfSwKIAotICAgIF9m b3JtYXRQYXJhbWV0ZXJBc1N0cmluZzogZnVuY3Rpb24ob3V0cHV0LCBlbGVtKQotICAgIHsKLSAg ICAgICAgdmFyIHNwYW4gPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIik7Ci0gICAgICAg IHNwYW4uY2xhc3NOYW1lID0gImNvbnNvbGUtZm9ybWF0dGVkLXN0cmluZyBzb3VyY2UtY29kZSI7 Ci0gICAgICAgIHNwYW4uYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUoIlwiIikp OwotICAgICAgICBzcGFuLmFwcGVuZENoaWxkKFdlYkluc3BlY3Rvci5saW5raWZ5U3RyaW5nQXNG cmFnbWVudChvdXRwdXQuZGVzY3JpcHRpb24ucmVwbGFjZSgvIi9nLCAiXFxcIiIpKSk7Ci0gICAg ICAgIHNwYW4uYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUoIlwiIikpOwotCi0g ICAgICAgIGVsZW0uY2xhc3NMaXN0LnJlbW92ZSgiY29uc29sZS1mb3JtYXR0ZWQtc3RyaW5nIik7 Ci0gICAgICAgIGVsZW0uYXBwZW5kQ2hpbGQoc3Bhbik7Ci0gICAgfSwKLQogICAgIF9wcmludEFy cmF5OiBmdW5jdGlvbihhcnJheSwgZWxlbSwgcHJvcGVydGllcykKICAgICB7CiAgICAgICAgIGlm ICghcHJvcGVydGllcykKQEAgLTY4NSw3ICs2NjEsNyBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZU1l c3NhZ2VJbXBsLnByb3RvdHlwZSA9IHsKIAogICAgICAgICAgICAgdmFyIGNvbnRlbnQgPSBkb2N1 bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKICAgICAgICAgICAgIHZhciBtZXNzYWdlVGV4dEVs ZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIik7Ci0gICAgICAgICAgICBtZXNz YWdlVGV4dEVsZW1lbnQuY2xhc3NOYW1lID0gImNvbnNvbGUtbWVzc2FnZS10ZXh0IHNvdXJjZS1j b2RlIjsKKyAgICAgICAgICAgIG1lc3NhZ2VUZXh0RWxlbWVudC5jbGFzc05hbWUgPSAiY29uc29s ZS1tZXNzYWdlLXRleHQiOwogICAgICAgICAgICAgdmFyIGZ1bmN0aW9uTmFtZSA9IGZyYW1lLmZ1 bmN0aW9uTmFtZSB8fCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIihhbm9ueW1vdXMgZnVuY3Rpb24p Iik7CiAgICAgICAgICAgICBtZXNzYWdlVGV4dEVsZW1lbnQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQu Y3JlYXRlVGV4dE5vZGUoZnVuY3Rpb25OYW1lKSk7CiAgICAgICAgICAgICBjb250ZW50LmFwcGVu ZENoaWxkKG1lc3NhZ2VUZXh0RWxlbWVudCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Gb3JtYXR0ZWRWYWx1ZS5jc3MgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Gb3JtYXR0ZWRWYWx1ZS5jc3MKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZWM4ZjgzZgotLS0gL2Rldi9udWxsCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Zvcm1hdHRlZFZhbHVl LmNzcwpAQCAtMCwwICsxLDU1IEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDE1IEFwcGxlIElu Yy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGlu IHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlv biwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwor ICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJl dGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25k aXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBSZWRpc3RyaWJ1dGlv bnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorICog ICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNj bGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxz IHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJFIElT IFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycnCisg KiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBO T1QgTElNSVRFRCBUTywKKyAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklM SVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NMQUlN RUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUworICog QkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwg RVhFTVBMQVJZLCBPUgorICogQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBO T1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKKyAqIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VS VklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUworICogSU5U RVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFks IFdIRVRIRVIgSU4KKyAqIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJTkNM VURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCisgKiBBUklTSU5HIElOIEFOWSBXQVkgT1VU IE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCisgKiBUSEUg UE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworLmZvcm1hdHRlZC1vYmplY3QsIC5m b3JtYXR0ZWQtbm9kZSwgLmZvcm1hdHRlZC1lcnJvciwgLmZvcm1hdHRlZC1tYXAsIC5mb3JtYXR0 ZWQtc2V0LCAuZm9ybWF0dGVkLXdlYWttYXAgeworICAgIHBvc2l0aW9uOiByZWxhdGl2ZTsKKyAg ICBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7CisgICAgdmVydGljYWwtYWxpZ246IHRvcDsKKyAgICBj b2xvcjogYmxhY2s7Cit9CisKKy5mb3JtYXR0ZWQtbnVtYmVyIHsKKyAgICBjb2xvcjogcmdiKDI4 LCAwLCAyMDcpOworfQorCisuZm9ybWF0dGVkLXN0cmluZywgLmZvcm1hdHRlZC1yZWdleHAgewor ICAgIHdoaXRlLXNwYWNlOiBwcmU7Cit9CisKKy5mb3JtYXR0ZWQtc3RyaW5nIHsKKyAgICBjb2xv cjogcmdiKDE5NiwgMjYsIDIyKTsKK30KKworLmZvcm1hdHRlZC1yZWdleHAgeworICAgIGNvbG9y OiByZ2IoMjU1LCA4OCwgMCk7Cit9CisKKy5mb3JtYXR0ZWQtc3ltYm9sIHsKKyAgICBjb2xvcjog cmdiKDYzLCAxNjksIDE1Nik7Cit9CisKKy5mb3JtYXR0ZWQtbnVsbCwgLmZvcm1hdHRlZC11bmRl ZmluZWQgeworICAgIGNvbG9yOiByZ2IoMTI4LCAxMjgsIDEyOCk7Cit9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Gb3JtYXR0ZWRWYWx1ZS5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Zvcm1hdHRlZFZh bHVlLmpzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmIxM2I4OTcKLS0tIC9k ZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9G b3JtYXR0ZWRWYWx1ZS5qcwpAQCAtMCwwICsxLDkyIEBACisvKgorICogQ29weXJpZ2h0IChDKSAy MDE1IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlv biBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAq IG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcg Y29uZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2Ug Y29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMg bGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBS ZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNv cHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZv bGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3Ro ZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElT IFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMg YGBBUyBJUycnCisgKiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNM VURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0Yg TUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0Ug QVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRS SUJVVE9SUworICogQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRB TCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgorICogQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNM VURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKKyAqIFNVQlNUSVRVVEUg R09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJ TkVTUworICogSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBP RiBMSUFCSUxJVFksIFdIRVRIRVIgSU4KKyAqIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBP UiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCisgKiBBUklTSU5HIElO IEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VE IE9GCisgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworV2ViSW5zcGVj dG9yLkZvcm1hdHRlZFZhbHVlID0ge307CisKK1dlYkluc3BlY3Rvci5Gb3JtYXR0ZWRWYWx1ZS5j bGFzc05hbWVGb3JUeXBlcyA9IGZ1bmN0aW9uKHR5cGUsIHN1YnR5cGUpCit7CisgICAgcmV0dXJu ICJmb3JtYXR0ZWQtIiArIChzdWJ0eXBlID8gc3VidHlwZSA6IHR5cGUpOworfQorCitXZWJJbnNw ZWN0b3IuRm9ybWF0dGVkVmFsdWUuY2xhc3NOYW1lRm9yT2JqZWN0ID0gZnVuY3Rpb24ob2JqZWN0 KQoreworICAgIHJldHVybiBXZWJJbnNwZWN0b3IuRm9ybWF0dGVkVmFsdWUuY2xhc3NOYW1lRm9y VHlwZXMob2JqZWN0LnR5cGUsIG9iamVjdC5zdWJ0eXBlKTsKK30KKworV2ViSW5zcGVjdG9yLkZv cm1hdHRlZFZhbHVlLmNyZWF0ZUxpbmtpZmllZEVsZW1lbnRTdHJpbmcgPSBmdW5jdGlvbihzdHJp bmcpCit7CisgICAgdmFyIHNwYW4gPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIik7Cisg ICAgc3Bhbi5jbGFzc05hbWUgPSAiZm9ybWF0dGVkLXN0cmluZyI7CisgICAgc3Bhbi5hcHBlbmRD aGlsZChkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZSgiXCIiKSk7CisgICAgc3Bhbi5hcHBlbmRDaGls ZChXZWJJbnNwZWN0b3IubGlua2lmeVN0cmluZ0FzRnJhZ21lbnQoc3RyaW5nLnJlcGxhY2UoLyIv ZywgIlxcXCIiKSkpOworICAgIHNwYW4uYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5v ZGUoIlwiIikpOworICAgIHJldHVybiBzcGFuOworfQorCitXZWJJbnNwZWN0b3IuRm9ybWF0dGVk VmFsdWUuY3JlYXRlRWxlbWVudEZvclR5cGVzQW5kVmFsdWUgPSBmdW5jdGlvbih0eXBlLCBzdWJ0 eXBlLCBkaXNwbGF5U3RyaW5nLCBpc1ByZXZpZXcsIGhhZEV4Y2VwdGlvbikKK3sKKyAgICB2YXIg c3BhbiA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInNwYW4iKTsKKyAgICBzcGFuLmNsYXNzTGlz dC5hZGQoV2ViSW5zcGVjdG9yLkZvcm1hdHRlZFZhbHVlLmNsYXNzTmFtZUZvclR5cGVzKHR5cGUs IHN1YnR5cGUpKTsKKworICAgIC8vIEV4Y2VwdGlvbi4KKyAgICBpZiAoaGFkRXhjZXB0aW9uKSB7 CisgICAgICAgIHNwYW4udGV4dENvbnRlbnQgPSAiW0V4Y2VwdGlvbjogIiArIGRpc3BsYXlTdHJp bmcgKyAiXSI7CisgICAgICAgIHJldHVybiBzcGFuOworICAgIH0KKworICAgIC8vIFN0cmluZzog cXVvdGVkIGFuZCByZXBsYWNlIG5ld2xpbmVzIGFzIG5pY2UgdW5pY29kZSBzeW1ib2xzLgorICAg IGlmICh0eXBlID09PSAic3RyaW5nIikgeworICAgICAgICBzcGFuLnRleHRDb250ZW50ID0gIlwi IiArIGRpc3BsYXlTdHJpbmcucmVwbGFjZSgvXG4vZywgIlx1MjFCNSIpLnJlcGxhY2UoLyIvZywg IlxcXCIiKSArICJcIiI7CisgICAgICAgIHJldHVybiBzcGFuOworICAgIH0KKworICAgIC8vIEZ1 bmN0aW9uOiBlbGxpZGVkIGluIHByZXZpZXdzLCBjb2xsYXBzZWQgd2hpdGVzcGFjZSBub3JtYWxs eS4KKyAgICBpZiAodHlwZSA9PT0gImZ1bmN0aW9uIikgeworICAgICAgICBpZiAoaXNQcmV2aWV3 KQorICAgICAgICAgICAgc3Bhbi50ZXh0Q29udGVudCA9ICJmdW5jdGlvbiI7CisgICAgICAgIGVs c2UKKyAgICAgICAgICAgIHNwYW4udGV4dENvbnRlbnQgPSAvLiovLmV4ZWMoZGlzcGxheVN0cmlu ZylbMF0ucmVwbGFjZSgvICskL2csICIiKTsKKyAgICAgICAgcmV0dXJuIHNwYW47CisgICAgfQor CisgICAgLy8gRXZlcnl0aGluZyBlbHNlLCB0aGUgZGVzY3JpcHRpb24vdmFsdWUgc3RyaW5nLgor ICAgIHNwYW4udGV4dENvbnRlbnQgPSBkaXNwbGF5U3RyaW5nOworICAgIHJldHVybiBzcGFuOwor fQorCitXZWJJbnNwZWN0b3IuRm9ybWF0dGVkVmFsdWUuY3JlYXRlRWxlbWVudEZvclJlbW90ZU9i amVjdCA9IGZ1bmN0aW9uKG9iamVjdCwgaGFkRXhjZXB0aW9uKQoreworICAgIHJldHVybiBXZWJJ bnNwZWN0b3IuRm9ybWF0dGVkVmFsdWUuY3JlYXRlRWxlbWVudEZvclR5cGVzQW5kVmFsdWUob2Jq ZWN0LnR5cGUsIG9iamVjdC5zdWJ0eXBlLCBvYmplY3QuZGVzY3JpcHRpb24sIGZhbHNlLCBoYWRF eGNlcHRpb24pOworfQorCitXZWJJbnNwZWN0b3IuRm9ybWF0dGVkVmFsdWUuY3JlYXRlRWxlbWVu dEZvck9iamVjdFByZXZpZXcgPSBmdW5jdGlvbihvYmplY3RQcmV2aWV3KQoreworICAgIHJldHVy biBXZWJJbnNwZWN0b3IuRm9ybWF0dGVkVmFsdWUuY3JlYXRlRWxlbWVudEZvclR5cGVzQW5kVmFs dWUob2JqZWN0UHJldmlldy50eXBlLCBvYmplY3RQcmV2aWV3LnN1YnR5cGUsIG9iamVjdFByZXZp ZXcuZGVzY3JpcHRpb24sIHRydWUsIGZhbHNlKTsKK30KKworV2ViSW5zcGVjdG9yLkZvcm1hdHRl ZFZhbHVlLmNyZWF0ZUVsZW1lbnRGb3JQcm9wZXJ0eVByZXZpZXcgPSBmdW5jdGlvbihwcm9wZXJ0 eVByZXZpZXcpCit7CisgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5Gb3JtYXR0ZWRWYWx1ZS5jcmVh dGVFbGVtZW50Rm9yVHlwZXNBbmRWYWx1ZShwcm9wZXJ0eVByZXZpZXcudHlwZSwgcHJvcGVydHlQ cmV2aWV3LnN1YnR5cGUsIHByb3BlcnR5UHJldmlldy52YWx1ZSwgdHJ1ZSwgZmFsc2UpOworfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTG9n Q29udGVudFZpZXcuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvTG9nQ29udGVudFZpZXcuY3NzCmluZGV4IDAxYzUxYzMuLjg5MTdmZjAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xvZ0NvbnRlbnRWaWV3 LmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Mb2dD b250ZW50Vmlldy5jc3MKQEAgLTQ3LDEwICs0Nyw2IEBACiAgICAgZm9udC1zaXplOiAxMXB4Owog fQogCi0uZXhwYW5kYWJsZS5zb3VyY2UtY29kZSB7Ci0gICAgZGlzcGxheTogYmxvY2s7Ci19Ci0K IC5jb25zb2xlLW1lc3NhZ2VzID4gOmZpcnN0LWNoaWxkIHsKICAgICBtYXJnaW4tdG9wOiBhdXRv OwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvT2JqZWN0UHJldmlld1ZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9PYmplY3RQcmV2aWV3Vmlldy5qcwppbmRleCA1OWQ3NjBhLi4wN2JiM2VlIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9PYmpl Y3RQcmV2aWV3Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9PYmplY3RQcmV2aWV3Vmlldy5qcwpAQCAtMTUzLDcgKzE1Myw3IEBAIFdlYkluc3Bl Y3Rvci5PYmplY3RQcmV2aWV3Vmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgZWxl bWVudC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZSgiOiAiKSk7CiAgICAgICAg ICAgICB9CiAKLSAgICAgICAgICAgIGVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fZm9ybWF0dGVk T2JqZWN0RWxlbWVudEZvclByZXZpZXcocHJvcGVydHksIHByb3BlcnR5LnZhbHVlKSk7CisgICAg ICAgICAgICBlbGVtZW50LmFwcGVuZENoaWxkKFdlYkluc3BlY3Rvci5Gb3JtYXR0ZWRWYWx1ZS5j cmVhdGVFbGVtZW50Rm9yUHJvcGVydHlQcmV2aWV3KHByb3BlcnR5KSk7CiAgICAgICAgIH0KIAog ICAgICAgICBpZiAocHJldmlldy5vdmVyZmxvdykKQEAgLTE2NiwyNiArMTY2LDcgQEAgV2ViSW5z cGVjdG9yLk9iamVjdFByZXZpZXdWaWV3LnByb3RvdHlwZSA9IHsKIAogICAgIF9hcHBlbmRWYWx1 ZVByZXZpZXc6IGZ1bmN0aW9uKGVsZW1lbnQsIHByZXZpZXcpCiAgICAgewotICAgICAgICBlbGVt ZW50LmFwcGVuZENoaWxkKHRoaXMuX2Zvcm1hdHRlZE9iamVjdEVsZW1lbnRGb3JQcmV2aWV3KHBy ZXZpZXcsIHByZXZpZXcuZGVzY3JpcHRpb24pKTsKKyAgICAgICAgZWxlbWVudC5hcHBlbmRDaGls ZChXZWJJbnNwZWN0b3IuRm9ybWF0dGVkVmFsdWUuY3JlYXRlRWxlbWVudEZvck9iamVjdFByZXZp ZXcocHJldmlldykpOwogICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICB9LAotCi0gICAgX2Zvcm1h dHRlZE9iamVjdEVsZW1lbnRGb3JQcmV2aWV3OiBmdW5jdGlvbihwcm9wZXJ0eVByZXZpZXdPck9i amVjdFByZXZpZXcsIHZhbHVlKQotICAgIHsKLSAgICAgICAgdmFyIHNwYW4gPSBkb2N1bWVudC5j cmVhdGVFbGVtZW50KCJzcGFuIik7Ci0gICAgICAgIHNwYW4uY2xhc3NMaXN0LmFkZChXZWJJbnNw ZWN0b3IuT2JqZWN0VHJlZVZpZXcuY2xhc3NOYW1lRm9yT2JqZWN0KHByb3BlcnR5UHJldmlld09y T2JqZWN0UHJldmlldykpOwotCi0gICAgICAgIGlmIChwcm9wZXJ0eVByZXZpZXdPck9iamVjdFBy ZXZpZXcudHlwZSA9PT0gInN0cmluZyIpIHsKLSAgICAgICAgICAgIHNwYW4udGV4dENvbnRlbnQg PSAiXCIiICsgdmFsdWUucmVwbGFjZSgvXG4vZywgIlx1MjFCNSIpLnJlcGxhY2UoLyIvZywgIlxc XCIiKSArICJcIiI7Ci0gICAgICAgICAgICByZXR1cm4gc3BhbjsKLSAgICAgICAgfQotCi0gICAg ICAgIGlmIChwcm9wZXJ0eVByZXZpZXdPck9iamVjdFByZXZpZXcudHlwZSA9PT0gImZ1bmN0aW9u IikgewotICAgICAgICAgICAgc3Bhbi50ZXh0Q29udGVudCA9ICJmdW5jdGlvbiI7Ci0gICAgICAg ICAgICByZXR1cm4gc3BhbjsKLSAgICAgICAgfQotCi0gICAgICAgIHNwYW4udGV4dENvbnRlbnQg PSB2YWx1ZTsKLSAgICAgICAgcmV0dXJuIHNwYW47CiAgICAgfQogfTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL09iamVjdFRyZWVQcm9wZXJ0 eVRyZWVFbGVtZW50LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvT2JqZWN0VHJlZVByb3BlcnR5VHJlZUVsZW1lbnQuanMKaW5kZXggMTBlYzY3Yy4uYmEwMzA2 YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv T2JqZWN0VHJlZVByb3BlcnR5VHJlZUVsZW1lbnQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvT2JqZWN0VHJlZVByb3BlcnR5VHJlZUVsZW1lbnQuanMK QEAgLTk3LDIxICs5NywyMCBAQCBXZWJJbnNwZWN0b3IuT2JqZWN0VHJlZVByb3BlcnR5VHJlZUVs ZW1lbnQucHJvdG90eXBlID0gewogICAgICAgICBzZXBhcmF0b3JFbGVtZW50LnRleHRDb250ZW50 ID0gIjogIjsKIAogICAgICAgICAvLyBWYWx1ZSAvIEdldHRlci4KLSAgICAgICAgdmFyIHZhbHVl T3JHZXR0ZXJFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgic3BhbiIpOwotICAgICAg ICB2YWx1ZU9yR2V0dGVyRWxlbWVudC5jbGFzc05hbWUgPSAidmFsdWUiOwotCisgICAgICAgIHZh ciB2YWx1ZU9yR2V0dGVyRWxlbWVudDsKICAgICAgICAgaWYgKHRoaXMuX3Byb3BlcnR5Lmhhc1Zh bHVlKCkpIHsKLSAgICAgICAgICAgIHZhbHVlT3JHZXR0ZXJFbGVtZW50LnRleHRDb250ZW50ID0g dGhpcy5fZGVzY3JpcHRpb25TdHJpbmcoKTsKLSAgICAgICAgICAgIHZhbHVlT3JHZXR0ZXJFbGVt ZW50LmNsYXNzTGlzdC5hZGQoV2ViSW5zcGVjdG9yLk9iamVjdFRyZWVWaWV3LmNsYXNzTmFtZUZv ck9iamVjdCh0aGlzLl9wcm9wZXJ0eS52YWx1ZSkpOworICAgICAgICAgICAgdmFsdWVPckdldHRl ckVsZW1lbnQgPSBXZWJJbnNwZWN0b3IuRm9ybWF0dGVkVmFsdWUuY3JlYXRlRWxlbWVudEZvclJl bW90ZU9iamVjdCh0aGlzLl9wcm9wZXJ0eS52YWx1ZSwgdGhpcy5fcHJvcGVydHkud2FzVGhyb3du KTsKICAgICAgICAgICAgIC8vIEZJWE1FOiBDb250ZXh0IE1lbnUgZm9yIFZhbHVlLiAoU2VlIE9i amVjdFByb3BlcnRpZXNTZWN0aW9uKS4KICAgICAgICAgICAgIC8vIEZJWE1FOiBPcHRpb24rQ2xp Y2sgZm9yIFZhbHVlLgogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgY29uc29sZS5hc3Nl cnQodGhpcy5fcHJvcGVydHkuaGFzR2V0dGVyKCkpOworICAgICAgICAgICAgdmFsdWVPckdldHRl ckVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIik7CiAgICAgICAgICAgICB2 YWx1ZU9yR2V0dGVyRWxlbWVudC50ZXh0Q29udGVudCA9ICIoLi4uKSI7CiAgICAgICAgICAgICAv LyBGSVhNRTogQ2xpY2sgdG8gUG9wdWxhdGUgVmFsdWUuCiAgICAgICAgICAgICAvLyBGSVhNRTog Q29udGV4dCBNZW51IHRvIFBvcHVsYXRlIFZhbHVlLgogICAgICAgICB9CiAKKyAgICAgICAgdmFs dWVPckdldHRlckVsZW1lbnQuY2xhc3NMaXN0LmFkZCgidmFsdWUiKTsKICAgICAgICAgaWYgKHRo aXMuX3Byb3BlcnR5Lndhc1Rocm93bikKICAgICAgICAgICAgIHZhbHVlT3JHZXR0ZXJFbGVtZW50 LmNsYXNzTGlzdC5hZGQoImVycm9yIik7CiAKQEAgLTE1OCwyNiArMTU3LDYgQEAgV2ViSW5zcGVj dG9yLk9iamVjdFRyZWVQcm9wZXJ0eVRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICAgICAg fQogICAgIH0sCiAKLSAgICBfZGVzY3JpcHRpb25TdHJpbmc6IGZ1bmN0aW9uKCkKLSAgICB7Ci0g ICAgICAgIHZhciB2YWx1ZSA9IHRoaXMuX3Byb3BlcnR5LnZhbHVlOwotICAgICAgICB2YXIgZGVz Y3JpcHRpb24gPSB2YWx1ZS5kZXNjcmlwdGlvbjsKLQotICAgICAgICAvLyBFeGNlcHRpb24uCi0g ICAgICAgIGlmICh0aGlzLl9wcm9wZXJ0eS53YXNUaHJvd24pCi0gICAgICAgICAgICByZXR1cm4g IltFeGNlcHRpb246ICIgKyBkZXNjcmlwdGlvbiArICJdIjsKLQotICAgICAgICAvLyBTdHJpbmc6 IHJlcGxhY2UgbmV3bGluZXMgYXMgbmljZSB1bmljb2RlIHN5bWJvbHMuCi0gICAgICAgIGlmICh2 YWx1ZS50eXBlID09PSAic3RyaW5nIikKLSAgICAgICAgICAgIHJldHVybiAiXCIiICsgZGVzY3Jp cHRpb24ucmVwbGFjZSgvXG4vZywgIlx1MjFCNSIpLnJlcGxhY2UoLyIvZywgIlxcXCIiKSArICJc IiI7Ci0KLSAgICAgICAgLy8gRnVuY3Rpb246IENvbGxhcHNlIHdoaXRlc3BhY2UgaW4gZnVuY3Rp b24gZGlzcGxheSBzdHJpbmdzLgotICAgICAgICBpZiAodmFsdWUudHlwZSA9PT0gImZ1bmN0aW9u IikKLSAgICAgICAgICAgIHJldHVybiAvLiovLmV4ZWMoZGVzY3JpcHRpb24pWzBdLnJlcGxhY2Uo LyArJC9nLCAiIik7Ci0KLSAgICAgICAgcmV0dXJuIGRlc2NyaXB0aW9uOwotICAgIH0sCi0KICAg ICBfZnVuY3Rpb25QYXJhbWV0ZXJTdHJpbmc6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIGNv bnNvbGUuYXNzZXJ0KHRoaXMuX3Byb3BlcnR5LnZhbHVlLnR5cGUgPT09ICJmdW5jdGlvbiIpOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvT2Jq ZWN0VHJlZVZpZXcuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvT2JqZWN0VHJlZVZpZXcuY3NzCmluZGV4IGE4ZGZkNTEuLjUyYWUwOTAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL09iamVjdFRyZWVWaWV3 LmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9PYmpl Y3RUcmVlVmlldy5jc3MKQEAgLTE0Miw0MCArMTQyLDYgQEAKIH0KIAogCi0vKiBPYmplY3QgVHJl ZSBUeXBlIENvbG9ycyAqLwotCi0uZm9ybWF0dGVkLW9iamVjdCwgLmZvcm1hdHRlZC1ub2RlLCAu Zm9ybWF0dGVkLWVycm9yLCAuZm9ybWF0dGVkLW1hcCwgLmZvcm1hdHRlZC1zZXQsIC5mb3JtYXR0 ZWQtd2Vha21hcCB7Ci0gICAgcG9zaXRpb246IHJlbGF0aXZlOwotICAgIGRpc3BsYXk6IGlubGlu ZS1ibG9jazsKLSAgICB2ZXJ0aWNhbC1hbGlnbjogdG9wOwotICAgIGNvbG9yOiBibGFjazsKLX0K LQotLmZvcm1hdHRlZC1udW1iZXIgewotICAgIGNvbG9yOiByZ2IoMjgsIDAsIDIwNyk7Ci19Ci0K LS5mb3JtYXR0ZWQtc3RyaW5nLCAuZm9ybWF0dGVkLXJlZ2V4cCB7Ci0gICAgd2hpdGUtc3BhY2U6 IHByZTsKLX0KLQotLmZvcm1hdHRlZC1zdHJpbmcgewotICAgIGNvbG9yOiByZ2IoMTk2LCAyNiwg MjIpOwotfQotCi0uZm9ybWF0dGVkLXJlZ2V4cCB7Ci0gICAgY29sb3I6IHJnYigyNTUsIDg4LCAw KTsKLX0KLQotLmZvcm1hdHRlZC1zeW1ib2wgewotICAgIGNvbG9yOiByZ2IoNjMsIDE2OSwgMTU2 KTsKLX0KLQotLmZvcm1hdHRlZC1udWxsLCAuZm9ybWF0dGVkLXVuZGVmaW5lZCB7Ci0gICAgY29s b3I6IHJnYigxMjgsIDEyOCwgMTI4KTsKLX0KLQotCiAvKiBDb25zb2xlIE92ZXJyaWRlcyAqLwog CiAuY29uc29sZS1ncm91cC1tZXNzYWdlcyAub2JqZWN0LXRyZWU6bm90KC5sb3NzbGVzcy1wcmV2 aWV3KSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9PYmplY3RUcmVlVmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL09iamVjdFRyZWVWaWV3LmpzCmluZGV4IGQ0YjhjYTguLmMxYTE2NTcgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL09iamVjdFRy ZWVWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L09iamVjdFRyZWVWaWV3LmpzCkBAIC03MSwxMSArNzEsNiBAQCBXZWJJbnNwZWN0b3IuT2JqZWN0 VHJlZVZpZXcuTW9kZSA9IHsKICAgICBBUEk6IFN5bWJvbCgib2JqZWN0LXRyZWUtYXBpIiksCiB9 OwogCi1XZWJJbnNwZWN0b3IuT2JqZWN0VHJlZVZpZXcuY2xhc3NOYW1lRm9yT2JqZWN0ID0gZnVu Y3Rpb24ob2JqZWN0KQotewotICAgIHJldHVybiAiZm9ybWF0dGVkLSIgKyAob2JqZWN0LnN1YnR5 cGUgPyBvYmplY3Quc3VidHlwZSA6IG9iamVjdC50eXBlKTsKLX0KLQogV2ViSW5zcGVjdG9yLk9i amVjdFRyZWVWaWV3LkNvbXBhcmVQcm9wZXJ0eURlc2NyaXB0b3JzID0gZnVuY3Rpb24ocHJvcGVy dHlBLCBwcm9wZXJ0eUIpCiB7CiAgICAgdmFyIGEgPSBwcm9wZXJ0eUEubmFtZTsK