213531 2020-06-23 14:02:42 -0700 Web Inspector: add a tooltip to the icon of overridden resources to clarify meaning 2020-06-23 16:22:14 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 hi hi bburg hi inspector-bugzilla-changes webkit-bug-importer oldest_to_newest 1665534 0 hi 2020-06-23 14:02:42 -0700 The inverted icon is not immediately explanatory (although it is quickly identifiable), so we should add a `title` to provide it. 1665536 1 402589 hi 2020-06-23 14:06:51 -0700 Created attachment 402589 Patch 1665570 2 402589 bburg 2020-06-23 15:43:52 -0700 Comment on attachment 402589 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=402589&action=review r=me > Source/WebInspectorUI/ChangeLog:30 > + Add a `title` to the overriden resource icon that clarifies the fact that the resource was Nit: overridden > Source/WebInspectorUI/UserInterface/Views/DataGridNode.js:410 > + // Subclasses may override Nit: trailing period 1665575 3 402601 hi 2020-06-23 15:54:58 -0700 Created attachment 402601 Patch 1665587 4 ews-feeder 2020-06-23 16:21:43 -0700 Committed r263429: <https://trac.webkit.org/changeset/263429> All reviewed patches have been landed. Closing bug and clearing flags on attachment 402601. 1665588 5 webkit-bug-importer 2020-06-23 16:22:14 -0700 <rdar://problem/64669960> 402589 2020-06-23 14:06:51 -0700 2020-06-23 15:54:58 -0700 Patch bug-213531-20200623140650.patch text/plain 23082 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDI1YzkyMmFlNzdlZDAzYmM2MzVmN2FjYzUxNzFl MDA2MWJjYmE3YzkuLjA4YTk1ODA1N2ZiYTI3MmE2ZmYyZWVmM2RmZDhkMDdmNDgyNGU5MDIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ3IEBACisyMDIwLTA2LTIzICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBh ZGQgYSB0b29sdGlwIHRvIHRoZSBpY29uIG9mIG92ZXJyaWRkZW4gcmVzb3VyY2VzIHRvIGNsYXJp ZnkgbWVhbmluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjEzNTMxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0xvY2FsUmVzb3VyY2VPdmVycmlkZVdhcm5pbmdWaWV3 LmpzOgorICAgICAgICAoV0kuTG9jYWxSZXNvdXJjZU92ZXJyaWRlV2FybmluZ1ZpZXcucHJvdG90 eXBlLmluaXRpYWxMYXlvdXQpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvUmVzb3Vy Y2VIZWFkZXJzQ29udGVudFZpZXcuanM6CisgICAgICAgIChXSS5SZXNvdXJjZUhlYWRlcnNDb250 ZW50Vmlldy5wcm90b3R5cGUuX3Jlc3BvbnNlU291cmNlRGlzcGxheVN0cmluZyk6CisgICAgICAg IFJlcGhyYXNlICJsb2NhbCByZXNvdXJjZSBvdmVycmlkZSIgdG8ganVzdCAibG9jYWwgb3ZlcnJp ZGUiIHRvIG1hdGNoIHRoZSByZWZlcmVuY2UgcGFnZSBuYW1lLgorCisgICAgICAgICogVXNlcklu dGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFibGVDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLk5l dHdvcmtUYWJsZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5fcG9wdWxhdGVOYW1lQ2VsbC5jcmVhdGVJ Y29uRWxlbWVudCk6CisgICAgICAgIChXSS5OZXR3b3JrVGFibGVDb250ZW50Vmlldy5wcm90b3R5 cGUuX3BvcHVsYXRlTmFtZUNlbGwpOgorICAgICAgICAoV0kuTmV0d29ya1RhYmxlQ29udGVudFZp ZXcucHJvdG90eXBlLl9wb3B1bGF0ZVRyYW5zZmVyU2l6ZUNlbGwpOgorICAgICAgICBBZGQgYSBg dGl0bGVgIGZvciB0aGUgc3BlY2lhbCB0cmFuc2ZlciBzaXplIGNhc2VzLCBzdWNoIGFzIGZvciBg KGxvY2FsIG92ZXJyaWRlKWAuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291 cmNlVHJlZUVsZW1lbnQuanM6CisgICAgICAgIChXSS5SZXNvdXJjZVRyZWVFbGVtZW50LnByb3Rv dHlwZS5fdXBkYXRlSWNvbik6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJj ZVNpemVzQ29udGVudFZpZXcuanM6CisgICAgICAgIChXSS5SZXNvdXJjZVNpemVzQ29udGVudFZp ZXcucHJvdG90eXBlLmluaXRpYWxMYXlvdXQpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmll d3MvVGltZWxpbmVEYXRhR3JpZE5vZGUuanM6CisgICAgICAgIChXSS5UaW1lbGluZURhdGFHcmlk Tm9kZS5wcm90b3R5cGUuY3JlYXRlQ2VsbENvbnRlbnQpOgorICAgICAgICAoV0kuVGltZWxpbmVE YXRhR3JpZE5vZGUucHJvdG90eXBlLmdlbmVyYXRlSWNvblRpdGxlKTogQWRkZWQuCisgICAgICAg ICogVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZVRpbWVsaW5lRGF0YUdyaWROb2RlLmpzOgor ICAgICAgICAoV0kuUmVzb3VyY2VUaW1lbGluZURhdGFHcmlkTm9kZS5wcm90b3R5cGUuZ2V0IGRh dGEpOgorICAgICAgICAoV0kuUmVzb3VyY2VUaW1lbGluZURhdGFHcmlkTm9kZS5wcm90b3R5cGUu Z2VuZXJhdGVJY29uVGl0bGUpOiBBZGRlZC4KKyAgICAgICAgQWRkIGEgYHRpdGxlYCB0byB0aGUg b3ZlcnJpZGVuIHJlc291cmNlIGljb24gdGhhdCBjbGFyaWZpZXMgdGhlIGZhY3QgdGhhdCB0aGUg cmVzb3VyY2Ugd2FzCisgICAgICAgIG92ZXJyaWRkZW4gYnkgYSBsb2NhbCBvdmVycmlkZS4KKwor ICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTGF5b3V0VGltZWxpbmVEYXRhR3JpZE5vZGUu anM6CisgICAgICAgIChXSS5MYXlvdXRUaW1lbGluZURhdGFHcmlkTm9kZS5wcm90b3R5cGUuZ2V0 IGRhdGEpOgorICAgICAgICBDYWNoZSB0aGUgYGluaXRpYXRvckNhbGxGcmFtZWAgaW4gdGhlIGBz b3VyY2VgIGNvbHVtbiBhcyB3ZWxsIGFzIHRoZSBgaW5pdGlhdG9yYCBjb2x1bW4sIGFzCisgICAg ICAgIGl0IGlzIHVzZWQgYnkgdGhlIGdlbmVyYWwgdGltZWxpbmUgb3ZlcnZpZXcgdGFibGUuCisK KyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFHcmlkTm9kZS5qczoKKyAgICAgICAg KFdJLkRhdGFHcmlkTm9kZS5wcm90b3R5cGUuY3JlYXRlQ2VsbCk6CisgICAgICAgIChXSS5EYXRh R3JpZE5vZGUucHJvdG90eXBlLmdlbmVyYXRlSWNvblRpdGxlKTogQWRkZWQuCisgICAgICAgIFBy b3ZpZGUgYSB3YXkgdG8gc2V0IGEgYHRpdGxlYCBvbiBqdXN0IHRoZSBpY29uLgorCisgICAgICAg ICogTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzOgorCiAyMDIwLTA2 LTIzICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5z cGVjdG9yOiBhZGp1c3QgaGVpZ2h0IG9mIHVuZG9ja2VkIHRpdGxlIGFyZWEgdG8gbWF0Y2ggbWFj T1MgQmlnIFN1cgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlv bnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9M b2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKaW5kZXggYjg4ZGU0ZGI2 YTZlMDJlOTM3YWQ4YzAzZWUyNjJlNjA4MWU5YjczOC4uYzVmMzU4MWY1MmUxNTRiNjBjNjIyMDVk MzYxNmY2Y2JlY2UyNGE2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2Fs aXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCkBAIC03 OSw3ICs3OSw3IEBAIGxvY2FsaXplZFN0cmluZ3NbIihUYWlsIENhbGwpIl0gPSAiKFRhaWwgQ2Fs bCkiOwogbG9jYWxpemVkU3RyaW5nc1siKGFub255bW91cyBmdW5jdGlvbikiXSA9ICIoYW5vbnlt b3VzIGZ1bmN0aW9uKSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyIoYXN5bmMpIl0gPSAiKGFzeW5jKSI7 CiBsb2NhbGl6ZWRTdHJpbmdzWyIoZGlzaykiXSA9ICIoZGlzaykiOwotbG9jYWxpemVkU3RyaW5n c1siKGluc3BlY3RvciBvdmVycmlkZSkiXSA9ICIoaW5zcGVjdG9yIG92ZXJyaWRlKSI7Citsb2Nh bGl6ZWRTdHJpbmdzWyIobG9jYWwgb3ZlcnJpZGUpIl0gPSAiKGxvY2FsIG92ZXJyaWRlKSI7CiBs b2NhbGl6ZWRTdHJpbmdzWyIobWFueSkiXSA9ICIobWFueSkiOwogbG9jYWxpemVkU3RyaW5nc1si KG1lbW9yeSkiXSA9ICIobWVtb3J5KSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyIobXVsdGlwbGUpIl0g PSAiKG11bHRpcGxlKSI7CkBAIC03MDEsNyArNzAxLDYgQEAgbG9jYWxpemVkU3RyaW5nc1siSW5w dXQ6ICJdID0gIklucHV0OiAiOwogLyogQ2hlY2tib3ggbGFiZWwgZm9yIHRoZSBpbnNldCBvZiBh IENTUyBib3ggc2hhZG93LiAqLwogbG9jYWxpemVkU3RyaW5nc1siSW5zZXQgQCBCb3ggU2hhZG93 IEVkaXRvciJdID0gIkluc2V0IjsKIGxvY2FsaXplZFN0cmluZ3NbIkluc3BlY3RvciBCb290c3Ry YXAgU2NyaXB0Il0gPSAiSW5zcGVjdG9yIEJvb3RzdHJhcCBTY3JpcHQiOwotbG9jYWxpemVkU3Ry aW5nc1siSW5zcGVjdG9yIE92ZXJyaWRlIl0gPSAiSW5zcGVjdG9yIE92ZXJyaWRlIjsKIGxvY2Fs aXplZFN0cmluZ3NbIkluc3BlY3RvciBTdHlsZSBTaGVldCJdID0gIkluc3BlY3RvciBTdHlsZSBT aGVldCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJJbnN0YW5jZXMiXSA9ICJJbnN0YW5jZXMiOwogbG9j YWxpemVkU3RyaW5nc1siSW52YWxpZCJdID0gIkludmFsaWQiOwpAQCAtMTI1NCw3ICsxMjUzLDYg QEAgbG9jYWxpemVkU3RyaW5nc1siVGhlc2UgdGVzdHMgZGVtb25zdHJhdGUgaG93IHRvIHVzZSAl cyB0byBnZXQgaW5mb3JtYXRpb24gYWJvdXQKIGxvY2FsaXplZFN0cmluZ3NbIlRoZXNlIHRlc3Rz IGRlbW9uc3RyYXRlIGhvdyB0byB1c2UgJXMgdG8gZ2V0IGluZm9ybWF0aW9uIGFib3V0IGxvYWRl ZCByZXNvdXJjZXMuIl0gPSAiVGhlc2UgdGVzdHMgZGVtb25zdHJhdGUgaG93IHRvIHVzZSAlcyB0 byBnZXQgaW5mb3JtYXRpb24gYWJvdXQgbG9hZGVkIHJlc291cmNlcy4iOwogbG9jYWxpemVkU3Ry aW5nc1siVGhlc2UgdGVzdHMgZGVtb25zdHJhdGUgaG93IHRvIHVzZSAlcyB0byBnZXQgaW5mb3Jt YXRpb24gYWJvdXQgdGhlIGFjY2Vzc2liaWxpdHkgdHJlZS4iXSA9ICJUaGVzZSB0ZXN0cyBkZW1v bnN0cmF0ZSBob3cgdG8gdXNlICVzIHRvIGdldCBpbmZvcm1hdGlvbiBhYm91dCB0aGUgYWNjZXNz aWJpbGl0eSB0cmVlLiI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJUaGVzZSB0ZXN0cyBzZXJ2ZSBhcyBh IGRlbW9uc3RyYXRpb24gb2YgdGhlIGZ1bmN0aW9uYWxpdHkgYW5kIHN0cnVjdHVyZSBvZiBhdWRp dHMuIl0gPSAiVGhlc2UgdGVzdHMgc2VydmUgYXMgYSBkZW1vbnN0cmF0aW9uIG9mIHRoZSBmdW5j dGlvbmFsaXR5IGFuZCBzdHJ1Y3R1cmUgb2YgYXVkaXRzLiI7Ci1sb2NhbGl6ZWRTdHJpbmdzWyJU aGlzIFJlc291cmNlIGNhbWUgZnJvbSBhIExvY2FsIFJlc291cmNlIE92ZXJyaWRlIl0gPSAiVGhp cyBSZXNvdXJjZSBjYW1lIGZyb20gYSBMb2NhbCBSZXNvdXJjZSBPdmVycmlkZSI7CiBsb2NhbGl6 ZWRTdHJpbmdzWyJUaGlzIGFjdGlvbiBjYXVzZXMgbm8gdmlzdWFsIGNoYW5nZSJdID0gIlRoaXMg YWN0aW9uIGNhdXNlcyBubyB2aXN1YWwgY2hhbmdlIjsKIGxvY2FsaXplZFN0cmluZ3NbIlRoaXMg YWN0aW9uIG1vdmVzIHRoZSBwYXRoIG91dHNpZGUgdGhlIHZpc2libGUgYXJlYSJdID0gIlRoaXMg YWN0aW9uIG1vdmVzIHRoZSBwYXRoIG91dHNpZGUgdGhlIHZpc2libGUgYXJlYSI7CiBsb2NhbGl6 ZWRTdHJpbmdzWyJUaGlzIGFuaW1hdGlvbiBoYXMgbm8gZHVyYXRpb24uIl0gPSAiVGhpcyBhbmlt YXRpb24gaGFzIG5vIGR1cmF0aW9uLiI7CkBAIC0xMjcxLDYgKzEyNjksMTEgQEAgbG9jYWxpemVk U3RyaW5nc1siVGhpcyBpcyB3aGF0IHRoZSByZXN1bHQgb2YgYSB3YXJuaW5nIHRlc3Qgd2l0aCBu byBkYXRhIGxvb2tzIGwKIGxvY2FsaXplZFN0cmluZ3NbIlRoaXMgaXMgd2hhdCB0aGUgcmVzdWx0 IG9mIGFuIHVuc3VwcG9ydGVkIHRlc3Qgd2l0aCBubyBkYXRhIGxvb2tzIGxpa2UuIl0gPSAiVGhp cyBpcyB3aGF0IHRoZSByZXN1bHQgb2YgYW4gdW5zdXBwb3J0ZWQgdGVzdCB3aXRoIG5vIGRhdGEg bG9va3MgbGlrZS4iOwogbG9jYWxpemVkU3RyaW5nc1siVGhpcyBvYmplY3QgaXMgYSByb290Il0g PSAiVGhpcyBvYmplY3QgaXMgYSByb290IjsKIGxvY2FsaXplZFN0cmluZ3NbIlRoaXMgb2JqZWN0 IGlzIHJlZmVyZW5jZWQgYnkgaW50ZXJuYWwgb2JqZWN0cyJdID0gIlRoaXMgb2JqZWN0IGlzIHJl ZmVyZW5jZWQgYnkgaW50ZXJuYWwgb2JqZWN0cyI7Citsb2NhbGl6ZWRTdHJpbmdzWyJUaGlzIHJl c291cmNlIGNhbWUgZnJvbSBhIGxvY2FsIG92ZXJyaWRlIl0gPSAiVGhpcyByZXNvdXJjZSBjYW1l IGZyb20gYSBsb2NhbCBvdmVycmlkZSI7Citsb2NhbGl6ZWRTdHJpbmdzWyJUaGlzIHJlc291cmNl IHdhcyBsb2FkZWQgZnJvbSBhIGxvY2FsIG92ZXJyaWRlIl0gPSAiVGhpcyByZXNvdXJjZSB3YXMg bG9hZGVkIGZyb20gYSBsb2NhbCBvdmVycmlkZSI7Citsb2NhbGl6ZWRTdHJpbmdzWyJUaGlzIHJl c291cmNlIHdhcyBsb2FkZWQgZnJvbSBhIHNlcnZpY2Ugd29ya2VyIl0gPSAiVGhpcyByZXNvdXJj ZSB3YXMgbG9hZGVkIGZyb20gYSBzZXJ2aWNlIHdvcmtlciI7Citsb2NhbGl6ZWRTdHJpbmdzWyJU aGlzIHJlc291cmNlIHdhcyBsb2FkZWQgZnJvbSB0aGUgZGlzayBjYWNoZSJdID0gIlRoaXMgcmVz b3VyY2Ugd2FzIGxvYWRlZCBmcm9tIHRoZSBkaXNrIGNhY2hlIjsKK2xvY2FsaXplZFN0cmluZ3Nb IlRoaXMgcmVzb3VyY2Ugd2FzIGxvYWRlZCBmcm9tIHRoZSBtZW1vcnkgY2FjaGUiXSA9ICJUaGlz IHJlc291cmNlIHdhcyBsb2FkZWQgZnJvbSB0aGUgbWVtb3J5IGNhY2hlIjsKIGxvY2FsaXplZFN0 cmluZ3NbIlRoaXMgdGVzdCB3aWxsIHBhc3Mgd2l0aCBhIHZhcmlldHkgb2YgYWNjZXNzaWJpbGl0 eSBpbmZvcm1hdGlvbiBhYm91dCB0aGUgPGJvZHk+IGVsZW1lbnQuIl0gPSAiVGhpcyB0ZXN0IHdp bGwgcGFzcyB3aXRoIGEgdmFyaWV0eSBvZiBhY2Nlc3NpYmlsaXR5IGluZm9ybWF0aW9uIGFib3V0 IHRoZSA8Ym9keT4gZWxlbWVudC4iOwogbG9jYWxpemVkU3RyaW5nc1siVGhpcyB0ZXN0IHdpbGwg cGFzcyB3aXRoIGFsbCBET00gbm9kZXMgdGhhdCBoYXZlIGEgY29tcHV0ZWQgcm9sZSBvZiBcdTAw MjJsaW5rXHUwMDIyLiJdID0gIlRoaXMgdGVzdCB3aWxsIHBhc3Mgd2l0aCBhbGwgRE9NIG5vZGVz IHRoYXQgaGF2ZSBhIGNvbXB1dGVkIHJvbGUgb2YgXHUwMDIybGlua1x1MDAyMi4iOwogbG9jYWxp emVkU3RyaW5nc1siVGhpcyB0ZXN0IHdpbGwgcGFzcyB3aXRoIGFsbCBjaGlsZCBub2RlcyB0aGF0 IGFyZSBzZWxlY3RlZCAoXHUwMDIyJXNcdTAwMjIpIG9mIHRoZSA8Ym9keT4gZWxlbWVudCBpbiB0 aGUgYWNjZXNzaWJpbGl0eSB0cmVlLiJdID0gIlRoaXMgdGVzdCB3aWxsIHBhc3Mgd2l0aCBhbGwg Y2hpbGQgbm9kZXMgdGhhdCBhcmUgc2VsZWN0ZWQgKFx1MDAyMiVzXHUwMDIyKSBvZiB0aGUgPGJv ZHk+IGVsZW1lbnQgaW4gdGhlIGFjY2Vzc2liaWxpdHkgdHJlZS4iOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGF0YUdyaWROb2RlLmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGF0YUdyaWROb2RlLmpz CmluZGV4IGFjZjhkZTNjZWY4Y2Q1MWFhNzhlMmExYjkwNTMxZWJiMzY4Nzg2YzIuLmY2N2JjNTBi Y2Y5M2UxOGExMjY1NjE5MzBmZDliNTM4MTRlYTUzYjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFHcmlkTm9kZS5qcworKysgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EYXRhR3JpZE5vZGUuanMKQEAg LTM3OCw2ICszNzgsNyBAQCBXSS5EYXRhR3JpZE5vZGUgPSBjbGFzcyBEYXRhR3JpZE5vZGUgZXh0 ZW5kcyBXSS5PYmplY3QKICAgICAgICAgICAgIGlmIChjb2x1bW5bImljb24iXSkgewogICAgICAg ICAgICAgICAgIGxldCBpY29uRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIp OwogICAgICAgICAgICAgICAgIGljb25FbGVtZW50LmNsYXNzTGlzdC5hZGQoImljb24iKTsKKyAg ICAgICAgICAgICAgICBpY29uRWxlbWVudC50aXRsZSA9IHRoaXMuZ2VuZXJhdGVJY29uVGl0bGUo Y29sdW1uSWRlbnRpZmllcik7CiAgICAgICAgICAgICAgICAgZGl2Lmluc2VydEJlZm9yZShpY29u RWxlbWVudCwgZGl2LmZpcnN0Q2hpbGQpOwogICAgICAgICAgICAgfQogICAgICAgICB9CkBAIC00 MDQsNiArNDA1LDEyIEBAIFdJLkRhdGFHcmlkTm9kZSA9IGNsYXNzIERhdGFHcmlkTm9kZSBleHRl bmRzIFdJLk9iamVjdAogICAgICAgICByZXR1cm4gdHlwZW9mIGRhdGEgPT09ICJudW1iZXIiID8g ZGF0YS5tYXhEZWNpbWFscygyKS50b0xvY2FsZVN0cmluZygpIDogZGF0YTsKICAgICB9CiAKKyAg ICBnZW5lcmF0ZUljb25UaXRsZShjb2x1bW5JZGVudGlmaWVyKQorICAgIHsKKyAgICAgICAgLy8g U3ViY2xhc3NlcyBtYXkgb3ZlcnJpZGUKKyAgICAgICAgcmV0dXJuICIiOworICAgIH0KKwogICAg IGVsZW1lbnRXaXRoQ29sdW1uSWRlbnRpZmllcihjb2x1bW5JZGVudGlmaWVyKQogICAgIHsKICAg ICAgICAgaWYgKCF0aGlzLmRhdGFHcmlkKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5b3V0VGltZWxpbmVEYXRhR3JpZE5vZGUuanMgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9MYXlvdXRUaW1lbGluZURh dGFHcmlkTm9kZS5qcwppbmRleCA1ZTc4ZDRhMjMyNjk3ZTI4ODgwNjUxODNkNjgzYzlhZWEyYjc1 YTVjLi5lNmZhN2JkYjc4NTBjOThjMjZiMDkwNWI0M2JiNDBhZWFhMmZjNmJlIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9MYXlvdXRUaW1lbGlu ZURhdGFHcmlkTm9kZS5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9MYXlvdXRUaW1lbGluZURhdGFHcmlkTm9kZS5qcwpAQCAtNDgsNiArNDgsNyBAQCBX SS5MYXlvdXRUaW1lbGluZURhdGFHcmlkTm9kZSA9IGNsYXNzIExheW91dFRpbWVsaW5lRGF0YUdy aWROb2RlIGV4dGVuZHMgV0kuVGltZQogICAgICAgICB0aGlzLl9jYWNoZWREYXRhLnN0YXJ0VGlt ZSA9IHRoaXMucmVjb3JkLnN0YXJ0VGltZSAtICh0aGlzLmdyYXBoRGF0YVNvdXJjZSA/IHRoaXMu Z3JhcGhEYXRhU291cmNlLnplcm9UaW1lIDogMCk7CiAgICAgICAgIHRoaXMuX2NhY2hlZERhdGEu dG90YWxUaW1lID0gdGhpcy5yZWNvcmQuZHVyYXRpb247CiAgICAgICAgIHRoaXMuX2NhY2hlZERh dGEuaW5pdGlhdG9yID0gdGhpcy5yZWNvcmQuaW5pdGlhdG9yQ2FsbEZyYW1lOworICAgICAgICB0 aGlzLl9jYWNoZWREYXRhLnNvdXJjZSA9IHRoaXMucmVjb3JkLmluaXRpYXRvckNhbGxGcmFtZTsg Ly8gVGltZWxpbmUgT3ZlcnZpZXcKICAgICAgICAgcmV0dXJuIHRoaXMuX2NhY2hlZERhdGE7CiAg ICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9Mb2NhbFJlc291cmNlT3ZlcnJpZGVXYXJuaW5nVmlldy5qcyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xvY2FsUmVzb3VyY2VPdmVycmlkZVdhcm5pbmdW aWV3LmpzCmluZGV4IDUwYzcwMDFhMWI3OGE2NDRmNzYyNzY3ODNhZDVkNjY5N2UzOGJhM2MuLmU3 NDI4NDNlYWE3ZDQ0MGZjODM3MTE4YWQ0YzU2MDU1MTk2NWQwYjMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xvY2FsUmVzb3VyY2VPdmVycmlk ZVdhcm5pbmdWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0xvY2FsUmVzb3VyY2VPdmVycmlkZVdhcm5pbmdWaWV3LmpzCkBAIC02Nyw3ICs2Nyw3 IEBAIFdJLkxvY2FsUmVzb3VyY2VPdmVycmlkZVdhcm5pbmdWaWV3ID0gY2xhc3MgTG9jYWxSZXNv dXJjZU92ZXJyaWRlV2FybmluZ1ZpZXcgZXh0CiAgICAgICAgIH0pOwogCiAgICAgICAgIGxldCBj b250YWluZXIgPSB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVu dCgiZGl2IikpOwotICAgICAgICBjb250YWluZXIuYXBwZW5kKHRoaXMuX3JldmVhbEJ1dHRvbiwg V0kuVUlTdHJpbmcoIlRoaXMgUmVzb3VyY2UgY2FtZSBmcm9tIGEgTG9jYWwgUmVzb3VyY2UgT3Zl cnJpZGUiKSk7CisgICAgICAgIGNvbnRhaW5lci5hcHBlbmQodGhpcy5fcmV2ZWFsQnV0dG9uLCBX SS5VSVN0cmluZygiVGhpcyByZXNvdXJjZSBjYW1lIGZyb20gYSBsb2NhbCBvdmVycmlkZSIpKTsK IAogICAgICAgICB0aGlzLl91cGRhdGVDb250ZW50KCk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1RhYmxlQ29udGVu dFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3 b3JrVGFibGVDb250ZW50Vmlldy5qcwppbmRleCA1NGU4ZTM3MjRmY2ZlZTJiYmY5ZWYxOGU5MzA2 YzNmNjU5MDRkOTFmLi4xZmRlYzcxY2VjNDc3YzRiYzJiOWMyYmQ0NDRlYTE4YTAzMmJjMTViIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3 b3JrVGFibGVDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFibGVDb250ZW50Vmlldy5qcwpAQCAtNjI0LDYgKzYyNCw3 IEBAIFdJLk5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3ID0gY2xhc3MgTmV0d29ya1RhYmxlQ29udGVu dFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50VmllCiAgICAgICAgIGZ1bmN0aW9uIGNyZWF0ZUljb25F bGVtZW50KCkgewogICAgICAgICAgICAgbGV0IGljb25FbGVtZW50ID0gY2VsbC5hcHBlbmRDaGls ZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJpbWciKSk7CiAgICAgICAgICAgICBpY29uRWxlbWVu dC5jbGFzc05hbWUgPSAiaWNvbiI7CisgICAgICAgICAgICByZXR1cm4gaWNvbkVsZW1lbnQ7CiAg ICAgICAgIH0KIAogICAgICAgICBsZXQgZG9tTm9kZSA9IGVudHJ5LmRvbU5vZGU7CkBAIC02NTcs NyArNjU4LDcgQEAgV0kuTmV0d29ya1RhYmxlQ29udGVudFZpZXcgPSBjbGFzcyBOZXR3b3JrVGFi bGVDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRWaWUKICAgICAgICAgICAgIHN0YXR1c0Vs ZW1lbnQuYXBwZW5kQ2hpbGQoc3Bpbm5lci5lbGVtZW50KTsKICAgICAgICAgfQogCi0gICAgICAg IGNyZWF0ZUljb25FbGVtZW50KCk7CisgICAgICAgIGxldCByZXNvdXJjZUljb25FbGVtZW50ID0g Y3JlYXRlSWNvbkVsZW1lbnQoKTsKIAogICAgICAgICBjZWxsLmNsYXNzTGlzdC5hZGQoV0kuUmVz b3VyY2VUcmVlRWxlbWVudC5SZXNvdXJjZUljb25TdHlsZUNsYXNzTmFtZSwgLi4uV0kuUmVzb3Vy Y2UuY2xhc3NOYW1lc0ZvclJlc291cmNlKHJlc291cmNlKSk7CiAKQEAgLTY3OCw3ICs2NzksOCBA QCBXSS5OZXR3b3JrVGFibGVDb250ZW50VmlldyA9IGNsYXNzIE5ldHdvcmtUYWJsZUNvbnRlbnRW aWV3IGV4dGVuZHMgV0kuQ29udGVudFZpZQogICAgICAgICB9CiAKICAgICAgICAgY2VsbC50aXRs ZSA9IHJlc291cmNlLnVybDsKLSAgICAgICAgY2VsbC5jbGFzc0xpc3QuYWRkKC4uLldJLlJlc291 cmNlLmNsYXNzTmFtZXNGb3JSZXNvdXJjZShyZXNvdXJjZSkpOworICAgICAgICBpZiAocmVzb3Vy Y2UucmVzcG9uc2VTb3VyY2UgPT09IFdJLlJlc291cmNlLlJlc3BvbnNlU291cmNlLkluc3BlY3Rv ck92ZXJyaWRlKQorICAgICAgICAgICAgcmVzb3VyY2VJY29uRWxlbWVudC50aXRsZSA9IFdJLlVJ U3RyaW5nKCJUaGlzIHJlc291cmNlIHdhcyBsb2FkZWQgZnJvbSBhIGxvY2FsIG92ZXJyaWRlIik7 CiAgICAgfQogCiAgICAgX3BvcHVsYXRlRG9tYWluQ2VsbChjZWxsLCBlbnRyeSkKQEAgLTczOSwy MyArNzQxLDI3IEBAIFdJLk5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3ID0gY2xhc3MgTmV0d29ya1Rh YmxlQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50VmllCiAgICAgICAgICAgICBpZiAocmVz b3VyY2VFbnRyaWVzLmV2ZXJ5KChyZXNvdXJjZUVudHJ5KSA9PiByZXNvdXJjZUVudHJ5LnJlc291 cmNlLnJlc3BvbnNlU291cmNlID09PSBXSS5SZXNvdXJjZS5SZXNwb25zZVNvdXJjZS5NZW1vcnlD YWNoZSkpIHsKICAgICAgICAgICAgICAgICBjZWxsLmNsYXNzTGlzdC5hZGQoImNhY2hlLXR5cGUi KTsKICAgICAgICAgICAgICAgICBjZWxsLnRleHRDb250ZW50ID0gV0kuVUlTdHJpbmcoIihtZW1v cnkpIik7CisgICAgICAgICAgICAgICAgY2VsbC50aXRsZSA9IFdJLlVJU3RyaW5nKCJUaGlzIHJl c291cmNlIHdhcyBsb2FkZWQgZnJvbSB0aGUgbWVtb3J5IGNhY2hlIik7CiAgICAgICAgICAgICAg ICAgcmV0dXJuOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgaWYgKHJlc291cmNlRW50cmll cy5ldmVyeSgocmVzb3VyY2VFbnRyeSkgPT4gcmVzb3VyY2VFbnRyeS5yZXNvdXJjZS5yZXNwb25z ZVNvdXJjZSA9PT0gV0kuUmVzb3VyY2UuUmVzcG9uc2VTb3VyY2UuRGlza0NhY2hlKSkgewogICAg ICAgICAgICAgICAgIGNlbGwuY2xhc3NMaXN0LmFkZCgiY2FjaGUtdHlwZSIpOwogICAgICAgICAg ICAgICAgIGNlbGwudGV4dENvbnRlbnQgPSBXSS5VSVN0cmluZygiKGRpc2spIik7CisgICAgICAg ICAgICAgICAgY2VsbC50aXRsZSA9IFdJLlVJU3RyaW5nKCJUaGlzIHJlc291cmNlIHdhcyBsb2Fk ZWQgZnJvbSB0aGUgZGlzayBjYWNoZSIpOwogICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAg ICAgICAgIH0KICAgICAgICAgICAgIGlmIChyZXNvdXJjZUVudHJpZXMuZXZlcnkoKHJlc291cmNl RW50cnkpID0+IHJlc291cmNlRW50cnkucmVzb3VyY2UucmVzcG9uc2VTb3VyY2UgPT09IFdJLlJl c291cmNlLlJlc3BvbnNlU291cmNlLlNlcnZpY2VXb3JrZXIpKSB7CiAgICAgICAgICAgICAgICAg Y2VsbC5jbGFzc0xpc3QuYWRkKCJjYWNoZS10eXBlIik7CiAgICAgICAgICAgICAgICAgY2VsbC50 ZXh0Q29udGVudCA9IFdJLlVJU3RyaW5nKCIoc2VydmljZSB3b3JrZXIpIik7CisgICAgICAgICAg ICAgICAgY2VsbC50aXRsZSA9IFdJLlVJU3RyaW5nKCJUaGlzIHJlc291cmNlIHdhcyBsb2FkZWQg ZnJvbSBhIHNlcnZpY2Ugd29ya2VyIik7CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAg ICAgICAgfQorCisgICAgICAgICAgICBjb25zb2xlLmFzc2VydCghY2VsbC5jbGFzc0xpc3QuY29u dGFpbnMoImNhY2hlLXR5cGUiKSwgIlNob3VsZCBub3QgaGF2ZSBjYWNoZS10eXBlIGNsYXNzIG9u IGNlbGwuIik7CisKICAgICAgICAgICAgIGxldCB0cmFuc2ZlclNpemUgPSByZXNvdXJjZUVudHJp ZXMucmVkdWNlKChhY2N1bXVsYXRvciwgY3VycmVudCkgPT4gYWNjdW11bGF0b3IgKyAoY3VycmVu dC50cmFuc2ZlclNpemUgfHwgMCksIDApOwotICAgICAgICAgICAgaWYgKGlzTmFOKHRyYW5zZmVy U2l6ZSkpCi0gICAgICAgICAgICAgICAgY2VsbC50ZXh0Q29udGVudCA9IGVtRGFzaDsKLSAgICAg ICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICBjZWxsLnRleHRDb250ZW50ID0gTnVtYmVyLmJ5 dGVzVG9TdHJpbmcodHJhbnNmZXJTaXplKTsKKyAgICAgICAgICAgIGNlbGwudGV4dENvbnRlbnQg PSBpc05hTih0cmFuc2ZlclNpemUpID8gZW1EYXNoIDogTnVtYmVyLmJ5dGVzVG9TdHJpbmcodHJh bnNmZXJTaXplKTsKKyAgICAgICAgICAgIGNlbGwudGl0bGUgPSAiIjsKICAgICAgICAgICAgIHJl dHVybjsKICAgICAgICAgfQogCkBAIC03NjMsMjcgKzc2OSwzMyBAQCBXSS5OZXR3b3JrVGFibGVD b250ZW50VmlldyA9IGNsYXNzIE5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29u dGVudFZpZQogICAgICAgICBpZiAocmVzcG9uc2VTb3VyY2UgPT09IFdJLlJlc291cmNlLlJlc3Bv bnNlU291cmNlLk1lbW9yeUNhY2hlKSB7CiAgICAgICAgICAgICBjZWxsLmNsYXNzTGlzdC5hZGQo ImNhY2hlLXR5cGUiKTsKICAgICAgICAgICAgIGNlbGwudGV4dENvbnRlbnQgPSBXSS5VSVN0cmlu ZygiKG1lbW9yeSkiKTsKKyAgICAgICAgICAgIGNlbGwudGl0bGUgPSBXSS5VSVN0cmluZygiVGhp cyByZXNvdXJjZSB3YXMgbG9hZGVkIGZyb20gdGhlIG1lbW9yeSBjYWNoZSIpOwogICAgICAgICAg ICAgcmV0dXJuOwogICAgICAgICB9CiAgICAgICAgIGlmIChyZXNwb25zZVNvdXJjZSA9PT0gV0ku UmVzb3VyY2UuUmVzcG9uc2VTb3VyY2UuRGlza0NhY2hlKSB7CiAgICAgICAgICAgICBjZWxsLmNs YXNzTGlzdC5hZGQoImNhY2hlLXR5cGUiKTsKICAgICAgICAgICAgIGNlbGwudGV4dENvbnRlbnQg PSBXSS5VSVN0cmluZygiKGRpc2spIik7CisgICAgICAgICAgICBjZWxsLnRpdGxlID0gV0kuVUlT dHJpbmcoIlRoaXMgcmVzb3VyY2Ugd2FzIGxvYWRlZCBmcm9tIHRoZSBkaXNrIGNhY2hlIik7CiAg ICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KICAgICAgICAgaWYgKHJlc3BvbnNlU291cmNl ID09PSBXSS5SZXNvdXJjZS5SZXNwb25zZVNvdXJjZS5TZXJ2aWNlV29ya2VyKSB7CiAgICAgICAg ICAgICBjZWxsLmNsYXNzTGlzdC5hZGQoImNhY2hlLXR5cGUiKTsKICAgICAgICAgICAgIGNlbGwu dGV4dENvbnRlbnQgPSBXSS5VSVN0cmluZygiKHNlcnZpY2Ugd29ya2VyKSIpOworICAgICAgICAg ICAgY2VsbC50aXRsZSA9IFdJLlVJU3RyaW5nKCJUaGlzIHJlc291cmNlIHdhcyBsb2FkZWQgZnJv bSBhIHNlcnZpY2Ugd29ya2VyIik7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KICAg ICAgICAgaWYgKHJlc3BvbnNlU291cmNlID09PSBXSS5SZXNvdXJjZS5SZXNwb25zZVNvdXJjZS5J bnNwZWN0b3JPdmVycmlkZSkgewogICAgICAgICAgICAgY2VsbC5jbGFzc0xpc3QuYWRkKCJjYWNo ZS10eXBlIik7Ci0gICAgICAgICAgICBjZWxsLnRleHRDb250ZW50ID0gV0kuVUlTdHJpbmcoIihp bnNwZWN0b3Igb3ZlcnJpZGUpIik7CisgICAgICAgICAgICBjZWxsLnRleHRDb250ZW50ID0gV0ku VUlTdHJpbmcoIihsb2NhbCBvdmVycmlkZSkiKTsKKyAgICAgICAgICAgIGNlbGwudGl0bGUgPSBX SS5VSVN0cmluZygiVGhpcyByZXNvdXJjZSB3YXMgbG9hZGVkIGZyb20gYSBsb2NhbCBvdmVycmlk ZSIpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKKyAgICAgICAgY29uc29sZS5h c3NlcnQoIWNlbGwuY2xhc3NMaXN0LmNvbnRhaW5zKCJjYWNoZS10eXBlIiksICJTaG91bGQgbm90 IGhhdmUgY2FjaGUtdHlwZSBjbGFzcyBvbiBjZWxsLiIpOworCiAgICAgICAgIGxldCB0cmFuc2Zl clNpemUgPSBlbnRyeS50cmFuc2ZlclNpemU7CiAgICAgICAgIGNlbGwudGV4dENvbnRlbnQgPSBp c05hTih0cmFuc2ZlclNpemUpID8gZW1EYXNoIDogTnVtYmVyLmJ5dGVzVG9TdHJpbmcodHJhbnNm ZXJTaXplKTsKLSAgICAgICAgY29uc29sZS5hc3NlcnQoIWNlbGwuY2xhc3NMaXN0LmNvbnRhaW5z KCJjYWNoZS10eXBlIiksICJTaG91bGQgbm90IGhhdmUgY2FjaGUtdHlwZSBjbGFzcyBvbiBjZWxs LiIpOworICAgICAgICBjZWxsLnRpdGxlID0gIiI7CiAgICAgfQogCiAgICAgX3BvcHVsYXRlV2F0 ZXJmYWxsR3JhcGgoY2VsbCwgZW50cnkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZUhlYWRlcnNDb250ZW50Vmlldy5qcyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlSGVhZGVyc0Nv bnRlbnRWaWV3LmpzCmluZGV4IDNhNTZlMGZkMjJmMTZjNGJhZWYxOWFmOWYzOTRjOTc1NTc1NTVm M2QuLjYwZTZjNWVjMWQyMzhjNmEyYjE4NzAyNDVjNGQ1MjYzMzA3YWRmNjQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlSGVhZGVy c0NvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1Jlc291cmNlSGVhZGVyc0NvbnRlbnRWaWV3LmpzCkBAIC0yMzMsNyArMjMzLDcgQEAg V0kuUmVzb3VyY2VIZWFkZXJzQ29udGVudFZpZXcgPSBjbGFzcyBSZXNvdXJjZUhlYWRlcnNDb250 ZW50VmlldyBleHRlbmRzIFdJLkNvbnQKICAgICAgICAgY2FzZSBXSS5SZXNvdXJjZS5SZXNwb25z ZVNvdXJjZS5TZXJ2aWNlV29ya2VyOgogICAgICAgICAgICAgcmV0dXJuIFdJLlVJU3RyaW5nKCJT ZXJ2aWNlIFdvcmtlciIpOwogICAgICAgICBjYXNlIFdJLlJlc291cmNlLlJlc3BvbnNlU291cmNl Lkluc3BlY3Rvck92ZXJyaWRlOgotICAgICAgICAgICAgcmV0dXJuIFdJLlVJU3RyaW5nKCJJbnNw ZWN0b3IgT3ZlcnJpZGUiKTsKKyAgICAgICAgICAgIHJldHVybiBXSS5VSVN0cmluZygiTG9jYWwg T3ZlcnJpZGUiKTsKICAgICAgICAgY2FzZSBXSS5SZXNvdXJjZS5SZXNwb25zZVNvdXJjZS5Vbmtu b3duOgogICAgICAgICBkZWZhdWx0OgogICAgICAgICAgICAgcmV0dXJuIG51bGw7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZVNp emVzQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9SZXNvdXJjZVNpemVzQ29udGVudFZpZXcuanMKaW5kZXggYWU1NWIxMDJjZDVmYjAxOGFi YjFlNzc2ZjA2OWM1YzZmNmYzNDA4MS4uMjEzOGY2NTdmNDBhNzU5ZmQ2MGY1ZjI0NzYwNDVjN2My YjQyNmU1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvUmVzb3VyY2VTaXplc0NvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlU2l6ZXNDb250ZW50Vmlldy5qcwpAQCAt MTMwLDcgKzEzMCwxMSBAQCBXSS5SZXNvdXJjZVNpemVzQ29udGVudFZpZXcgPSBjbGFzcyBSZXNv dXJjZVNpemVzQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50VgogCiAgICAgICAgIGxldCBy ZXNvdXJjZUNvbXBvbmVudHMgPSBjcmVhdGVTaXplQ29tcG9uZW50cyhyZXNvdXJjZVNlY3Rpb24s IFdJLlVJU3RyaW5nKCJSZXNvdXJjZSBTaXplIiksIG51bGwsIFdJLlVJU3RyaW5nKCJDb21wcmVz c2lvbjoiKSwgV0kuVUlTdHJpbmcoIk1JTUUgVHlwZToiKSk7CiAgICAgICAgIHJlc291cmNlQ29t cG9uZW50cy5jb250YWluZXIuY2xhc3NMaXN0LmFkZChXSS5SZXNvdXJjZVRyZWVFbGVtZW50LlJl c291cmNlSWNvblN0eWxlQ2xhc3NOYW1lLCAuLi5XSS5SZXNvdXJjZS5jbGFzc05hbWVzRm9yUmVz b3VyY2UodGhpcy5fcmVzb3VyY2UpKTsKKwogICAgICAgICByZXNvdXJjZUNvbXBvbmVudHMuaW1h Z2VFbGVtZW50LmNsYXNzTGlzdC5hZGQoImljb24iKTsKKyAgICAgICAgaWYgKHRoaXMuX3Jlc291 cmNlLnJlc3BvbnNlU291cmNlID09PSBXSS5SZXNvdXJjZS5SZXNwb25zZVNvdXJjZS5JbnNwZWN0 b3JPdmVycmlkZSkKKyAgICAgICAgICAgIHJlc291cmNlQ29tcG9uZW50cy5pbWFnZUVsZW1lbnQu dGl0bGUgPSBXSS5VSVN0cmluZygiVGhpcyByZXNvdXJjZSB3YXMgbG9hZGVkIGZyb20gYSBsb2Nh bCBvdmVycmlkZSIpOworCiAgICAgICAgIHRoaXMuX3Jlc291cmNlQnl0ZXNFbGVtZW50ID0gcmVz b3VyY2VDb21wb25lbnRzLmJ5dGVzRWxlbWVudDsKICAgICAgICAgdGhpcy5fcmVzb3VyY2VCeXRl c1N1ZmZpeEVsZW1lbnQgPSByZXNvdXJjZUNvbXBvbmVudHMuc3VmZml4RWxlbWVudDsKICAgICAg ICAgdGhpcy5fY29tcHJlc3Npb25FbGVtZW50ID0gcmVzb3VyY2VDb21wb25lbnRzLnZhbHVlMUVs ZW1lbnQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9SZXNvdXJjZVRpbWVsaW5lRGF0YUdyaWROb2RlLmpzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVzb3VyY2VUaW1lbGluZURhdGFHcmlkTm9kZS5qcwpp bmRleCA3ZWFmZTExN2I3ZWU5ODYwYTgyMTE4MDM2NGRhZWFlYTEyZGZkNGZlLi44MmQ3NTM4MDQ0 NWVlYWFiYzQzZjU3MDFjZThjZDM0MDkxZTY4YTdkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZVRpbWVsaW5lRGF0YUdyaWROb2Rl LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291 cmNlVGltZWxpbmVEYXRhR3JpZE5vZGUuanMKQEAgLTc1LDYgKzc1LDcgQEAgV0kuUmVzb3VyY2VU aW1lbGluZURhdGFHcmlkTm9kZSA9IGNsYXNzIFJlc291cmNlVGltZWxpbmVEYXRhR3JpZE5vZGUg ZXh0ZW5kcyBXSS4KICAgICAgICAgdGhpcy5fY2FjaGVkRGF0YS5yZW1vdGVBZGRyZXNzID0gdGhp cy5yZXNvdXJjZS5yZW1vdGVBZGRyZXNzOwogICAgICAgICB0aGlzLl9jYWNoZWREYXRhLmNvbm5l Y3Rpb25JZGVudGlmaWVyID0gdGhpcy5yZXNvdXJjZS5jb25uZWN0aW9uSWRlbnRpZmllcjsKICAg ICAgICAgdGhpcy5fY2FjaGVkRGF0YS5pbml0aWF0b3IgPSB0aGlzLnJlc291cmNlLmluaXRpYXRv clNvdXJjZUNvZGVMb2NhdGlvbjsKKyAgICAgICAgdGhpcy5fY2FjaGVkRGF0YS5zb3VyY2UgPSB0 aGlzLnJlc291cmNlLmluaXRpYXRvclNvdXJjZUNvZGVMb2NhdGlvbjsgLy8gVGltZWxpbmUgT3Zl cnZpZXcKICAgICAgICAgcmV0dXJuIHRoaXMuX2NhY2hlZERhdGE7CiAgICAgfQogCkBAIC0xNDgs NiArMTQ5LDE2IEBAIFdJLlJlc291cmNlVGltZWxpbmVEYXRhR3JpZE5vZGUgPSBjbGFzcyBSZXNv dXJjZVRpbWVsaW5lRGF0YUdyaWROb2RlIGV4dGVuZHMgV0kuCiAgICAgICAgIHJldHVybiBzdXBl ci5jcmVhdGVDZWxsQ29udGVudChjb2x1bW5JZGVudGlmaWVyLCBjZWxsKTsKICAgICB9CiAKKyAg ICBnZW5lcmF0ZUljb25UaXRsZShjb2x1bW5JZGVudGlmaWVyKQorICAgIHsKKyAgICAgICAgaWYg KGNvbHVtbklkZW50aWZpZXIgPT09ICJuYW1lIikgeworICAgICAgICAgICAgaWYgKHRoaXMucmVz b3VyY2UucmVzcG9uc2VTb3VyY2UgPT09IFdJLlJlc291cmNlLlJlc3BvbnNlU291cmNlLkluc3Bl Y3Rvck92ZXJyaWRlKQorICAgICAgICAgICAgICAgIHJldHVybiBXSS5VSVN0cmluZygiVGhpcyBy ZXNvdXJjZSB3YXMgbG9hZGVkIGZyb20gYSBsb2NhbCBvdmVycmlkZSIpOworICAgICAgICB9CisK KyAgICAgICAgcmV0dXJuIHN1cGVyLmdlbmVyYXRlSWNvblRpdGxlKGNvbHVtbklkZW50aWZpZXIp OworICAgIH0KKwogICAgIHJlZnJlc2goKQogICAgIHsKICAgICAgICAgaWYgKHRoaXMuX3NjaGVk dWxlZFJlZnJlc2hJZGVudGlmaWVyKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZVRyZWVFbGVtZW50LmpzIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVzb3VyY2VUcmVlRWxlbWVudC5qcwpp bmRleCBjYTQ4Nzc1ZmEzMWM0OTRkNDc4MmU4NTM5OTQ3MjNjOWU5OGZlM2VlLi4zNTM1YzdhNTcx OGU2YTU5MzFlYWU2ODVmMmRlMDIwMzYwODQyOTU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZVRyZWVFbGVtZW50LmpzCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlVHJlZUVs ZW1lbnQuanMKQEAgLTI2Miw2ICsyNjIsOCBAQCBXSS5SZXNvdXJjZVRyZWVFbGVtZW50ID0gY2xh c3MgUmVzb3VyY2VUcmVlRWxlbWVudCBleHRlbmRzIFdJLlNvdXJjZUNvZGVUcmVlRWxlbQogICAg ICAgICAgICAgdGhpcy5hZGRDbGFzc05hbWUoIm92ZXJyaWRlIik7CiAgICAgICAgIGVsc2UKICAg ICAgICAgICAgIHRoaXMucmVtb3ZlQ2xhc3NOYW1lKCJvdmVycmlkZSIpOworCisgICAgICAgIHRo aXMuaWNvbkVsZW1lbnQudGl0bGUgPSB3YXNPdmVycmlkZGVuID8gV0kuVUlTdHJpbmcoIlRoaXMg cmVzb3VyY2Ugd2FzIGxvYWRlZCBmcm9tIGEgbG9jYWwgb3ZlcnJpZGUiKSA6ICIiOwogICAgIH0K IAogICAgIF91cmxEaWRDaGFuZ2UoZXZlbnQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZURhdGFHcmlkTm9kZS5qcyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lRGF0YUdyaWROb2Rl LmpzCmluZGV4IDFjMzY4ZDRkZWRlYTNiMTcyMTljZGZkOGNhMTg1ZjQwMmU1YmVlMjQuLjY3YWNm MGRmMGFlZGVhYzFjZjRlN2RkNDQ0M2Q0Mzg1ZGQ0YzQ3YTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lRGF0YUdyaWROb2RlLmpz CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5l RGF0YUdyaWROb2RlLmpzCkBAIC0xNTAsNyArMTUwLDExIEBAIFdJLlRpbWVsaW5lRGF0YUdyaWRO b2RlID0gY2xhc3MgVGltZWxpbmVEYXRhR3JpZE5vZGUgZXh0ZW5kcyBXSS5EYXRhR3JpZE5vZGUK IAogICAgICAgICAgICAgdmFyIGZyYWdtZW50ID0gZG9jdW1lbnQuY3JlYXRlRG9jdW1lbnRGcmFn bWVudCgpOwogCi0gICAgICAgICAgICBpZiAoY2FsbEZyYW1lLnNvdXJjZUNvZGVMb2NhdGlvbiAm JiBjYWxsRnJhbWUuc291cmNlQ29kZUxvY2F0aW9uLnNvdXJjZUNvZGUpIHsKKyAgICAgICAgICAg IGxldCBpY29uRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOworICAgICAg ICAgICAgaWNvbkVsZW1lbnQuY2xhc3NMaXN0LmFkZCgiaWNvbiIpOworCisgICAgICAgICAgICBs ZXQgc291cmNlQ29kZSA9IGNhbGxGcmFtZS5zb3VyY2VDb2RlTG9jYXRpb24/LnNvdXJjZUNvZGU7 CisgICAgICAgICAgICBpZiAoc291cmNlQ29kZSkgewogICAgICAgICAgICAgICAgIC8vIEdpdmUg dGhlIHdob2xlIGNlbGwgYSB0b29sdGlwIGFuZCBrZWVwIGl0IHVwIHRvIGRhdGUuCiAgICAgICAg ICAgICAgICAgY2FsbEZyYW1lLnNvdXJjZUNvZGVMb2NhdGlvbi5wb3B1bGF0ZUxpdmVEaXNwbGF5 TG9jYXRpb25Ub29sdGlwKGNlbGwpOwogCkBAIC0xNTgsMTAgKzE2MiwxMiBAQCBXSS5UaW1lbGlu ZURhdGFHcmlkTm9kZSA9IGNsYXNzIFRpbWVsaW5lRGF0YUdyaWROb2RlIGV4dGVuZHMgV0kuRGF0 YUdyaWROb2RlCiAKICAgICAgICAgICAgICAgICBpZiAoaXNBbm9ueW1vdXNGdW5jdGlvbikgewog ICAgICAgICAgICAgICAgICAgICAvLyBGb3IgYW5vbnltb3VzIGZ1bmN0aW9ucyB3ZSBzaG93IHRo ZSByZXNvdXJjZSBvciBzY3JpcHQgaWNvbiBhbmQgbmFtZS4KLSAgICAgICAgICAgICAgICAgICAg aWYgKGNhbGxGcmFtZS5zb3VyY2VDb2RlTG9jYXRpb24uc291cmNlQ29kZSBpbnN0YW5jZW9mIFdJ LlJlc291cmNlKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICBjZWxsLmNsYXNzTGlzdC5hZGQo V0kuUmVzb3VyY2VUcmVlRWxlbWVudC5SZXNvdXJjZUljb25TdHlsZUNsYXNzTmFtZSwgLi4uV0ku UmVzb3VyY2UuY2xhc3NOYW1lc0ZvclJlc291cmNlKGNhbGxGcmFtZS5zb3VyY2VDb2RlTG9jYXRp b24uc291cmNlQ29kZSkpOwotICAgICAgICAgICAgICAgICAgICB9IGVsc2UgaWYgKGNhbGxGcmFt ZS5zb3VyY2VDb2RlTG9jYXRpb24uc291cmNlQ29kZSBpbnN0YW5jZW9mIFdJLlNjcmlwdCkgewot ICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGNhbGxGcmFtZS5zb3VyY2VDb2RlTG9jYXRpb24u c291cmNlQ29kZS51cmwpIHsKKyAgICAgICAgICAgICAgICAgICAgaWYgKHNvdXJjZUNvZGUgaW5z dGFuY2VvZiBXSS5SZXNvdXJjZSkgeworICAgICAgICAgICAgICAgICAgICAgICAgY2VsbC5jbGFz c0xpc3QuYWRkKFdJLlJlc291cmNlVHJlZUVsZW1lbnQuUmVzb3VyY2VJY29uU3R5bGVDbGFzc05h bWUsIC4uLldJLlJlc291cmNlLmNsYXNzTmFtZXNGb3JSZXNvdXJjZShzb3VyY2VDb2RlKSk7Cisg ICAgICAgICAgICAgICAgICAgICAgICBpZiAoc291cmNlQ29kZS5yZXNwb25zZVNvdXJjZSA9PT0g V0kuUmVzb3VyY2UuUmVzcG9uc2VTb3VyY2UuSW5zcGVjdG9yT3ZlcnJpZGUpCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgaWNvbkVsZW1lbnQudGl0bGUgPSBXSS5VSVN0cmluZygiVGhpcyBy ZXNvdXJjZSB3YXMgbG9hZGVkIGZyb20gYSBsb2NhbCBvdmVycmlkZSIpOworICAgICAgICAgICAg ICAgICAgICB9IGVsc2UgaWYgKHNvdXJjZUNvZGUgaW5zdGFuY2VvZiBXSS5TY3JpcHQpIHsKKyAg ICAgICAgICAgICAgICAgICAgICAgIGlmIChzb3VyY2VDb2RlLnVybCkgewogICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGNlbGwuY2xhc3NMaXN0LmFkZChXSS5SZXNvdXJjZVRyZWVFbGVtZW50 LlJlc291cmNlSWNvblN0eWxlQ2xhc3NOYW1lKTsKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBjZWxsLmNsYXNzTGlzdC5hZGQoV0kuUmVzb3VyY2UuVHlwZS5TY3JpcHQpOwogICAgICAgICAg ICAgICAgICAgICAgICAgfSBlbHNlCkBAIC0xODksMTAgKzE5NSw3IEBAIFdJLlRpbWVsaW5lRGF0 YUdyaWROb2RlID0gY2xhc3MgVGltZWxpbmVEYXRhR3JpZE5vZGUgZXh0ZW5kcyBXSS5EYXRhR3Jp ZE5vZGUKICAgICAgICAgICAgICAgICByZXR1cm4gZnJhZ21lbnQ7CiAgICAgICAgICAgICB9CiAK LSAgICAgICAgICAgIHZhciBpY29uID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7Ci0g ICAgICAgICAgICBpY29uLmNsYXNzTGlzdC5hZGQoImljb24iKTsKLQotICAgICAgICAgICAgZnJh Z21lbnQuYXBwZW5kKGljb24sIGZ1bmN0aW9uTmFtZSk7CisgICAgICAgICAgICBmcmFnbWVudC5h cHBlbmQoaWNvbkVsZW1lbnQsIGZ1bmN0aW9uTmFtZSk7CiAKICAgICAgICAgICAgIHJldHVybiBm cmFnbWVudDsKICAgICAgICAgfQpAQCAtMjA1LDYgKzIwOCwxNiBAQCBXSS5UaW1lbGluZURhdGFH cmlkTm9kZSA9IGNsYXNzIFRpbWVsaW5lRGF0YUdyaWROb2RlIGV4dGVuZHMgV0kuRGF0YUdyaWRO b2RlCiAgICAgICAgIHJldHVybiBzdXBlci5jcmVhdGVDZWxsQ29udGVudChjb2x1bW5JZGVudGlm aWVyLCBjZWxsKTsKICAgICB9CiAKKyAgICBnZW5lcmF0ZUljb25UaXRsZShjb2x1bW5JZGVudGlm aWVyKQorICAgIHsKKyAgICAgICAgbGV0IHZhbHVlID0gdGhpcy5kYXRhW2NvbHVtbklkZW50aWZp ZXJdOworCisgICAgICAgIGlmICh2YWx1ZSBpbnN0YW5jZW9mIFdJLlNvdXJjZUNvZGVMb2NhdGlv biAmJiB2YWx1ZS5zb3VyY2VDb2RlIGluc3RhbmNlb2YgV0kuUmVzb3VyY2UgJiYgdmFsdWUuc291 cmNlQ29kZS5yZXNwb25zZVNvdXJjZSA9PT0gV0kuUmVzb3VyY2UuUmVzcG9uc2VTb3VyY2UuSW5z cGVjdG9yT3ZlcnJpZGUpCisgICAgICAgICAgICByZXR1cm4gV0kuVUlTdHJpbmcoIlRoaXMgcmVz b3VyY2Ugd2FzIGxvYWRlZCBmcm9tIGEgbG9jYWwgb3ZlcnJpZGUiKTsKKworICAgICAgICByZXR1 cm4gc3VwZXIuZ2VuZXJhdGVJY29uVGl0bGUoY29sdW1uSWRlbnRpZmllcik7CisgICAgfQorCiAg ICAgcmVmcmVzaCgpCiAgICAgewogICAgICAgICB0aGlzLl9jYWNoZWREYXRhID0gbnVsbDsK 402601 2020-06-23 15:54:58 -0700 2020-06-23 16:21:43 -0700 Patch bug-213531.patch text/plain 23091 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDI1YzkyMmFlNzdlZDAzYmM2MzVmN2FjYzUxNzFl MDA2MWJjYmE3YzkuLjA4YTk1ODA1N2ZiYTI3MmE2ZmYyZWVmM2RmZDhkMDdmNDgyNGU5MDIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ3IEBACisyMDIwLTA2LTIzICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBh ZGQgYSB0b29sdGlwIHRvIHRoZSBpY29uIG9mIG92ZXJyaWRkZW4gcmVzb3VyY2VzIHRvIGNsYXJp ZnkgbWVhbmluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjEzNTMxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQnJpYW4gQnVyZy4KKworICAgICAgICAq IFVzZXJJbnRlcmZhY2UvVmlld3MvTG9jYWxSZXNvdXJjZU92ZXJyaWRlV2FybmluZ1ZpZXcuanM6 CisgICAgICAgIChXSS5Mb2NhbFJlc291cmNlT3ZlcnJpZGVXYXJuaW5nVmlldy5wcm90b3R5cGUu aW5pdGlhbExheW91dCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZUhl YWRlcnNDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLlJlc291cmNlSGVhZGVyc0NvbnRlbnRW aWV3LnByb3RvdHlwZS5fcmVzcG9uc2VTb3VyY2VEaXNwbGF5U3RyaW5nKToKKyAgICAgICAgUmVw aHJhc2UgImxvY2FsIHJlc291cmNlIG92ZXJyaWRlIiB0byBqdXN0ICJsb2NhbCBvdmVycmlkZSIg dG8gbWF0Y2ggdGhlIHJlZmVyZW5jZSBwYWdlIG5hbWUuCisKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL1ZpZXdzL05ldHdvcmtUYWJsZUNvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV0kuTmV0d29y a1RhYmxlQ29udGVudFZpZXcucHJvdG90eXBlLl9wb3B1bGF0ZU5hbWVDZWxsLmNyZWF0ZUljb25F bGVtZW50KToKKyAgICAgICAgKFdJLk5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5f cG9wdWxhdGVOYW1lQ2VsbCk6CisgICAgICAgIChXSS5OZXR3b3JrVGFibGVDb250ZW50Vmlldy5w cm90b3R5cGUuX3BvcHVsYXRlVHJhbnNmZXJTaXplQ2VsbCk6CisgICAgICAgIEFkZCBhIGB0aXRs ZWAgZm9yIHRoZSBzcGVjaWFsIHRyYW5zZmVyIHNpemUgY2FzZXMsIHN1Y2ggYXMgZm9yIGAobG9j YWwgb3ZlcnJpZGUpYC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvUmVzb3VyY2VU cmVlRWxlbWVudC5qczoKKyAgICAgICAgKFdJLlJlc291cmNlVHJlZUVsZW1lbnQucHJvdG90eXBl Ll91cGRhdGVJY29uKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlU2l6 ZXNDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLlJlc291cmNlU2l6ZXNDb250ZW50Vmlldy5w cm90b3R5cGUuaW5pdGlhbExheW91dCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9U aW1lbGluZURhdGFHcmlkTm9kZS5qczoKKyAgICAgICAgKFdJLlRpbWVsaW5lRGF0YUdyaWROb2Rl LnByb3RvdHlwZS5jcmVhdGVDZWxsQ29udGVudCk6CisgICAgICAgIChXSS5UaW1lbGluZURhdGFH cmlkTm9kZS5wcm90b3R5cGUuZ2VuZXJhdGVJY29uVGl0bGUpOiBBZGRlZC4KKyAgICAgICAgKiBV c2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlVGltZWxpbmVEYXRhR3JpZE5vZGUuanM6CisgICAg ICAgIChXSS5SZXNvdXJjZVRpbWVsaW5lRGF0YUdyaWROb2RlLnByb3RvdHlwZS5nZXQgZGF0YSk6 CisgICAgICAgIChXSS5SZXNvdXJjZVRpbWVsaW5lRGF0YUdyaWROb2RlLnByb3RvdHlwZS5nZW5l cmF0ZUljb25UaXRsZSk6IEFkZGVkLgorICAgICAgICBBZGQgYSBgdGl0bGVgIHRvIHRoZSBvdmVy cmlkZGVuIHJlc291cmNlIGljb24gdGhhdCBjbGFyaWZpZXMgdGhlIGZhY3QgdGhhdCB0aGUgcmVz b3VyY2Ugd2FzCisgICAgICAgIG92ZXJyaWRkZW4gYnkgYSBsb2NhbCBvdmVycmlkZS4KKworICAg ICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTGF5b3V0VGltZWxpbmVEYXRhR3JpZE5vZGUuanM6 CisgICAgICAgIChXSS5MYXlvdXRUaW1lbGluZURhdGFHcmlkTm9kZS5wcm90b3R5cGUuZ2V0IGRh dGEpOgorICAgICAgICBDYWNoZSB0aGUgYGluaXRpYXRvckNhbGxGcmFtZWAgaW4gdGhlIGBzb3Vy Y2VgIGNvbHVtbiBhcyB3ZWxsIGFzIHRoZSBgaW5pdGlhdG9yYCBjb2x1bW4sIGFzCisgICAgICAg IGl0IGlzIHVzZWQgYnkgdGhlIGdlbmVyYWwgdGltZWxpbmUgb3ZlcnZpZXcgdGFibGUuCisKKyAg ICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFHcmlkTm9kZS5qczoKKyAgICAgICAgKFdJ LkRhdGFHcmlkTm9kZS5wcm90b3R5cGUuY3JlYXRlQ2VsbCk6CisgICAgICAgIChXSS5EYXRhR3Jp ZE5vZGUucHJvdG90eXBlLmdlbmVyYXRlSWNvblRpdGxlKTogQWRkZWQuCisgICAgICAgIFByb3Zp ZGUgYSB3YXkgdG8gc2V0IGEgYHRpdGxlYCBvbiBqdXN0IHRoZSBpY29uLgorCisgICAgICAgICog TG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzOgorCiAyMDIwLTA2LTIz ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVj dG9yOiBhZGp1c3QgaGVpZ2h0IG9mIHVuZG9ja2VkIHRpdGxlIGFyZWEgdG8gbWF0Y2ggbWFjT1Mg QmlnIFN1cgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMv ZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2Nh bGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKaW5kZXggYjg4ZGU0ZGI2YTZl MDJlOTM3YWQ4YzAzZWUyNjJlNjA4MWU5YjczOC4uYzVmMzU4MWY1MmUxNTRiNjBjNjIyMDVkMzYx NmY2Y2JlY2UyNGE2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXph dGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCkBAIC03OSw3 ICs3OSw3IEBAIGxvY2FsaXplZFN0cmluZ3NbIihUYWlsIENhbGwpIl0gPSAiKFRhaWwgQ2FsbCki OwogbG9jYWxpemVkU3RyaW5nc1siKGFub255bW91cyBmdW5jdGlvbikiXSA9ICIoYW5vbnltb3Vz IGZ1bmN0aW9uKSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyIoYXN5bmMpIl0gPSAiKGFzeW5jKSI7CiBs b2NhbGl6ZWRTdHJpbmdzWyIoZGlzaykiXSA9ICIoZGlzaykiOwotbG9jYWxpemVkU3RyaW5nc1si KGluc3BlY3RvciBvdmVycmlkZSkiXSA9ICIoaW5zcGVjdG9yIG92ZXJyaWRlKSI7Citsb2NhbGl6 ZWRTdHJpbmdzWyIobG9jYWwgb3ZlcnJpZGUpIl0gPSAiKGxvY2FsIG92ZXJyaWRlKSI7CiBsb2Nh bGl6ZWRTdHJpbmdzWyIobWFueSkiXSA9ICIobWFueSkiOwogbG9jYWxpemVkU3RyaW5nc1siKG1l bW9yeSkiXSA9ICIobWVtb3J5KSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyIobXVsdGlwbGUpIl0gPSAi KG11bHRpcGxlKSI7CkBAIC03MDEsNyArNzAxLDYgQEAgbG9jYWxpemVkU3RyaW5nc1siSW5wdXQ6 ICJdID0gIklucHV0OiAiOwogLyogQ2hlY2tib3ggbGFiZWwgZm9yIHRoZSBpbnNldCBvZiBhIENT UyBib3ggc2hhZG93LiAqLwogbG9jYWxpemVkU3RyaW5nc1siSW5zZXQgQCBCb3ggU2hhZG93IEVk aXRvciJdID0gIkluc2V0IjsKIGxvY2FsaXplZFN0cmluZ3NbIkluc3BlY3RvciBCb290c3RyYXAg U2NyaXB0Il0gPSAiSW5zcGVjdG9yIEJvb3RzdHJhcCBTY3JpcHQiOwotbG9jYWxpemVkU3RyaW5n c1siSW5zcGVjdG9yIE92ZXJyaWRlIl0gPSAiSW5zcGVjdG9yIE92ZXJyaWRlIjsKIGxvY2FsaXpl ZFN0cmluZ3NbIkluc3BlY3RvciBTdHlsZSBTaGVldCJdID0gIkluc3BlY3RvciBTdHlsZSBTaGVl dCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJJbnN0YW5jZXMiXSA9ICJJbnN0YW5jZXMiOwogbG9jYWxp emVkU3RyaW5nc1siSW52YWxpZCJdID0gIkludmFsaWQiOwpAQCAtMTI1NCw3ICsxMjUzLDYgQEAg bG9jYWxpemVkU3RyaW5nc1siVGhlc2UgdGVzdHMgZGVtb25zdHJhdGUgaG93IHRvIHVzZSAlcyB0 byBnZXQgaW5mb3JtYXRpb24gYWJvdXQKIGxvY2FsaXplZFN0cmluZ3NbIlRoZXNlIHRlc3RzIGRl bW9uc3RyYXRlIGhvdyB0byB1c2UgJXMgdG8gZ2V0IGluZm9ybWF0aW9uIGFib3V0IGxvYWRlZCBy ZXNvdXJjZXMuIl0gPSAiVGhlc2UgdGVzdHMgZGVtb25zdHJhdGUgaG93IHRvIHVzZSAlcyB0byBn ZXQgaW5mb3JtYXRpb24gYWJvdXQgbG9hZGVkIHJlc291cmNlcy4iOwogbG9jYWxpemVkU3RyaW5n c1siVGhlc2UgdGVzdHMgZGVtb25zdHJhdGUgaG93IHRvIHVzZSAlcyB0byBnZXQgaW5mb3JtYXRp b24gYWJvdXQgdGhlIGFjY2Vzc2liaWxpdHkgdHJlZS4iXSA9ICJUaGVzZSB0ZXN0cyBkZW1vbnN0 cmF0ZSBob3cgdG8gdXNlICVzIHRvIGdldCBpbmZvcm1hdGlvbiBhYm91dCB0aGUgYWNjZXNzaWJp bGl0eSB0cmVlLiI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJUaGVzZSB0ZXN0cyBzZXJ2ZSBhcyBhIGRl bW9uc3RyYXRpb24gb2YgdGhlIGZ1bmN0aW9uYWxpdHkgYW5kIHN0cnVjdHVyZSBvZiBhdWRpdHMu Il0gPSAiVGhlc2UgdGVzdHMgc2VydmUgYXMgYSBkZW1vbnN0cmF0aW9uIG9mIHRoZSBmdW5jdGlv bmFsaXR5IGFuZCBzdHJ1Y3R1cmUgb2YgYXVkaXRzLiI7Ci1sb2NhbGl6ZWRTdHJpbmdzWyJUaGlz IFJlc291cmNlIGNhbWUgZnJvbSBhIExvY2FsIFJlc291cmNlIE92ZXJyaWRlIl0gPSAiVGhpcyBS ZXNvdXJjZSBjYW1lIGZyb20gYSBMb2NhbCBSZXNvdXJjZSBPdmVycmlkZSI7CiBsb2NhbGl6ZWRT dHJpbmdzWyJUaGlzIGFjdGlvbiBjYXVzZXMgbm8gdmlzdWFsIGNoYW5nZSJdID0gIlRoaXMgYWN0 aW9uIGNhdXNlcyBubyB2aXN1YWwgY2hhbmdlIjsKIGxvY2FsaXplZFN0cmluZ3NbIlRoaXMgYWN0 aW9uIG1vdmVzIHRoZSBwYXRoIG91dHNpZGUgdGhlIHZpc2libGUgYXJlYSJdID0gIlRoaXMgYWN0 aW9uIG1vdmVzIHRoZSBwYXRoIG91dHNpZGUgdGhlIHZpc2libGUgYXJlYSI7CiBsb2NhbGl6ZWRT dHJpbmdzWyJUaGlzIGFuaW1hdGlvbiBoYXMgbm8gZHVyYXRpb24uIl0gPSAiVGhpcyBhbmltYXRp b24gaGFzIG5vIGR1cmF0aW9uLiI7CkBAIC0xMjcxLDYgKzEyNjksMTEgQEAgbG9jYWxpemVkU3Ry aW5nc1siVGhpcyBpcyB3aGF0IHRoZSByZXN1bHQgb2YgYSB3YXJuaW5nIHRlc3Qgd2l0aCBubyBk YXRhIGxvb2tzIGwKIGxvY2FsaXplZFN0cmluZ3NbIlRoaXMgaXMgd2hhdCB0aGUgcmVzdWx0IG9m IGFuIHVuc3VwcG9ydGVkIHRlc3Qgd2l0aCBubyBkYXRhIGxvb2tzIGxpa2UuIl0gPSAiVGhpcyBp cyB3aGF0IHRoZSByZXN1bHQgb2YgYW4gdW5zdXBwb3J0ZWQgdGVzdCB3aXRoIG5vIGRhdGEgbG9v a3MgbGlrZS4iOwogbG9jYWxpemVkU3RyaW5nc1siVGhpcyBvYmplY3QgaXMgYSByb290Il0gPSAi VGhpcyBvYmplY3QgaXMgYSByb290IjsKIGxvY2FsaXplZFN0cmluZ3NbIlRoaXMgb2JqZWN0IGlz IHJlZmVyZW5jZWQgYnkgaW50ZXJuYWwgb2JqZWN0cyJdID0gIlRoaXMgb2JqZWN0IGlzIHJlZmVy ZW5jZWQgYnkgaW50ZXJuYWwgb2JqZWN0cyI7Citsb2NhbGl6ZWRTdHJpbmdzWyJUaGlzIHJlc291 cmNlIGNhbWUgZnJvbSBhIGxvY2FsIG92ZXJyaWRlIl0gPSAiVGhpcyByZXNvdXJjZSBjYW1lIGZy b20gYSBsb2NhbCBvdmVycmlkZSI7Citsb2NhbGl6ZWRTdHJpbmdzWyJUaGlzIHJlc291cmNlIHdh cyBsb2FkZWQgZnJvbSBhIGxvY2FsIG92ZXJyaWRlIl0gPSAiVGhpcyByZXNvdXJjZSB3YXMgbG9h ZGVkIGZyb20gYSBsb2NhbCBvdmVycmlkZSI7Citsb2NhbGl6ZWRTdHJpbmdzWyJUaGlzIHJlc291 cmNlIHdhcyBsb2FkZWQgZnJvbSBhIHNlcnZpY2Ugd29ya2VyIl0gPSAiVGhpcyByZXNvdXJjZSB3 YXMgbG9hZGVkIGZyb20gYSBzZXJ2aWNlIHdvcmtlciI7Citsb2NhbGl6ZWRTdHJpbmdzWyJUaGlz IHJlc291cmNlIHdhcyBsb2FkZWQgZnJvbSB0aGUgZGlzayBjYWNoZSJdID0gIlRoaXMgcmVzb3Vy Y2Ugd2FzIGxvYWRlZCBmcm9tIHRoZSBkaXNrIGNhY2hlIjsKK2xvY2FsaXplZFN0cmluZ3NbIlRo aXMgcmVzb3VyY2Ugd2FzIGxvYWRlZCBmcm9tIHRoZSBtZW1vcnkgY2FjaGUiXSA9ICJUaGlzIHJl c291cmNlIHdhcyBsb2FkZWQgZnJvbSB0aGUgbWVtb3J5IGNhY2hlIjsKIGxvY2FsaXplZFN0cmlu Z3NbIlRoaXMgdGVzdCB3aWxsIHBhc3Mgd2l0aCBhIHZhcmlldHkgb2YgYWNjZXNzaWJpbGl0eSBp bmZvcm1hdGlvbiBhYm91dCB0aGUgPGJvZHk+IGVsZW1lbnQuIl0gPSAiVGhpcyB0ZXN0IHdpbGwg cGFzcyB3aXRoIGEgdmFyaWV0eSBvZiBhY2Nlc3NpYmlsaXR5IGluZm9ybWF0aW9uIGFib3V0IHRo ZSA8Ym9keT4gZWxlbWVudC4iOwogbG9jYWxpemVkU3RyaW5nc1siVGhpcyB0ZXN0IHdpbGwgcGFz cyB3aXRoIGFsbCBET00gbm9kZXMgdGhhdCBoYXZlIGEgY29tcHV0ZWQgcm9sZSBvZiBcdTAwMjJs aW5rXHUwMDIyLiJdID0gIlRoaXMgdGVzdCB3aWxsIHBhc3Mgd2l0aCBhbGwgRE9NIG5vZGVzIHRo YXQgaGF2ZSBhIGNvbXB1dGVkIHJvbGUgb2YgXHUwMDIybGlua1x1MDAyMi4iOwogbG9jYWxpemVk U3RyaW5nc1siVGhpcyB0ZXN0IHdpbGwgcGFzcyB3aXRoIGFsbCBjaGlsZCBub2RlcyB0aGF0IGFy ZSBzZWxlY3RlZCAoXHUwMDIyJXNcdTAwMjIpIG9mIHRoZSA8Ym9keT4gZWxlbWVudCBpbiB0aGUg YWNjZXNzaWJpbGl0eSB0cmVlLiJdID0gIlRoaXMgdGVzdCB3aWxsIHBhc3Mgd2l0aCBhbGwgY2hp bGQgbm9kZXMgdGhhdCBhcmUgc2VsZWN0ZWQgKFx1MDAyMiVzXHUwMDIyKSBvZiB0aGUgPGJvZHk+ IGVsZW1lbnQgaW4gdGhlIGFjY2Vzc2liaWxpdHkgdHJlZS4iOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGF0YUdyaWROb2RlLmpzIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGF0YUdyaWROb2RlLmpzCmlu ZGV4IGFjZjhkZTNjZWY4Y2Q1MWFhNzhlMmExYjkwNTMxZWJiMzY4Nzg2YzIuLmY2N2JjNTBiY2Y5 M2UxOGExMjY1NjE5MzBmZDliNTM4MTRlYTUzYjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFHcmlkTm9kZS5qcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EYXRhR3JpZE5vZGUuanMKQEAgLTM3 OCw2ICszNzgsNyBAQCBXSS5EYXRhR3JpZE5vZGUgPSBjbGFzcyBEYXRhR3JpZE5vZGUgZXh0ZW5k cyBXSS5PYmplY3QKICAgICAgICAgICAgIGlmIChjb2x1bW5bImljb24iXSkgewogICAgICAgICAg ICAgICAgIGxldCBpY29uRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwog ICAgICAgICAgICAgICAgIGljb25FbGVtZW50LmNsYXNzTGlzdC5hZGQoImljb24iKTsKKyAgICAg ICAgICAgICAgICBpY29uRWxlbWVudC50aXRsZSA9IHRoaXMuZ2VuZXJhdGVJY29uVGl0bGUoY29s dW1uSWRlbnRpZmllcik7CiAgICAgICAgICAgICAgICAgZGl2Lmluc2VydEJlZm9yZShpY29uRWxl bWVudCwgZGl2LmZpcnN0Q2hpbGQpOwogICAgICAgICAgICAgfQogICAgICAgICB9CkBAIC00MDQs NiArNDA1LDEyIEBAIFdJLkRhdGFHcmlkTm9kZSA9IGNsYXNzIERhdGFHcmlkTm9kZSBleHRlbmRz IFdJLk9iamVjdAogICAgICAgICByZXR1cm4gdHlwZW9mIGRhdGEgPT09ICJudW1iZXIiID8gZGF0 YS5tYXhEZWNpbWFscygyKS50b0xvY2FsZVN0cmluZygpIDogZGF0YTsKICAgICB9CiAKKyAgICBn ZW5lcmF0ZUljb25UaXRsZShjb2x1bW5JZGVudGlmaWVyKQorICAgIHsKKyAgICAgICAgLy8gT3Zl cnJpZGRlbiBieSBzdWJjbGFzc2VzIGlmIG5lZWRlZC4KKyAgICAgICAgcmV0dXJuICIiOworICAg IH0KKwogICAgIGVsZW1lbnRXaXRoQ29sdW1uSWRlbnRpZmllcihjb2x1bW5JZGVudGlmaWVyKQog ICAgIHsKICAgICAgICAgaWYgKCF0aGlzLmRhdGFHcmlkKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5b3V0VGltZWxpbmVEYXRhR3JpZE5v ZGUuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9MYXlvdXRU aW1lbGluZURhdGFHcmlkTm9kZS5qcwppbmRleCA1ZTc4ZDRhMjMyNjk3ZTI4ODgwNjUxODNkNjgz YzlhZWEyYjc1YTVjLi5lNmZhN2JkYjc4NTBjOThjMjZiMDkwNWI0M2JiNDBhZWFhMmZjNmJlIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9MYXlv dXRUaW1lbGluZURhdGFHcmlkTm9kZS5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9MYXlvdXRUaW1lbGluZURhdGFHcmlkTm9kZS5qcwpAQCAtNDgsNiAr NDgsNyBAQCBXSS5MYXlvdXRUaW1lbGluZURhdGFHcmlkTm9kZSA9IGNsYXNzIExheW91dFRpbWVs aW5lRGF0YUdyaWROb2RlIGV4dGVuZHMgV0kuVGltZQogICAgICAgICB0aGlzLl9jYWNoZWREYXRh LnN0YXJ0VGltZSA9IHRoaXMucmVjb3JkLnN0YXJ0VGltZSAtICh0aGlzLmdyYXBoRGF0YVNvdXJj ZSA/IHRoaXMuZ3JhcGhEYXRhU291cmNlLnplcm9UaW1lIDogMCk7CiAgICAgICAgIHRoaXMuX2Nh Y2hlZERhdGEudG90YWxUaW1lID0gdGhpcy5yZWNvcmQuZHVyYXRpb247CiAgICAgICAgIHRoaXMu X2NhY2hlZERhdGEuaW5pdGlhdG9yID0gdGhpcy5yZWNvcmQuaW5pdGlhdG9yQ2FsbEZyYW1lOwor ICAgICAgICB0aGlzLl9jYWNoZWREYXRhLnNvdXJjZSA9IHRoaXMucmVjb3JkLmluaXRpYXRvckNh bGxGcmFtZTsgLy8gVGltZWxpbmUgT3ZlcnZpZXcKICAgICAgICAgcmV0dXJuIHRoaXMuX2NhY2hl ZERhdGE7CiAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9Mb2NhbFJlc291cmNlT3ZlcnJpZGVXYXJuaW5nVmlldy5qcyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xvY2FsUmVzb3VyY2VPdmVycmlk ZVdhcm5pbmdWaWV3LmpzCmluZGV4IDUwYzcwMDFhMWI3OGE2NDRmNzYyNzY3ODNhZDVkNjY5N2Uz OGJhM2MuLmU3NDI4NDNlYWE3ZDQ0MGZjODM3MTE4YWQ0YzU2MDU1MTk2NWQwYjMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xvY2FsUmVzb3Vy Y2VPdmVycmlkZVdhcm5pbmdWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL0xvY2FsUmVzb3VyY2VPdmVycmlkZVdhcm5pbmdWaWV3LmpzCkBAIC02 Nyw3ICs2Nyw3IEBAIFdJLkxvY2FsUmVzb3VyY2VPdmVycmlkZVdhcm5pbmdWaWV3ID0gY2xhc3Mg TG9jYWxSZXNvdXJjZU92ZXJyaWRlV2FybmluZ1ZpZXcgZXh0CiAgICAgICAgIH0pOwogCiAgICAg ICAgIGxldCBjb250YWluZXIgPSB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3Jl YXRlRWxlbWVudCgiZGl2IikpOwotICAgICAgICBjb250YWluZXIuYXBwZW5kKHRoaXMuX3JldmVh bEJ1dHRvbiwgV0kuVUlTdHJpbmcoIlRoaXMgUmVzb3VyY2UgY2FtZSBmcm9tIGEgTG9jYWwgUmVz b3VyY2UgT3ZlcnJpZGUiKSk7CisgICAgICAgIGNvbnRhaW5lci5hcHBlbmQodGhpcy5fcmV2ZWFs QnV0dG9uLCBXSS5VSVN0cmluZygiVGhpcyByZXNvdXJjZSBjYW1lIGZyb20gYSBsb2NhbCBvdmVy cmlkZSIpKTsKIAogICAgICAgICB0aGlzLl91cGRhdGVDb250ZW50KCk7CiAgICAgfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1Rh YmxlQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9OZXR3b3JrVGFibGVDb250ZW50Vmlldy5qcwppbmRleCA1NGU4ZTM3MjRmY2ZlZTJiYmY5 ZWYxOGU5MzA2YzNmNjU5MDRkOTFmLi4xZmRlYzcxY2VjNDc3YzRiYzJiOWMyYmQ0NDRlYTE4YTAz MmJjMTViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9OZXR3b3JrVGFibGVDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFibGVDb250ZW50Vmlldy5qcwpAQCAtNjI0 LDYgKzYyNCw3IEBAIFdJLk5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3ID0gY2xhc3MgTmV0d29ya1Rh YmxlQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50VmllCiAgICAgICAgIGZ1bmN0aW9uIGNy ZWF0ZUljb25FbGVtZW50KCkgewogICAgICAgICAgICAgbGV0IGljb25FbGVtZW50ID0gY2VsbC5h cHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJpbWciKSk7CiAgICAgICAgICAgICBp Y29uRWxlbWVudC5jbGFzc05hbWUgPSAiaWNvbiI7CisgICAgICAgICAgICByZXR1cm4gaWNvbkVs ZW1lbnQ7CiAgICAgICAgIH0KIAogICAgICAgICBsZXQgZG9tTm9kZSA9IGVudHJ5LmRvbU5vZGU7 CkBAIC02NTcsNyArNjU4LDcgQEAgV0kuTmV0d29ya1RhYmxlQ29udGVudFZpZXcgPSBjbGFzcyBO ZXR3b3JrVGFibGVDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRWaWUKICAgICAgICAgICAg IHN0YXR1c0VsZW1lbnQuYXBwZW5kQ2hpbGQoc3Bpbm5lci5lbGVtZW50KTsKICAgICAgICAgfQog Ci0gICAgICAgIGNyZWF0ZUljb25FbGVtZW50KCk7CisgICAgICAgIGxldCByZXNvdXJjZUljb25F bGVtZW50ID0gY3JlYXRlSWNvbkVsZW1lbnQoKTsKIAogICAgICAgICBjZWxsLmNsYXNzTGlzdC5h ZGQoV0kuUmVzb3VyY2VUcmVlRWxlbWVudC5SZXNvdXJjZUljb25TdHlsZUNsYXNzTmFtZSwgLi4u V0kuUmVzb3VyY2UuY2xhc3NOYW1lc0ZvclJlc291cmNlKHJlc291cmNlKSk7CiAKQEAgLTY3OCw3 ICs2NzksOCBAQCBXSS5OZXR3b3JrVGFibGVDb250ZW50VmlldyA9IGNsYXNzIE5ldHdvcmtUYWJs ZUNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudFZpZQogICAgICAgICB9CiAKICAgICAgICAg Y2VsbC50aXRsZSA9IHJlc291cmNlLnVybDsKLSAgICAgICAgY2VsbC5jbGFzc0xpc3QuYWRkKC4u LldJLlJlc291cmNlLmNsYXNzTmFtZXNGb3JSZXNvdXJjZShyZXNvdXJjZSkpOworICAgICAgICBp ZiAocmVzb3VyY2UucmVzcG9uc2VTb3VyY2UgPT09IFdJLlJlc291cmNlLlJlc3BvbnNlU291cmNl Lkluc3BlY3Rvck92ZXJyaWRlKQorICAgICAgICAgICAgcmVzb3VyY2VJY29uRWxlbWVudC50aXRs ZSA9IFdJLlVJU3RyaW5nKCJUaGlzIHJlc291cmNlIHdhcyBsb2FkZWQgZnJvbSBhIGxvY2FsIG92 ZXJyaWRlIik7CiAgICAgfQogCiAgICAgX3BvcHVsYXRlRG9tYWluQ2VsbChjZWxsLCBlbnRyeSkK QEAgLTczOSwyMyArNzQxLDI3IEBAIFdJLk5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3ID0gY2xhc3Mg TmV0d29ya1RhYmxlQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50VmllCiAgICAgICAgICAg ICBpZiAocmVzb3VyY2VFbnRyaWVzLmV2ZXJ5KChyZXNvdXJjZUVudHJ5KSA9PiByZXNvdXJjZUVu dHJ5LnJlc291cmNlLnJlc3BvbnNlU291cmNlID09PSBXSS5SZXNvdXJjZS5SZXNwb25zZVNvdXJj ZS5NZW1vcnlDYWNoZSkpIHsKICAgICAgICAgICAgICAgICBjZWxsLmNsYXNzTGlzdC5hZGQoImNh Y2hlLXR5cGUiKTsKICAgICAgICAgICAgICAgICBjZWxsLnRleHRDb250ZW50ID0gV0kuVUlTdHJp bmcoIihtZW1vcnkpIik7CisgICAgICAgICAgICAgICAgY2VsbC50aXRsZSA9IFdJLlVJU3RyaW5n KCJUaGlzIHJlc291cmNlIHdhcyBsb2FkZWQgZnJvbSB0aGUgbWVtb3J5IGNhY2hlIik7CiAgICAg ICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgaWYgKHJlc291 cmNlRW50cmllcy5ldmVyeSgocmVzb3VyY2VFbnRyeSkgPT4gcmVzb3VyY2VFbnRyeS5yZXNvdXJj ZS5yZXNwb25zZVNvdXJjZSA9PT0gV0kuUmVzb3VyY2UuUmVzcG9uc2VTb3VyY2UuRGlza0NhY2hl KSkgewogICAgICAgICAgICAgICAgIGNlbGwuY2xhc3NMaXN0LmFkZCgiY2FjaGUtdHlwZSIpOwog ICAgICAgICAgICAgICAgIGNlbGwudGV4dENvbnRlbnQgPSBXSS5VSVN0cmluZygiKGRpc2spIik7 CisgICAgICAgICAgICAgICAgY2VsbC50aXRsZSA9IFdJLlVJU3RyaW5nKCJUaGlzIHJlc291cmNl IHdhcyBsb2FkZWQgZnJvbSB0aGUgZGlzayBjYWNoZSIpOwogICAgICAgICAgICAgICAgIHJldHVy bjsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGlmIChyZXNvdXJjZUVudHJpZXMuZXZlcnko KHJlc291cmNlRW50cnkpID0+IHJlc291cmNlRW50cnkucmVzb3VyY2UucmVzcG9uc2VTb3VyY2Ug PT09IFdJLlJlc291cmNlLlJlc3BvbnNlU291cmNlLlNlcnZpY2VXb3JrZXIpKSB7CiAgICAgICAg ICAgICAgICAgY2VsbC5jbGFzc0xpc3QuYWRkKCJjYWNoZS10eXBlIik7CiAgICAgICAgICAgICAg ICAgY2VsbC50ZXh0Q29udGVudCA9IFdJLlVJU3RyaW5nKCIoc2VydmljZSB3b3JrZXIpIik7Cisg ICAgICAgICAgICAgICAgY2VsbC50aXRsZSA9IFdJLlVJU3RyaW5nKCJUaGlzIHJlc291cmNlIHdh cyBsb2FkZWQgZnJvbSBhIHNlcnZpY2Ugd29ya2VyIik7CiAgICAgICAgICAgICAgICAgcmV0dXJu OwogICAgICAgICAgICAgfQorCisgICAgICAgICAgICBjb25zb2xlLmFzc2VydCghY2VsbC5jbGFz c0xpc3QuY29udGFpbnMoImNhY2hlLXR5cGUiKSwgIlNob3VsZCBub3QgaGF2ZSBjYWNoZS10eXBl IGNsYXNzIG9uIGNlbGwuIik7CisKICAgICAgICAgICAgIGxldCB0cmFuc2ZlclNpemUgPSByZXNv dXJjZUVudHJpZXMucmVkdWNlKChhY2N1bXVsYXRvciwgY3VycmVudCkgPT4gYWNjdW11bGF0b3Ig KyAoY3VycmVudC50cmFuc2ZlclNpemUgfHwgMCksIDApOwotICAgICAgICAgICAgaWYgKGlzTmFO KHRyYW5zZmVyU2l6ZSkpCi0gICAgICAgICAgICAgICAgY2VsbC50ZXh0Q29udGVudCA9IGVtRGFz aDsKLSAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICBjZWxsLnRleHRDb250ZW50ID0g TnVtYmVyLmJ5dGVzVG9TdHJpbmcodHJhbnNmZXJTaXplKTsKKyAgICAgICAgICAgIGNlbGwudGV4 dENvbnRlbnQgPSBpc05hTih0cmFuc2ZlclNpemUpID8gZW1EYXNoIDogTnVtYmVyLmJ5dGVzVG9T dHJpbmcodHJhbnNmZXJTaXplKTsKKyAgICAgICAgICAgIGNlbGwudGl0bGUgPSAiIjsKICAgICAg ICAgICAgIHJldHVybjsKICAgICAgICAgfQogCkBAIC03NjMsMjcgKzc2OSwzMyBAQCBXSS5OZXR3 b3JrVGFibGVDb250ZW50VmlldyA9IGNsYXNzIE5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3IGV4dGVu ZHMgV0kuQ29udGVudFZpZQogICAgICAgICBpZiAocmVzcG9uc2VTb3VyY2UgPT09IFdJLlJlc291 cmNlLlJlc3BvbnNlU291cmNlLk1lbW9yeUNhY2hlKSB7CiAgICAgICAgICAgICBjZWxsLmNsYXNz TGlzdC5hZGQoImNhY2hlLXR5cGUiKTsKICAgICAgICAgICAgIGNlbGwudGV4dENvbnRlbnQgPSBX SS5VSVN0cmluZygiKG1lbW9yeSkiKTsKKyAgICAgICAgICAgIGNlbGwudGl0bGUgPSBXSS5VSVN0 cmluZygiVGhpcyByZXNvdXJjZSB3YXMgbG9hZGVkIGZyb20gdGhlIG1lbW9yeSBjYWNoZSIpOwog ICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAgICAgICAgIGlmIChyZXNwb25zZVNvdXJj ZSA9PT0gV0kuUmVzb3VyY2UuUmVzcG9uc2VTb3VyY2UuRGlza0NhY2hlKSB7CiAgICAgICAgICAg ICBjZWxsLmNsYXNzTGlzdC5hZGQoImNhY2hlLXR5cGUiKTsKICAgICAgICAgICAgIGNlbGwudGV4 dENvbnRlbnQgPSBXSS5VSVN0cmluZygiKGRpc2spIik7CisgICAgICAgICAgICBjZWxsLnRpdGxl ID0gV0kuVUlTdHJpbmcoIlRoaXMgcmVzb3VyY2Ugd2FzIGxvYWRlZCBmcm9tIHRoZSBkaXNrIGNh Y2hlIik7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KICAgICAgICAgaWYgKHJlc3Bv bnNlU291cmNlID09PSBXSS5SZXNvdXJjZS5SZXNwb25zZVNvdXJjZS5TZXJ2aWNlV29ya2VyKSB7 CiAgICAgICAgICAgICBjZWxsLmNsYXNzTGlzdC5hZGQoImNhY2hlLXR5cGUiKTsKICAgICAgICAg ICAgIGNlbGwudGV4dENvbnRlbnQgPSBXSS5VSVN0cmluZygiKHNlcnZpY2Ugd29ya2VyKSIpOwor ICAgICAgICAgICAgY2VsbC50aXRsZSA9IFdJLlVJU3RyaW5nKCJUaGlzIHJlc291cmNlIHdhcyBs b2FkZWQgZnJvbSBhIHNlcnZpY2Ugd29ya2VyIik7CiAgICAgICAgICAgICByZXR1cm47CiAgICAg ICAgIH0KICAgICAgICAgaWYgKHJlc3BvbnNlU291cmNlID09PSBXSS5SZXNvdXJjZS5SZXNwb25z ZVNvdXJjZS5JbnNwZWN0b3JPdmVycmlkZSkgewogICAgICAgICAgICAgY2VsbC5jbGFzc0xpc3Qu YWRkKCJjYWNoZS10eXBlIik7Ci0gICAgICAgICAgICBjZWxsLnRleHRDb250ZW50ID0gV0kuVUlT dHJpbmcoIihpbnNwZWN0b3Igb3ZlcnJpZGUpIik7CisgICAgICAgICAgICBjZWxsLnRleHRDb250 ZW50ID0gV0kuVUlTdHJpbmcoIihsb2NhbCBvdmVycmlkZSkiKTsKKyAgICAgICAgICAgIGNlbGwu dGl0bGUgPSBXSS5VSVN0cmluZygiVGhpcyByZXNvdXJjZSB3YXMgbG9hZGVkIGZyb20gYSBsb2Nh bCBvdmVycmlkZSIpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKKyAgICAgICAg Y29uc29sZS5hc3NlcnQoIWNlbGwuY2xhc3NMaXN0LmNvbnRhaW5zKCJjYWNoZS10eXBlIiksICJT aG91bGQgbm90IGhhdmUgY2FjaGUtdHlwZSBjbGFzcyBvbiBjZWxsLiIpOworCiAgICAgICAgIGxl dCB0cmFuc2ZlclNpemUgPSBlbnRyeS50cmFuc2ZlclNpemU7CiAgICAgICAgIGNlbGwudGV4dENv bnRlbnQgPSBpc05hTih0cmFuc2ZlclNpemUpID8gZW1EYXNoIDogTnVtYmVyLmJ5dGVzVG9TdHJp bmcodHJhbnNmZXJTaXplKTsKLSAgICAgICAgY29uc29sZS5hc3NlcnQoIWNlbGwuY2xhc3NMaXN0 LmNvbnRhaW5zKCJjYWNoZS10eXBlIiksICJTaG91bGQgbm90IGhhdmUgY2FjaGUtdHlwZSBjbGFz cyBvbiBjZWxsLiIpOworICAgICAgICBjZWxsLnRpdGxlID0gIiI7CiAgICAgfQogCiAgICAgX3Bv cHVsYXRlV2F0ZXJmYWxsR3JhcGgoY2VsbCwgZW50cnkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZUhlYWRlcnNDb250ZW50Vmll dy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNl SGVhZGVyc0NvbnRlbnRWaWV3LmpzCmluZGV4IDNhNTZlMGZkMjJmMTZjNGJhZWYxOWFmOWYzOTRj OTc1NTc1NTVmM2QuLjYwZTZjNWVjMWQyMzhjNmEyYjE4NzAyNDVjNGQ1MjYzMzA3YWRmNjQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291 cmNlSGVhZGVyc0NvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlSGVhZGVyc0NvbnRlbnRWaWV3LmpzCkBAIC0yMzMsNyAr MjMzLDcgQEAgV0kuUmVzb3VyY2VIZWFkZXJzQ29udGVudFZpZXcgPSBjbGFzcyBSZXNvdXJjZUhl YWRlcnNDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnQKICAgICAgICAgY2FzZSBXSS5SZXNvdXJj ZS5SZXNwb25zZVNvdXJjZS5TZXJ2aWNlV29ya2VyOgogICAgICAgICAgICAgcmV0dXJuIFdJLlVJ U3RyaW5nKCJTZXJ2aWNlIFdvcmtlciIpOwogICAgICAgICBjYXNlIFdJLlJlc291cmNlLlJlc3Bv bnNlU291cmNlLkluc3BlY3Rvck92ZXJyaWRlOgotICAgICAgICAgICAgcmV0dXJuIFdJLlVJU3Ry aW5nKCJJbnNwZWN0b3IgT3ZlcnJpZGUiKTsKKyAgICAgICAgICAgIHJldHVybiBXSS5VSVN0cmlu ZygiTG9jYWwgT3ZlcnJpZGUiKTsKICAgICAgICAgY2FzZSBXSS5SZXNvdXJjZS5SZXNwb25zZVNv dXJjZS5Vbmtub3duOgogICAgICAgICBkZWZhdWx0OgogICAgICAgICAgICAgcmV0dXJuIG51bGw7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9S ZXNvdXJjZVNpemVzQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9SZXNvdXJjZVNpemVzQ29udGVudFZpZXcuanMKaW5kZXggYWU1NWIxMDJj ZDVmYjAxOGFiYjFlNzc2ZjA2OWM1YzZmNmYzNDA4MS4uMjEzOGY2NTdmNDBhNzU5ZmQ2MGY1ZjI0 NzYwNDVjN2MyYjQyNmU1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvUmVzb3VyY2VTaXplc0NvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlU2l6ZXNDb250ZW50Vmll dy5qcwpAQCAtMTMwLDcgKzEzMCwxMSBAQCBXSS5SZXNvdXJjZVNpemVzQ29udGVudFZpZXcgPSBj bGFzcyBSZXNvdXJjZVNpemVzQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50VgogCiAgICAg ICAgIGxldCByZXNvdXJjZUNvbXBvbmVudHMgPSBjcmVhdGVTaXplQ29tcG9uZW50cyhyZXNvdXJj ZVNlY3Rpb24sIFdJLlVJU3RyaW5nKCJSZXNvdXJjZSBTaXplIiksIG51bGwsIFdJLlVJU3RyaW5n KCJDb21wcmVzc2lvbjoiKSwgV0kuVUlTdHJpbmcoIk1JTUUgVHlwZToiKSk7CiAgICAgICAgIHJl c291cmNlQ29tcG9uZW50cy5jb250YWluZXIuY2xhc3NMaXN0LmFkZChXSS5SZXNvdXJjZVRyZWVF bGVtZW50LlJlc291cmNlSWNvblN0eWxlQ2xhc3NOYW1lLCAuLi5XSS5SZXNvdXJjZS5jbGFzc05h bWVzRm9yUmVzb3VyY2UodGhpcy5fcmVzb3VyY2UpKTsKKwogICAgICAgICByZXNvdXJjZUNvbXBv bmVudHMuaW1hZ2VFbGVtZW50LmNsYXNzTGlzdC5hZGQoImljb24iKTsKKyAgICAgICAgaWYgKHRo aXMuX3Jlc291cmNlLnJlc3BvbnNlU291cmNlID09PSBXSS5SZXNvdXJjZS5SZXNwb25zZVNvdXJj ZS5JbnNwZWN0b3JPdmVycmlkZSkKKyAgICAgICAgICAgIHJlc291cmNlQ29tcG9uZW50cy5pbWFn ZUVsZW1lbnQudGl0bGUgPSBXSS5VSVN0cmluZygiVGhpcyByZXNvdXJjZSB3YXMgbG9hZGVkIGZy b20gYSBsb2NhbCBvdmVycmlkZSIpOworCiAgICAgICAgIHRoaXMuX3Jlc291cmNlQnl0ZXNFbGVt ZW50ID0gcmVzb3VyY2VDb21wb25lbnRzLmJ5dGVzRWxlbWVudDsKICAgICAgICAgdGhpcy5fcmVz b3VyY2VCeXRlc1N1ZmZpeEVsZW1lbnQgPSByZXNvdXJjZUNvbXBvbmVudHMuc3VmZml4RWxlbWVu dDsKICAgICAgICAgdGhpcy5fY29tcHJlc3Npb25FbGVtZW50ID0gcmVzb3VyY2VDb21wb25lbnRz LnZhbHVlMUVsZW1lbnQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9SZXNvdXJjZVRpbWVsaW5lRGF0YUdyaWROb2RlLmpzIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVzb3VyY2VUaW1lbGluZURhdGFHcmlk Tm9kZS5qcwppbmRleCA3ZWFmZTExN2I3ZWU5ODYwYTgyMTE4MDM2NGRhZWFlYTEyZGZkNGZlLi44 MmQ3NTM4MDQ0NWVlYWFiYzQzZjU3MDFjZThjZDM0MDkxZTY4YTdkIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZVRpbWVsaW5lRGF0 YUdyaWROb2RlLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1Jlc291cmNlVGltZWxpbmVEYXRhR3JpZE5vZGUuanMKQEAgLTc1LDYgKzc1LDcgQEAgV0ku UmVzb3VyY2VUaW1lbGluZURhdGFHcmlkTm9kZSA9IGNsYXNzIFJlc291cmNlVGltZWxpbmVEYXRh R3JpZE5vZGUgZXh0ZW5kcyBXSS4KICAgICAgICAgdGhpcy5fY2FjaGVkRGF0YS5yZW1vdGVBZGRy ZXNzID0gdGhpcy5yZXNvdXJjZS5yZW1vdGVBZGRyZXNzOwogICAgICAgICB0aGlzLl9jYWNoZWRE YXRhLmNvbm5lY3Rpb25JZGVudGlmaWVyID0gdGhpcy5yZXNvdXJjZS5jb25uZWN0aW9uSWRlbnRp ZmllcjsKICAgICAgICAgdGhpcy5fY2FjaGVkRGF0YS5pbml0aWF0b3IgPSB0aGlzLnJlc291cmNl LmluaXRpYXRvclNvdXJjZUNvZGVMb2NhdGlvbjsKKyAgICAgICAgdGhpcy5fY2FjaGVkRGF0YS5z b3VyY2UgPSB0aGlzLnJlc291cmNlLmluaXRpYXRvclNvdXJjZUNvZGVMb2NhdGlvbjsgLy8gVGlt ZWxpbmUgT3ZlcnZpZXcKICAgICAgICAgcmV0dXJuIHRoaXMuX2NhY2hlZERhdGE7CiAgICAgfQog CkBAIC0xNDgsNiArMTQ5LDE2IEBAIFdJLlJlc291cmNlVGltZWxpbmVEYXRhR3JpZE5vZGUgPSBj bGFzcyBSZXNvdXJjZVRpbWVsaW5lRGF0YUdyaWROb2RlIGV4dGVuZHMgV0kuCiAgICAgICAgIHJl dHVybiBzdXBlci5jcmVhdGVDZWxsQ29udGVudChjb2x1bW5JZGVudGlmaWVyLCBjZWxsKTsKICAg ICB9CiAKKyAgICBnZW5lcmF0ZUljb25UaXRsZShjb2x1bW5JZGVudGlmaWVyKQorICAgIHsKKyAg ICAgICAgaWYgKGNvbHVtbklkZW50aWZpZXIgPT09ICJuYW1lIikgeworICAgICAgICAgICAgaWYg KHRoaXMucmVzb3VyY2UucmVzcG9uc2VTb3VyY2UgPT09IFdJLlJlc291cmNlLlJlc3BvbnNlU291 cmNlLkluc3BlY3Rvck92ZXJyaWRlKQorICAgICAgICAgICAgICAgIHJldHVybiBXSS5VSVN0cmlu ZygiVGhpcyByZXNvdXJjZSB3YXMgbG9hZGVkIGZyb20gYSBsb2NhbCBvdmVycmlkZSIpOworICAg ICAgICB9CisKKyAgICAgICAgcmV0dXJuIHN1cGVyLmdlbmVyYXRlSWNvblRpdGxlKGNvbHVtbklk ZW50aWZpZXIpOworICAgIH0KKwogICAgIHJlZnJlc2goKQogICAgIHsKICAgICAgICAgaWYgKHRo aXMuX3NjaGVkdWxlZFJlZnJlc2hJZGVudGlmaWVyKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZVRyZWVFbGVtZW50LmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVzb3VyY2VUcmVlRWxl bWVudC5qcwppbmRleCBjYTQ4Nzc1ZmEzMWM0OTRkNDc4MmU4NTM5OTQ3MjNjOWU5OGZlM2VlLi4z NTM1YzdhNTcxOGU2YTU5MzFlYWU2ODVmMmRlMDIwMzYwODQyOTU3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZVRyZWVFbGVtZW50 LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291 cmNlVHJlZUVsZW1lbnQuanMKQEAgLTI2Miw2ICsyNjIsOCBAQCBXSS5SZXNvdXJjZVRyZWVFbGVt ZW50ID0gY2xhc3MgUmVzb3VyY2VUcmVlRWxlbWVudCBleHRlbmRzIFdJLlNvdXJjZUNvZGVUcmVl RWxlbQogICAgICAgICAgICAgdGhpcy5hZGRDbGFzc05hbWUoIm92ZXJyaWRlIik7CiAgICAgICAg IGVsc2UKICAgICAgICAgICAgIHRoaXMucmVtb3ZlQ2xhc3NOYW1lKCJvdmVycmlkZSIpOworCisg ICAgICAgIHRoaXMuaWNvbkVsZW1lbnQudGl0bGUgPSB3YXNPdmVycmlkZGVuID8gV0kuVUlTdHJp bmcoIlRoaXMgcmVzb3VyY2Ugd2FzIGxvYWRlZCBmcm9tIGEgbG9jYWwgb3ZlcnJpZGUiKSA6ICIi OwogICAgIH0KIAogICAgIF91cmxEaWRDaGFuZ2UoZXZlbnQpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZURhdGFHcmlkTm9kZS5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lRGF0 YUdyaWROb2RlLmpzCmluZGV4IDFjMzY4ZDRkZWRlYTNiMTcyMTljZGZkOGNhMTg1ZjQwMmU1YmVl MjQuLjY3YWNmMGRmMGFlZGVhYzFjZjRlN2RkNDQ0M2Q0Mzg1ZGQ0YzQ3YTQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lRGF0YUdy aWROb2RlLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1RpbWVsaW5lRGF0YUdyaWROb2RlLmpzCkBAIC0xNTAsNyArMTUwLDExIEBAIFdJLlRpbWVsaW5l RGF0YUdyaWROb2RlID0gY2xhc3MgVGltZWxpbmVEYXRhR3JpZE5vZGUgZXh0ZW5kcyBXSS5EYXRh R3JpZE5vZGUKIAogICAgICAgICAgICAgdmFyIGZyYWdtZW50ID0gZG9jdW1lbnQuY3JlYXRlRG9j dW1lbnRGcmFnbWVudCgpOwogCi0gICAgICAgICAgICBpZiAoY2FsbEZyYW1lLnNvdXJjZUNvZGVM b2NhdGlvbiAmJiBjYWxsRnJhbWUuc291cmNlQ29kZUxvY2F0aW9uLnNvdXJjZUNvZGUpIHsKKyAg ICAgICAgICAgIGxldCBpY29uRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIp OworICAgICAgICAgICAgaWNvbkVsZW1lbnQuY2xhc3NMaXN0LmFkZCgiaWNvbiIpOworCisgICAg ICAgICAgICBsZXQgc291cmNlQ29kZSA9IGNhbGxGcmFtZS5zb3VyY2VDb2RlTG9jYXRpb24/LnNv dXJjZUNvZGU7CisgICAgICAgICAgICBpZiAoc291cmNlQ29kZSkgewogICAgICAgICAgICAgICAg IC8vIEdpdmUgdGhlIHdob2xlIGNlbGwgYSB0b29sdGlwIGFuZCBrZWVwIGl0IHVwIHRvIGRhdGUu CiAgICAgICAgICAgICAgICAgY2FsbEZyYW1lLnNvdXJjZUNvZGVMb2NhdGlvbi5wb3B1bGF0ZUxp dmVEaXNwbGF5TG9jYXRpb25Ub29sdGlwKGNlbGwpOwogCkBAIC0xNTgsMTAgKzE2MiwxMiBAQCBX SS5UaW1lbGluZURhdGFHcmlkTm9kZSA9IGNsYXNzIFRpbWVsaW5lRGF0YUdyaWROb2RlIGV4dGVu ZHMgV0kuRGF0YUdyaWROb2RlCiAKICAgICAgICAgICAgICAgICBpZiAoaXNBbm9ueW1vdXNGdW5j dGlvbikgewogICAgICAgICAgICAgICAgICAgICAvLyBGb3IgYW5vbnltb3VzIGZ1bmN0aW9ucyB3 ZSBzaG93IHRoZSByZXNvdXJjZSBvciBzY3JpcHQgaWNvbiBhbmQgbmFtZS4KLSAgICAgICAgICAg ICAgICAgICAgaWYgKGNhbGxGcmFtZS5zb3VyY2VDb2RlTG9jYXRpb24uc291cmNlQ29kZSBpbnN0 YW5jZW9mIFdJLlJlc291cmNlKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICBjZWxsLmNsYXNz TGlzdC5hZGQoV0kuUmVzb3VyY2VUcmVlRWxlbWVudC5SZXNvdXJjZUljb25TdHlsZUNsYXNzTmFt ZSwgLi4uV0kuUmVzb3VyY2UuY2xhc3NOYW1lc0ZvclJlc291cmNlKGNhbGxGcmFtZS5zb3VyY2VD b2RlTG9jYXRpb24uc291cmNlQ29kZSkpOwotICAgICAgICAgICAgICAgICAgICB9IGVsc2UgaWYg KGNhbGxGcmFtZS5zb3VyY2VDb2RlTG9jYXRpb24uc291cmNlQ29kZSBpbnN0YW5jZW9mIFdJLlNj cmlwdCkgewotICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGNhbGxGcmFtZS5zb3VyY2VDb2Rl TG9jYXRpb24uc291cmNlQ29kZS51cmwpIHsKKyAgICAgICAgICAgICAgICAgICAgaWYgKHNvdXJj ZUNvZGUgaW5zdGFuY2VvZiBXSS5SZXNvdXJjZSkgeworICAgICAgICAgICAgICAgICAgICAgICAg Y2VsbC5jbGFzc0xpc3QuYWRkKFdJLlJlc291cmNlVHJlZUVsZW1lbnQuUmVzb3VyY2VJY29uU3R5 bGVDbGFzc05hbWUsIC4uLldJLlJlc291cmNlLmNsYXNzTmFtZXNGb3JSZXNvdXJjZShzb3VyY2VD b2RlKSk7CisgICAgICAgICAgICAgICAgICAgICAgICBpZiAoc291cmNlQ29kZS5yZXNwb25zZVNv dXJjZSA9PT0gV0kuUmVzb3VyY2UuUmVzcG9uc2VTb3VyY2UuSW5zcGVjdG9yT3ZlcnJpZGUpCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgaWNvbkVsZW1lbnQudGl0bGUgPSBXSS5VSVN0cmlu ZygiVGhpcyByZXNvdXJjZSB3YXMgbG9hZGVkIGZyb20gYSBsb2NhbCBvdmVycmlkZSIpOworICAg ICAgICAgICAgICAgICAgICB9IGVsc2UgaWYgKHNvdXJjZUNvZGUgaW5zdGFuY2VvZiBXSS5TY3Jp cHQpIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIGlmIChzb3VyY2VDb2RlLnVybCkgewogICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGNlbGwuY2xhc3NMaXN0LmFkZChXSS5SZXNvdXJjZVRy ZWVFbGVtZW50LlJlc291cmNlSWNvblN0eWxlQ2xhc3NOYW1lKTsKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBjZWxsLmNsYXNzTGlzdC5hZGQoV0kuUmVzb3VyY2UuVHlwZS5TY3JpcHQpOwog ICAgICAgICAgICAgICAgICAgICAgICAgfSBlbHNlCkBAIC0xODksMTAgKzE5NSw3IEBAIFdJLlRp bWVsaW5lRGF0YUdyaWROb2RlID0gY2xhc3MgVGltZWxpbmVEYXRhR3JpZE5vZGUgZXh0ZW5kcyBX SS5EYXRhR3JpZE5vZGUKICAgICAgICAgICAgICAgICByZXR1cm4gZnJhZ21lbnQ7CiAgICAgICAg ICAgICB9CiAKLSAgICAgICAgICAgIHZhciBpY29uID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgi ZGl2Iik7Ci0gICAgICAgICAgICBpY29uLmNsYXNzTGlzdC5hZGQoImljb24iKTsKLQotICAgICAg ICAgICAgZnJhZ21lbnQuYXBwZW5kKGljb24sIGZ1bmN0aW9uTmFtZSk7CisgICAgICAgICAgICBm cmFnbWVudC5hcHBlbmQoaWNvbkVsZW1lbnQsIGZ1bmN0aW9uTmFtZSk7CiAKICAgICAgICAgICAg IHJldHVybiBmcmFnbWVudDsKICAgICAgICAgfQpAQCAtMjA1LDYgKzIwOCwxNiBAQCBXSS5UaW1l bGluZURhdGFHcmlkTm9kZSA9IGNsYXNzIFRpbWVsaW5lRGF0YUdyaWROb2RlIGV4dGVuZHMgV0ku RGF0YUdyaWROb2RlCiAgICAgICAgIHJldHVybiBzdXBlci5jcmVhdGVDZWxsQ29udGVudChjb2x1 bW5JZGVudGlmaWVyLCBjZWxsKTsKICAgICB9CiAKKyAgICBnZW5lcmF0ZUljb25UaXRsZShjb2x1 bW5JZGVudGlmaWVyKQorICAgIHsKKyAgICAgICAgbGV0IHZhbHVlID0gdGhpcy5kYXRhW2NvbHVt bklkZW50aWZpZXJdOworCisgICAgICAgIGlmICh2YWx1ZSBpbnN0YW5jZW9mIFdJLlNvdXJjZUNv ZGVMb2NhdGlvbiAmJiB2YWx1ZS5zb3VyY2VDb2RlIGluc3RhbmNlb2YgV0kuUmVzb3VyY2UgJiYg dmFsdWUuc291cmNlQ29kZS5yZXNwb25zZVNvdXJjZSA9PT0gV0kuUmVzb3VyY2UuUmVzcG9uc2VT b3VyY2UuSW5zcGVjdG9yT3ZlcnJpZGUpCisgICAgICAgICAgICByZXR1cm4gV0kuVUlTdHJpbmco IlRoaXMgcmVzb3VyY2Ugd2FzIGxvYWRlZCBmcm9tIGEgbG9jYWwgb3ZlcnJpZGUiKTsKKworICAg ICAgICByZXR1cm4gc3VwZXIuZ2VuZXJhdGVJY29uVGl0bGUoY29sdW1uSWRlbnRpZmllcik7Cisg ICAgfQorCiAgICAgcmVmcmVzaCgpCiAgICAgewogICAgICAgICB0aGlzLl9jYWNoZWREYXRhID0g bnVsbDsK