200236 2019-07-29 13:26:10 -0700 Web Inspector: Sources: increase the vertical space allocated to the call stack when paused 2019-08-09 15:01:25 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 hi hi commit-queue hi inspector-bugzilla-changes joepeck nvasilyev webkit-bug-importer oldest_to_newest 1556678 0 hi 2019-07-29 13:26:10 -0700 When paused, usually the most important/useful info is the call stack, so we should give it more space/priority. On the same idea, when not paused, it's likely that the developer cares more about the resources with breakpoints than those without. 1556691 1 375098 hi 2019-07-29 13:57:16 -0700 Created attachment 375098 Patch 1556696 2 375100 hi 2019-07-29 14:11:14 -0700 Created attachment 375100 Patch 1556727 3 nvasilyev 2019-07-29 14:38:42 -0700 Screenshot? 1556762 4 hi 2019-07-29 15:43:23 -0700 (In reply to Nikita Vasilyev from comment #3) > Screenshot? I didn't include a screenshot because it's highly dependent on the height of the inspector window (flexbox). The UI looks the exact same, other than that the Call Stack and Breakpoints sections are larger. 1560046 5 375100 joepeck 2019-08-09 14:34:57 -0700 Comment on attachment 375100 Patch rs=me 1560063 6 375100 commit-queue 2019-08-09 14:59:35 -0700 Comment on attachment 375100 Patch Clearing flags on attachment: 375100 Committed r248480: <https://trac.webkit.org/changeset/248480> 1560064 7 commit-queue 2019-08-09 14:59:37 -0700 All reviewed patches have been landed. Closing bug. 1560065 8 webkit-bug-importer 2019-08-09 15:01:25 -0700 <rdar://problem/54144153> 375098 2019-07-29 13:57:16 -0700 2019-07-29 14:11:14 -0700 Patch bug-200236-20190729135715.patch text/plain 18461 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDI3ZjBmOGQyZjViMmNkMGMwNDlhNWU0NmRiZWNm MGNhZDZlY2NjYjguLjE3MGRhZjM3NWJlZTAxZTcxM2FiYTMxMTE5Y2IyY2IzNGRmNmM0NmQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDY5IEBACisyMDE5LTA3LTI5ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBT b3VyY2VzOiBpbmNyZWFzZSB0aGUgdmVydGljYWwgc3BhY2UgYWxsb2NhdGVkIHRvIHRoZSBjYWxs IHN0YWNrIHdoZW4gcGF1c2VkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMDAyMzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBSYXRoZXIgdGhhbiB1bmlmb3JtbHkgY29uc3RyaWN0IHRoZSBoZWlnaHQgb2Yg dGhlIENhbGwgU3RhY2sgYW5kIEJyZWFrcG9pbnRzIHNlY3Rpb25zLCB0aGV5CisgICAgICAgIHNo b3VsZCAiZmxleCIgYmFzZWQgb24gdGhlaXIgaW1wb3J0YW5jZSwgd2hpY2ggY2FuIGxpa2VseSBi ZSBkZXJpdmVkIGZyb20gdGhlIGN1cnJlbnQgc3RhdGUuCisgICAgICAgIFRoaXMgd2F5LCBpdCdz IHBvc3NpYmxlIHRvIHNlZSBpbmZvcm1hdGlvbiBmcm9tIGVhY2ggc2VjdGlvbiBhdCB0aGUgc2Ft ZSB0aW1lLCBidXQgc3RpbGwKKyAgICAgICAgaGF2ZSBlbm91Z2ggc3BhY2UgaW4gZWFjaCBzZWN0 aW9uIHRvIGJlIGFibGUgdG8gZG8gc29tZXRoaW5nIHVzZWZ1bC4KKworICAgICAgICBXaGVuIHBh dXNlZCwgdGhlIG1vc3QgdXNlZnVsIGRhdGEgaXMgdGhlIGNhbGwgc3RhY2ssIHNvIGdpdmUgdGhl IENhbGwgU3RhY2sgc2VjdGlvbiB0aGUgbW9zdAorICAgICAgICB2ZXJ0aWNhbCBzcGFjZSAodGhl IFBhdXNlIFJlYXNvbiBpcyBhbHNvIGltcG9ydGFudCwgYnV0IGl0IHVzdWFsbHkgbmVlZHMgdmVy eSBsaXR0bGUgc3BhY2UpLgorCisgICAgICAgIFdoZW4gbm90IHBhdXNlZCwgaXQncyBsaWtlbHkg dGhhdCB0aGUgdXNlciBjYXJlcyBtb3JlIGFib3V0IHRoZSByZXNvdXJjZXMgd2l0aCBicmVha3Bv aW50cworICAgICAgICB0aGFuIHRob3NlIHdpdGhvdXQsIHNvIGZhdm9yIHRoZSBCcmVha3BvaW50 cyBzZWN0aW9uLgorCisgICAgICAgIEVhY2ggc2VjdGlvbiB3aWxsIG9ubHkgZXhwYW5kIHRvIGZp dCBpdCdzIG1heGltdW0gY29udGVudCBoZWlnaHQuCisKKyAgICAgICAgSWYgdGhlIGluc3BlY3Rv ciB3aW5kb3cgYmVjb21lcyB0b28gc2hvcnQsIHJlbW92ZSB0aGUgImZsZXgiIGVudGlyZWx5IGFu ZCBoYXZlIGFsbCB0aGUKKyAgICAgICAgY29udGVudCBiZSBwYXJ0IG9mIGEgc2luZ2xlIHNjcm9s bCBhcmVhIGluc3RlYWQuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1NvdXJjZXNO YXZpZ2F0aW9uU2lkZWJhclBhbmVsLmpzOgorICAgICAgICAoV0kuU291cmNlc05hdmlnYXRpb25T aWRlYmFyUGFuZWwpOgorICAgICAgICAoV0kuU291cmNlc05hdmlnYXRpb25TaWRlYmFyUGFuZWwu cHJvdG90eXBlLmNyZWF0ZUNvbnRlbnRUcmVlT3V0bGluZSk6CisgICAgICAgIChXSS5Tb3VyY2Vz TmF2aWdhdGlvblNpZGViYXJQYW5lbC5wcm90b3R5cGUuX2hhbmRsZUJyZWFrcG9pbnRFbGVtZW50 QWRkZWRPclJlbW92ZWQpOgorICAgICAgICAoV0kuU291cmNlc05hdmlnYXRpb25TaWRlYmFyUGFu ZWwucHJvdG90eXBlLl9oYW5kbGVEZWJ1Z2dlclBhdXNlZCk6CisgICAgICAgIChXSS5Tb3VyY2Vz TmF2aWdhdGlvblNpZGViYXJQYW5lbC5wcm90b3R5cGUuX2hhbmRsZURlYnVnZ2VyUmVzdW1lZCk6 CisgICAgICAgIChXSS5Tb3VyY2VzTmF2aWdhdGlvblNpZGViYXJQYW5lbC5wcm90b3R5cGUuX2hh bmRsZUNhbGxTdGFja0VsZW1lbnRBZGRlZE9yUmVtb3ZlZCk6IERlbGV0ZWQuCisgICAgICAgICog VXNlckludGVyZmFjZS9WaWV3cy9Tb3VyY2VzTmF2aWdhdGlvblNpZGViYXJQYW5lbC5jc3M6Cisg ICAgICAgICguc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLnNvdXJjZXMgPiAuY29udGVudCA+ IDptYXRjaGVzKC5wYXVzZS1yZWFzb24tY29udGFpbmVyLCAuY2FsbC1zdGFjay1jb250YWluZXIs IC5icmVha3BvaW50cy1jb250YWluZXIpKTogQWRkZWQuCisgICAgICAgICguc2lkZWJhciA+IC5w YW5lbC5uYXZpZ2F0aW9uLnNvdXJjZXMgPiAuY29udGVudCAuZGV0YWlscy1zZWN0aW9uKTogQWRk ZWQuCisgICAgICAgICguc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLnNvdXJjZXMgPiAuY29u dGVudCAuZGV0YWlscy1zZWN0aW9uLmNvbGxhcHNlZCA+IC5oZWFkZXIgPiAub3B0aW9ucywgLnNp ZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi5zb3VyY2VzID4gLmNvbnRlbnQgLmRldGFpbHMtc2Vj dGlvbjpub3QoLmNvbGxhcHNlZCkgPiAuY29udGVudCwgLnNpZGViYXIgPiAucGFuZWwubmF2aWdh dGlvbi5zb3VyY2VzID4gLmNvbnRlbnQgLmRldGFpbHMtc2VjdGlvbjpub3QoLmNvbGxhcHNlZCkg PiAuY29udGVudCA+IC5ncm91cCk6IEFkZGVkLgorICAgICAgICAoLnNpZGViYXIgPiAucGFuZWwu bmF2aWdhdGlvbi5zb3VyY2VzID4gLmNvbnRlbnQgPiAuYnJlYWtwb2ludHMtY29udGFpbmVyIC5j cmVhdGUtYnJlYWtwb2ludCk6IEFkZGVkLgorICAgICAgICAoLnNpZGViYXIgPiAucGFuZWwubmF2 aWdhdGlvbi5zb3VyY2VzID4gLmNvbnRlbnQgPiAubmF2aWdhdGlvbi1iYXIpOiBBZGRlZC4KKyAg ICAgICAgKEBtZWRpYSAobWluLWhlaWdodDogNjUwcHgpKTogQWRkZWQuCisgICAgICAgICguc2lk ZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLnNvdXJjZXMgPiAuY29udGVudCA+IC5wYXVzZS1yZWFz b24tY29udGFpbmVyKTogQWRkZWQuCisgICAgICAgICguc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0 aW9uLnNvdXJjZXMgPiAuY29udGVudCA+IDptYXRjaGVzKC5jYWxsLXN0YWNrLWNvbnRhaW5lciwg LmJyZWFrcG9pbnRzLWNvbnRhaW5lciwgLnJlc291cmNlcykpOiBBZGRlZC4KKyAgICAgICAgKC5z aWRlYmFyID4gLnBhbmVsLm5hdmlnYXRpb24uc291cmNlcyA+IC5jb250ZW50ID4gLmNhbGwtc3Rh Y2stY29udGFpbmVyKTogQWRkZWQuCisgICAgICAgICguc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0 aW9uLnNvdXJjZXMgPiAuY29udGVudCA+IC5icmVha3BvaW50cy1jb250YWluZXIpOiBBZGRlZC4K KyAgICAgICAgKC5zaWRlYmFyID4gLnBhbmVsLm5hdmlnYXRpb24uc291cmNlcyA+IC5jb250ZW50 ID4gLnJlc291cmNlcyk6IEFkZGVkLgorICAgICAgICAoLnNpZGViYXIgPiAucGFuZWwubmF2aWdh dGlvbi5zb3VyY2VzID4gLmNvbnRlbnQgPiAuYnJlYWtwb2ludHMtY29udGFpbmVyIC50cmVlLW91 dGxpbmUgLml0ZW0uZXZlbnQtdGFyZ2V0LXdpbmRvdyAuaWNvbik6IEFkZGVkLgorICAgICAgICAo LnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi5zb3VyY2VzID4gLmNvbnRlbnQgPiAuZGV0YWls cy1zZWN0aW9uKTogRGVsZXRlZC4KKyAgICAgICAgKC5zaWRlYmFyID4gLnBhbmVsLm5hdmlnYXRp b24uc291cmNlcyA+IC5jb250ZW50ID4gLmRldGFpbHMtc2VjdGlvbjptYXRjaGVzKC5wYXVzZWQt cmVhc29uLCAuYnJlYWtwb2ludHMpLmNvbGxhcHNlZCA+IC5oZWFkZXIgPiAub3B0aW9ucywpOiBE ZWxldGVkLgorICAgICAgICAoLnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi5zb3VyY2VzID4g LmNvbnRlbnQgPiAuZGV0YWlscy1zZWN0aW9uLmNvbGxhcHNlZCA+IC5jb250ZW50KTogRGVsZXRl ZC4KKyAgICAgICAgKC5zaWRlYmFyID4gLnBhbmVsLm5hdmlnYXRpb24uc291cmNlcyA+IC5jb250 ZW50ID4gLmRldGFpbHMtc2VjdGlvbi5icmVha3BvaW50cyA+IC5oZWFkZXIgPiAub3B0aW9ucyAu Y3JlYXRlLWJyZWFrcG9pbnQpOiBEZWxldGVkLgorICAgICAgICAoLnNpZGViYXIgPiAucGFuZWwu bmF2aWdhdGlvbi5zb3VyY2VzID4gLmNvbnRlbnQgPiAuZGV0YWlscy1zZWN0aW9uOm1hdGNoZXMo LnBhdXNlLXJlYXNvbiwgLmNhbGwtc3RhY2ssIC5icmVha3BvaW50cykgPiAuY29udGVudCwpOiBE ZWxldGVkLgorICAgICAgICAoLnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi5zb3VyY2VzID4g LmNvbnRlbnQgPiAuZGV0YWlscy1zZWN0aW9uOm1hdGNoZXMoLmNhbGwtc3RhY2ssIC5icmVha3Bv aW50cykgPiAuY29udGVudCk6IERlbGV0ZWQuCisgICAgICAgICguc2lkZWJhciA+IC5wYW5lbC5u YXZpZ2F0aW9uLnNvdXJjZXMgPiAuY29udGVudCA+IC5kZXRhaWxzLXNlY3Rpb246bWF0Y2hlcygu Y2FsbC1zdGFjaywgLmJyZWFrcG9pbnRzKTpub3QoLmNvbGxhcHNlZCkgPiAuY29udGVudCk6IERl bGV0ZWQuCisgICAgICAgICguc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLnNvdXJjZXMgPiAu Y29udGVudCA+IC5kZXRhaWxzLXNlY3Rpb24uY2FsbC1zdGFjayk6IERlbGV0ZWQuCisgICAgICAg ICguc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLnNvdXJjZXMgPiAuY29udGVudCA+IC5kZXRh aWxzLXNlY3Rpb24uYnJlYWtwb2ludHMpOiBEZWxldGVkLgorICAgICAgICAoLnNpZGViYXIgPiAu cGFuZWwubmF2aWdhdGlvbi5zb3VyY2VzID4gLmNvbnRlbnQgPiAuZGV0YWlscy1zZWN0aW9uLmJy ZWFrcG9pbnRzIC5jcmVhdGUtYnJlYWtwb2ludCk6IERlbGV0ZWQuCisgICAgICAgIChAbWVkaWEg KG1pbi1oZWlnaHQ6IDYwMHB4KSk6IERlbGV0ZWQuCisgICAgICAgICguc2lkZWJhciA+IC5wYW5l bC5uYXZpZ2F0aW9uLnNvdXJjZXMgPiAuY29udGVudCA+IC5wYXVzZS1yZWFzb24pOiBEZWxldGVk LgorICAgICAgICAoLnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi5zb3VyY2VzID4gLmNvbnRl bnQgPiAuZGV0YWlscy1zZWN0aW9uOm1hdGNoZXMoLmNhbGwtc3RhY2ssIC5icmVha3BvaW50cyk6 bm90KC5jb2xsYXBzZWQpID4gLmNvbnRlbnQsKTogRGVsZXRlZC4KKyAgICAgICAgKC5zaWRlYmFy ID4gLnBhbmVsLm5hdmlnYXRpb24uc291cmNlcyA+IC5jb250ZW50ID4gLmRldGFpbHMtc2VjdGlv bi5icmVha3BvaW50cyAudHJlZS1vdXRsaW5lIC5pdGVtLmV2ZW50LXRhcmdldC13aW5kb3cgLmlj b24pOiBEZWxldGVkLgorICAgICAgICBXcmFwIHRoZSBQYXVzZSBSZWFzb24sIENhbGwgU3RhY2ss IGFuZCBCcmVha3BvaW50cyBgV0kuRGV0YWlsc1NlY3Rpb25gcyBpbiBhIGNvbnRhaW5lcgorICAg ICAgICBlbGVtZW50IHNvIHRoYXQgdGhlIHN0eWxpbmcgb2YgdGhlIHN0aWNreSBoZWFkZXIgZG9l c24ndCBnZXQgYWZmZWN0ZWQgYnkgdGhlIGNsYW1waW5nIG9mIHRoZQorICAgICAgICBjb250YWlu ZXIncyBoZWlnaHQuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0RldGFpbHNTZWN0 aW9uLmNzczoKKyAgICAgICAgKC5kZXRhaWxzLXNlY3Rpb24pOgorICAgICAgICAoLmRldGFpbHMt c2VjdGlvbiA+IC5oZWFkZXIpOgorICAgICAgICBDcmVhdGUgQ1NTIHZhcmlhYmxlcyBmb3Igc3R5 bGVzIHRoYXQgd2lsbCBiZSBvdmVycmlkZGVuIGJ5IHRoZSBTb3VyY2VzIG5hdmlnYXRpb24gc2lk ZWJhci4KKwogMjAxOS0wNy0yNCAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAK ICAgICAgICAgV2ViIEluc3BlY3RvcjogUkVHUkVTU0lPTjogbm8gY29udGV4dCBtZW51IGl0ZW1z IHdvcmsgd2hlbiBjb250ZXh0IG1lbnUgY2xpY2tpbmcgb24gIkFkZCBCcmVha3BvaW50IgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGV0YWls c1NlY3Rpb24uY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv RGV0YWlsc1NlY3Rpb24uY3NzCmluZGV4IDQ3ZDI3OGY2ZjliMjQ2NTkxZDBhODgxYWZjNDE5Yjdj MmM3NTNmMTcuLmYzZmI4MjI2NjkzNWQyODI0NmI2NDNkODQ5ZGU3NDE0YjZjNzg2YTIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RldGFpbHNT ZWN0aW9uLmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9EZXRhaWxzU2VjdGlvbi5jc3MKQEAgLTI2LDcgKzI2LDEwIEBACiAuZGV0YWlscy1zZWN0aW9u IHsKICAgICBmb250LXNpemU6IDEwcHg7CiAgICAgYmFja2dyb3VuZC1jb2xvcjogdmFyKC0tcGFu ZWwtYmFja2dyb3VuZC1jb2xvcik7Ci0gICAgYm9yZGVyLWJvdHRvbTogMXB4IHNvbGlkIHZhcigt LWJvcmRlci1jb2xvcik7CisgICAgYm9yZGVyLWJvdHRvbTogdmFyKC0tZGV0YWlscy1zZWN0aW9u LWJvcmRlci1ib3R0b20pOworCisgICAgLS1kZXRhaWxzLXNlY3Rpb24tYm9yZGVyLWJvdHRvbTog MXB4IHNvbGlkIHZhcigtLWJvcmRlci1jb2xvcik7CisgICAgLS1kZXRhaWxzLXNlY3Rpb24taGVh ZGVyLXRvcDogLTFweDsKIH0KIAogLmRldGFpbHMtc2VjdGlvbiAuZGV0YWlscy1zZWN0aW9uIHsK QEAgLTQ0LDcgKzQ3LDcgQEAKIAogLmRldGFpbHMtc2VjdGlvbiA+IC5oZWFkZXIgewogICAgIHBv c2l0aW9uOiBzdGlja3k7Ci0gICAgdG9wOiAtMXB4OworICAgIHRvcDogdmFyKC0tZGV0YWlscy1z ZWN0aW9uLWhlYWRlci10b3ApOwogICAgIGhlaWdodDogMjNweDsKICAgICBwYWRkaW5nOiA0cHgg MDsKICAgICAtd2Via2l0LXBhZGRpbmctZW5kOiA1cHg7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Tb3VyY2VzTmF2aWdhdGlvblNpZGViYXJQ YW5lbC5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Tb3Vy Y2VzTmF2aWdhdGlvblNpZGViYXJQYW5lbC5jc3MKaW5kZXggYWY2ZmFmOWY3YWU1ZGUzNGYwZjAw Y2M3YWQ5YWVjMGJjNzYyM2I3YS4uY2YwMTEzNDgxYjI3Yzg1ODc3NzRlNGQxZmY4NGQwMmFjYjc0 ZmUzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvU291cmNlc05hdmlnYXRpb25TaWRlYmFyUGFuZWwuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NvdXJjZXNOYXZpZ2F0aW9uU2lkZWJhclBhbmVs LmNzcwpAQCAtNjUsNTYgKzY1LDMxIEBACiAgICAgZGlzcGxheTogbm9uZTsKIH0KIAotLnNpZGVi YXIgPiAucGFuZWwubmF2aWdhdGlvbi5zb3VyY2VzID4gLmNvbnRlbnQgPiAuZGV0YWlscy1zZWN0 aW9uIHsKLSAgICBwYWRkaW5nLWJvdHRvbTogMXB4OwotICAgIGZvbnQtc2l6ZTogMTFweDsKLSAg ICBib3JkZXItYm90dG9tLXdpZHRoOiAxcHggIWltcG9ydGFudDsKKy5zaWRlYmFyID4gLnBhbmVs Lm5hdmlnYXRpb24uc291cmNlcyA+IC5jb250ZW50ID4gOm1hdGNoZXMoLnBhdXNlLXJlYXNvbi1j b250YWluZXIsIC5jYWxsLXN0YWNrLWNvbnRhaW5lciwgLmJyZWFrcG9pbnRzLWNvbnRhaW5lcikg eworICAgIGJvcmRlci1ib3R0b206IDFweCBzb2xpZCB2YXIoLS1ib3JkZXItY29sb3IpOwogfQog Ci0uc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLnNvdXJjZXMgPiAuY29udGVudCA+IC5kZXRh aWxzLXNlY3Rpb246bWF0Y2hlcygucGF1c2VkLXJlYXNvbiwgLmJyZWFrcG9pbnRzKS5jb2xsYXBz ZWQgPiAuaGVhZGVyID4gLm9wdGlvbnMsCi0uc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLnNv dXJjZXMgPiAuY29udGVudCA+IC5kZXRhaWxzLXNlY3Rpb24gPiAuY29udGVudCwKLS5zaWRlYmFy ID4gLnBhbmVsLm5hdmlnYXRpb24uc291cmNlcyA+IC5jb250ZW50ID4gLmRldGFpbHMtc2VjdGlv biA+IC5jb250ZW50ID4gLmdyb3VwIHsKKy5zaWRlYmFyID4gLnBhbmVsLm5hdmlnYXRpb24uc291 cmNlcyA+IC5jb250ZW50IC5kZXRhaWxzLXNlY3Rpb24geworICAgIGZvbnQtc2l6ZTogMTFweDsK KyAgICAtLWRldGFpbHMtc2VjdGlvbi1ib3JkZXItYm90dG9tOiBub25lOworfQorCisuc2lkZWJh ciA+IC5wYW5lbC5uYXZpZ2F0aW9uLnNvdXJjZXMgPiAuY29udGVudCAuZGV0YWlscy1zZWN0aW9u LmNvbGxhcHNlZCA+IC5oZWFkZXIgPiAub3B0aW9ucywKKy5zaWRlYmFyID4gLnBhbmVsLm5hdmln YXRpb24uc291cmNlcyA+IC5jb250ZW50IC5kZXRhaWxzLXNlY3Rpb246bm90KC5jb2xsYXBzZWQp ID4gLmNvbnRlbnQsCisuc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLnNvdXJjZXMgPiAuY29u dGVudCAuZGV0YWlscy1zZWN0aW9uOm5vdCguY29sbGFwc2VkKSA+IC5jb250ZW50ID4gLmdyb3Vw IHsKICAgICBkaXNwbGF5OiBibG9jazsKIH0KIAotLnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlv bi5zb3VyY2VzID4gLmNvbnRlbnQgPiAuZGV0YWlscy1zZWN0aW9uLmNvbGxhcHNlZCA+IC5jb250 ZW50IHsKLSAgICBkaXNwbGF5OiBub25lOwotfQotCi0uc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0 aW9uLnNvdXJjZXMgPiAuY29udGVudCA+IC5kZXRhaWxzLXNlY3Rpb24uYnJlYWtwb2ludHMgPiAu aGVhZGVyID4gLm9wdGlvbnMgLmNyZWF0ZS1icmVha3BvaW50IHsKLSAgICB3aWR0aDogMTVweDsK LX0KLQotLnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi5zb3VyY2VzID4gLmNvbnRlbnQgPiAu ZGV0YWlscy1zZWN0aW9uOm1hdGNoZXMoLnBhdXNlLXJlYXNvbiwgLmNhbGwtc3RhY2ssIC5icmVh a3BvaW50cykgPiAuY29udGVudCwKLS5zaWRlYmFyID4gLnBhbmVsLm5hdmlnYXRpb24uc291cmNl cyA+IC5jb250ZW50ID4gLnRyZWUtb3V0bGluZS5yZXNvdXJjZXMgewotICAgIG92ZXJmbG93LXk6 IGF1dG87Ci19Ci0KLS5zaWRlYmFyID4gLnBhbmVsLm5hdmlnYXRpb24uc291cmNlcyA+IC5jb250 ZW50ID4gLmRldGFpbHMtc2VjdGlvbjptYXRjaGVzKC5jYWxsLXN0YWNrLCAuYnJlYWtwb2ludHMp ID4gLmNvbnRlbnQgewotICAgIC8qIFNhbWUgY2FsY3VsYXRpb24gYXMgYmVsb3csIGJ1dCB3aXRo b3V0IHZhcigtLWl0ZW0tY291bnQpICovCi0gICAgbWF4LWhlaWdodDogMTEwcHg7Ci19Ci0KLS5z aWRlYmFyID4gLnBhbmVsLm5hdmlnYXRpb24uc291cmNlcyA+IC5jb250ZW50ID4gLmRldGFpbHMt c2VjdGlvbjptYXRjaGVzKC5jYWxsLXN0YWNrLCAuYnJlYWtwb2ludHMpOm5vdCguY29sbGFwc2Vk KSA+IC5jb250ZW50IHsKLSAgICAvKiAxcHggZnJvbSAuc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0 aW9uLnNvdXJjZXMgPiAuY29udGVudCA+IC5kZXRhaWxzLXNlY3Rpb24gKGJvcmRlci1ib3R0b20p ICovCi0gICAgLyogNS41IHRvIGVuc3VyZSB0aGF0IGhhbGYgb2YgdGhlIG5leHQgaXRlbSBpcyBz aG93biB3aGVuIG92ZXJmbG93aW5nICovCi0gICAgbWluLWhlaWdodDogY2FsYyhtaW4odmFyKC0t aXRlbS1jb3VudCksIDUuNSkgKiAyMHB4KTsKLX0KLQotLnNpZGViYXIgPiAucGFuZWwubmF2aWdh dGlvbi5zb3VyY2VzID4gLmNvbnRlbnQgPiAuZGV0YWlscy1zZWN0aW9uLmNhbGwtc3RhY2sgewot ICAgIC0taXRlbS1jb3VudDogdmFyKC0tY2FsbC1zdGFjay1jb3VudCk7Ci19Ci0KLS5zaWRlYmFy ID4gLnBhbmVsLm5hdmlnYXRpb24uc291cmNlcyA+IC5jb250ZW50ID4gLmRldGFpbHMtc2VjdGlv bi5icmVha3BvaW50cyB7Ci0gICAgLS1pdGVtLWNvdW50OiB2YXIoLS1icmVha3BvaW50cy1jb3Vu dCk7Ci19Ci0KLS5zaWRlYmFyID4gLnBhbmVsLm5hdmlnYXRpb24uc291cmNlcyA+IC5jb250ZW50 ID4gLmRldGFpbHMtc2VjdGlvbi5icmVha3BvaW50cyAuY3JlYXRlLWJyZWFrcG9pbnQgeworLnNp ZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi5zb3VyY2VzID4gLmNvbnRlbnQgPiAuYnJlYWtwb2lu dHMtY29udGFpbmVyIC5jcmVhdGUtYnJlYWtwb2ludCB7CiAgICAgd2lkdGg6IDE1cHg7CiB9CiAK IC5zaWRlYmFyID4gLnBhbmVsLm5hdmlnYXRpb24uc291cmNlcyA+IC5jb250ZW50ID4gLm5hdmln YXRpb24tYmFyIHsKKyAgICBwb3NpdGlvbjogc3RpY2t5OworICAgIHRvcDogMDsKKyAgICB6LWlu ZGV4OiB2YXIoLS16LWluZGV4LWhlYWRlcik7CiAgICAgbWFyZ2luLWJvdHRvbTogMXB4OworICAg IGJhY2tncm91bmQtY29sb3I6IHZhcigtLXBhbmVsLWJhY2tncm91bmQtY29sb3IpOwogfQogCiAu c2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLnNvdXJjZXMgPiAuY29udGVudCAudHJlZS1vdXRs aW5lLnNpbmdsZS10aHJlYWQgewpAQCAtMTI1LDI0ICsxMDAsNDUgQEAKICAgICBkaXNwbGF5OiBu b25lOwogfQogCi1AbWVkaWEgKG1pbi1oZWlnaHQ6IDYwMHB4KSB7CitAbWVkaWEgKG1pbi1oZWln aHQ6IDY1MHB4KSB7CiAgICAgLnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi5zb3VyY2VzID4g LmNvbnRlbnQgewogICAgICAgICBkaXNwbGF5OiBmbGV4OwogICAgICAgICBmbGV4LWRpcmVjdGlv bjogY29sdW1uOwogICAgICAgICBvdmVyZmxvdy15OiBoaWRkZW47CiAgICAgfQogCi0gICAgLnNp ZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi5zb3VyY2VzID4gLmNvbnRlbnQgPiAucGF1c2UtcmVh c29uIHsKLSAgICAgICAgZmxleC1zaHJpbms6IDA7CisgICAgLnNpZGViYXIgPiAucGFuZWwubmF2 aWdhdGlvbi5zb3VyY2VzID4gLmNvbnRlbnQgLmRldGFpbHMtc2VjdGlvbiB7CisgICAgICAgIC0t ZGV0YWlscy1zZWN0aW9uLWhlYWRlci10b3A6IDA7CiAgICAgfQogCi0gICAgLnNpZGViYXIgPiAu cGFuZWwubmF2aWdhdGlvbi5zb3VyY2VzID4gLmNvbnRlbnQgPiAuZGV0YWlscy1zZWN0aW9uOm1h dGNoZXMoLmNhbGwtc3RhY2ssIC5icmVha3BvaW50cyk6bm90KC5jb2xsYXBzZWQpID4gLmNvbnRl bnQsCi0gICAgLnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi5zb3VyY2VzID4gLmNvbnRlbnQg PiAudHJlZS1vdXRsaW5lLnJlc291cmNlcyB7CisgICAgLnNpZGViYXIgPiAucGFuZWwubmF2aWdh dGlvbi5zb3VyY2VzID4gLmNvbnRlbnQgPiAucGF1c2UtcmVhc29uLWNvbnRhaW5lciB7CisgICAg ICAgIGZsZXgtZ3JvdzogNDsKKyAgICAgICAgZmxleC1zaHJpbms6IDE7CisgICAgfQorCisgICAg LnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi5zb3VyY2VzID4gLmNvbnRlbnQgPiA6bWF0Y2hl cyguY2FsbC1zdGFjay1jb250YWluZXIsIC5icmVha3BvaW50cy1jb250YWluZXIsIC5yZXNvdXJj ZXMpIHsKICAgICAgICAgaGVpZ2h0OiAxMDAlOworICAgICAgICBtYXgtaGVpZ2h0OiAtd2Via2l0 LWZpdC1jb250ZW50OworICAgICAgICBvdmVyZmxvdy15OiBhdXRvOworICAgIH0KKworICAgIC5z aWRlYmFyID4gLnBhbmVsLm5hdmlnYXRpb24uc291cmNlcyA+IC5jb250ZW50ID4gLmNhbGwtc3Rh Y2stY29udGFpbmVyIHsKKyAgICAgICAgZmxleC1ncm93OiAzOworICAgICAgICBmbGV4LXNocmlu azogMjsKKyAgICB9CisKKyAgICAuc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLnNvdXJjZXMg PiAuY29udGVudCA+IC5icmVha3BvaW50cy1jb250YWluZXIgeworICAgICAgICBmbGV4LWdyb3c6 IDI7CisgICAgICAgIGZsZXgtc2hyaW5rOiAzOworICAgIH0KKworICAgIC5zaWRlYmFyID4gLnBh bmVsLm5hdmlnYXRpb24uc291cmNlcyA+IC5jb250ZW50ID4gLnJlc291cmNlcyB7CisgICAgICAg IGZsZXgtZ3JvdzogMTsKKyAgICAgICAgZmxleC1zaHJpbms6IDM7CiAgICAgfQogfQogCi0uc2lk ZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLnNvdXJjZXMgPiAuY29udGVudCA+IC5kZXRhaWxzLXNl Y3Rpb24uYnJlYWtwb2ludHMgLnRyZWUtb3V0bGluZSAuaXRlbS5ldmVudC10YXJnZXQtd2luZG93 IC5pY29uIHsKKy5zaWRlYmFyID4gLnBhbmVsLm5hdmlnYXRpb24uc291cmNlcyA+IC5jb250ZW50 ID4gLmJyZWFrcG9pbnRzLWNvbnRhaW5lciAudHJlZS1vdXRsaW5lIC5pdGVtLmV2ZW50LXRhcmdl dC13aW5kb3cgLmljb24gewogICAgIGNvbnRlbnQ6IHVybCguLi9JbWFnZXMvVHlwZU9iamVjdC5z dmcpOwogfQogCkBAIC0xNTIsMyArMTQ4LDQgQEAKICAgICAgICAgYmFja2dyb3VuZC1jb2xvcjog dmFyKC0teWVsbG93LWhpZ2hsaWdodC1iYWNrZ3JvdW5kLWNvbG9yKTsKICAgICB9CiB9CisKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NvdXJj ZXNOYXZpZ2F0aW9uU2lkZWJhclBhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvU291cmNlc05hdmlnYXRpb25TaWRlYmFyUGFuZWwuanMKaW5kZXggZTk1 MGIzZjA1MTU0ZjExNzdkNzIxZjZhNWM4MDViYjA2ZGU5OWFhOS4uZDYzNWNmNjg3ZmYyYzgzNjJl OTllZjhkYmZiMDVlNWJhODAzYzkzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvU291cmNlc05hdmlnYXRpb25TaWRlYmFyUGFuZWwuanMKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU291cmNlc05hdmln YXRpb25TaWRlYmFyUGFuZWwuanMKQEAgLTExMyw5ICsxMTMsMTEgQEAgV0kuU291cmNlc05hdmln YXRpb25TaWRlYmFyUGFuZWwgPSBjbGFzcyBTb3VyY2VzTmF2aWdhdGlvblNpZGViYXJQYW5lbCBl eHRlbmRzIFcKICAgICAgICAgdGhpcy5fcGF1c2VSZWFzb25Hcm91cCA9IG5ldyBXSS5EZXRhaWxz U2VjdGlvbkdyb3VwKFt0aGlzLl9wYXVzZVJlYXNvblRleHRSb3ddKTsKICAgICAgICAgdGhpcy5f cGF1c2VSZWFzb25TZWN0aW9uID0gbmV3IFdJLkRldGFpbHNTZWN0aW9uKCJwYXVzZWQtcmVhc29u IiwgV0kuVUlTdHJpbmcoIlBhdXNlIFJlYXNvbiIpLCBbdGhpcy5fcGF1c2VSZWFzb25Hcm91cF0s IHRoaXMuX3BhdXNlUmVhc29uTGlua0NvbnRhaW5lckVsZW1lbnQpOwogCisgICAgICAgIHRoaXMu X3BhdXNlUmVhc29uQ29udGFpbmVyID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7Cisg ICAgICAgIHRoaXMuX3BhdXNlUmVhc29uQ29udGFpbmVyLmNsYXNzTGlzdC5hZGQoInBhdXNlLXJl YXNvbi1jb250YWluZXIiKTsKKyAgICAgICAgdGhpcy5fcGF1c2VSZWFzb25Db250YWluZXIuYXBw ZW5kQ2hpbGQodGhpcy5fcGF1c2VSZWFzb25TZWN0aW9uLmVsZW1lbnQpOworCiAgICAgICAgIHRo aXMuX2NhbGxTdGFja1RyZWVPdXRsaW5lID0gdGhpcy5jcmVhdGVDb250ZW50VHJlZU91dGxpbmUo e3N1cHByZXNzRmlsdGVyaW5nOiB0cnVlfSk7Ci0gICAgICAgIHRoaXMuX2NhbGxTdGFja1RyZWVP dXRsaW5lLmFkZEV2ZW50TGlzdGVuZXIoV0kuVHJlZU91dGxpbmUuRXZlbnQuRWxlbWVudEFkZGVk LCB0aGlzLl9oYW5kbGVDYWxsU3RhY2tFbGVtZW50QWRkZWRPclJlbW92ZWQsIHRoaXMpOwotICAg ICAgICB0aGlzLl9jYWxsU3RhY2tUcmVlT3V0bGluZS5hZGRFdmVudExpc3RlbmVyKFdJLlRyZWVP dXRsaW5lLkV2ZW50LkVsZW1lbnRSZW1vdmVkLCB0aGlzLl9oYW5kbGVDYWxsU3RhY2tFbGVtZW50 QWRkZWRPclJlbW92ZWQsIHRoaXMpOwogICAgICAgICB0aGlzLl9jYWxsU3RhY2tUcmVlT3V0bGlu ZS5hZGRFdmVudExpc3RlbmVyKFdJLlRyZWVPdXRsaW5lLkV2ZW50LlNlbGVjdGlvbkRpZENoYW5n ZSwgdGhpcy5faGFuZGxlVHJlZVNlbGVjdGlvbkRpZENoYW5nZSwgdGhpcyk7CiAKICAgICAgICAg bGV0IGNhbGxTdGFja1JvdyA9IG5ldyBXSS5EZXRhaWxzU2VjdGlvblJvdzsKQEAgLTEyNCw2ICsx MjYsMTAgQEAgV0kuU291cmNlc05hdmlnYXRpb25TaWRlYmFyUGFuZWwgPSBjbGFzcyBTb3VyY2Vz TmF2aWdhdGlvblNpZGViYXJQYW5lbCBleHRlbmRzIFcKICAgICAgICAgbGV0IGNhbGxTdGFja0dy b3VwID0gbmV3IFdJLkRldGFpbHNTZWN0aW9uR3JvdXAoW2NhbGxTdGFja1Jvd10pOwogICAgICAg ICB0aGlzLl9jYWxsU3RhY2tTZWN0aW9uID0gbmV3IFdJLkRldGFpbHNTZWN0aW9uKCJjYWxsLXN0 YWNrIiwgV0kuVUlTdHJpbmcoIkNhbGwgU3RhY2siKSwgW2NhbGxTdGFja0dyb3VwXSk7CiAKKyAg ICAgICAgdGhpcy5fY2FsbFN0YWNrQ29udGFpbmVyID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgi ZGl2Iik7CisgICAgICAgIHRoaXMuX2NhbGxTdGFja0NvbnRhaW5lci5jbGFzc0xpc3QuYWRkKCJj YWxsLXN0YWNrLWNvbnRhaW5lciIpOworICAgICAgICB0aGlzLl9jYWxsU3RhY2tDb250YWluZXIu YXBwZW5kQ2hpbGQodGhpcy5fY2FsbFN0YWNrU2VjdGlvbi5lbGVtZW50KTsKKwogICAgICAgICB0 aGlzLl9tYWluVGFyZ2V0VHJlZUVsZW1lbnQgPSBudWxsOwogICAgICAgICB0aGlzLl9hY3RpdmVD YWxsRnJhbWVUcmVlRWxlbWVudCA9IG51bGw7CiAKQEAgLTE5MywxMSArMTk5LDE2IEBAIFdJLlNv dXJjZXNOYXZpZ2F0aW9uU2lkZWJhclBhbmVsID0gY2xhc3MgU291cmNlc05hdmlnYXRpb25TaWRl YmFyUGFuZWwgZXh0ZW5kcyBXCiAKICAgICAgICAgbGV0IGJyZWFrcG9pbnRzR3JvdXAgPSBuZXcg V0kuRGV0YWlsc1NlY3Rpb25Hcm91cChbYnJlYWtwb2ludHNSb3ddKTsKICAgICAgICAgdGhpcy5f YnJlYWtwb2ludHNTZWN0aW9uID0gbmV3IFdJLkRldGFpbHNTZWN0aW9uKCJicmVha3BvaW50cyIs IFdJLlVJU3RyaW5nKCJCcmVha3BvaW50cyIpLCBbYnJlYWtwb2ludHNHcm91cF0sIGJyZWFrcG9p bnROYXZpZ2F0aW9uQmFyV3JhcHBlcik7Ci0gICAgICAgIHRoaXMuY29udGVudFZpZXcuZWxlbWVu dC5pbnNlcnRCZWZvcmUodGhpcy5fYnJlYWtwb2ludHNTZWN0aW9uLmVsZW1lbnQsIHRoaXMuY29u dGVudFZpZXcuZWxlbWVudC5maXJzdENoaWxkKTsKKworICAgICAgICB0aGlzLl9icmVha3BvaW50 c0NvbnRhaW5lciA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOworICAgICAgICB0aGlz Ll9icmVha3BvaW50c0NvbnRhaW5lci5jbGFzc0xpc3QuYWRkKCJicmVha3BvaW50cy1jb250YWlu ZXIiKTsKKyAgICAgICAgdGhpcy5fYnJlYWtwb2ludHNDb250YWluZXIuYXBwZW5kQ2hpbGQodGhp cy5fYnJlYWtwb2ludHNTZWN0aW9uLmVsZW1lbnQpOworCisgICAgICAgIHRoaXMuY29udGVudFZp ZXcuZWxlbWVudC5pbnNlcnRCZWZvcmUodGhpcy5fYnJlYWtwb2ludHNDb250YWluZXIsIHRoaXMu Y29udGVudFZpZXcuZWxlbWVudC5maXJzdENoaWxkKTsKIAogICAgICAgICB0aGlzLl9yZXNvdXJj ZXNOYXZpZ2F0aW9uQmFyID0gbmV3IFdJLk5hdmlnYXRpb25CYXI7CiAgICAgICAgIHRoaXMuY29u dGVudFZpZXcuYWRkU3Vidmlldyh0aGlzLl9yZXNvdXJjZXNOYXZpZ2F0aW9uQmFyKTsKLSAgICAg ICAgdGhpcy5jb250ZW50Vmlldy5lbGVtZW50Lmluc2VydEJlZm9yZSh0aGlzLl9yZXNvdXJjZXNO YXZpZ2F0aW9uQmFyLmVsZW1lbnQsIHRoaXMuX2JyZWFrcG9pbnRzU2VjdGlvbi5lbGVtZW50Lm5l eHRTaWJsaW5nKTsKKyAgICAgICAgdGhpcy5jb250ZW50Vmlldy5lbGVtZW50Lmluc2VydEJlZm9y ZSh0aGlzLl9yZXNvdXJjZXNOYXZpZ2F0aW9uQmFyLmVsZW1lbnQsIHRoaXMuX2JyZWFrcG9pbnRz Q29udGFpbmVyLm5leHRTaWJsaW5nKTsKIAogICAgICAgICB0aGlzLl9yZXNvdXJjZXNOYXZpZ2F0 aW9uQmFyLmFkZE5hdmlnYXRpb25JdGVtKG5ldyBXSS5GbGV4aWJsZVNwYWNlTmF2aWdhdGlvbkl0 ZW0pOwogCkBAIC00NzYsNyArNDg3LDcgQEAgV0kuU291cmNlc05hdmlnYXRpb25TaWRlYmFyUGFu ZWwgPSBjbGFzcyBTb3VyY2VzTmF2aWdhdGlvblNpZGViYXJQYW5lbCBleHRlbmRzIFcKIAogICAg IGNyZWF0ZUNvbnRlbnRUcmVlT3V0bGluZShvcHRpb25zID0ge30pCiAgICAgewotICAgICAgICBs ZXQgdHJlZU91dGxpbmUgPSBzdXBlci5jcmVhdGVDb250ZW50VHJlZU91dGxpbmUob3B0aW9ucykK KyAgICAgICAgbGV0IHRyZWVPdXRsaW5lID0gc3VwZXIuY3JlYXRlQ29udGVudFRyZWVPdXRsaW5l KG9wdGlvbnMpOwogCiAgICAgICAgIHRyZWVPdXRsaW5lLmFkZEV2ZW50TGlzdGVuZXIoV0kuVHJl ZU91dGxpbmUuRXZlbnQuRWxlbWVudFJldmVhbGVkLCAoZXZlbnQpID0+IHsKICAgICAgICAgICAg IGxldCB0cmVlRWxlbWVudCA9IGV2ZW50LmRhdGEuZWxlbWVudDsKQEAgLTE0NzQsMTkgKzE0ODUs NiBAQCBXSS5Tb3VyY2VzTmF2aWdhdGlvblNpZGViYXJQYW5lbCA9IGNsYXNzIFNvdXJjZXNOYXZp Z2F0aW9uU2lkZWJhclBhbmVsIGV4dGVuZHMgVwogICAgICAgICBjb25zb2xlLmVycm9yKCJVbmtu b3duIHRyZWUgZWxlbWVudCIsIHRyZWVFbGVtZW50KTsKICAgICB9CiAKLSAgICBfaGFuZGxlQ2Fs bFN0YWNrRWxlbWVudEFkZGVkT3JSZW1vdmVkKGV2ZW50KQotICAgIHsKLSAgICAgICAgbGV0IGNv dW50ID0gdGhpcy5fY2FsbFN0YWNrVHJlZU91dGxpbmUuY2hpbGRyZW4ubGVuZ3RoOwotICAgICAg ICBmb3IgKGxldCBjaGlsZCBvZiB0aGlzLl9jYWxsU3RhY2tUcmVlT3V0bGluZS5jaGlsZHJlbikK LSAgICAgICAgICAgIGNvdW50ICs9IGNoaWxkLmNoaWxkcmVuLmxlbmd0aDsKLQotICAgICAgICAv LyBEb24ndCBjb3VudCB0aGUgbWFpbiB0aHJlYWQgZWxlbWVudCB3aGVuIGl0IGlzIGhpZGRlbi4K LSAgICAgICAgaWYgKFdJLnRhcmdldHMubGVuZ3RoID09PSAxKQotICAgICAgICAgICAgLS1jb3Vu dDsKLQotICAgICAgICB0aGlzLmVsZW1lbnQuc3R5bGUuc2V0UHJvcGVydHkoIi0tY2FsbC1zdGFj ay1jb3VudCIsIGNvdW50KTsKLSAgICB9Ci0KICAgICBfaGFuZGxlQnJlYWtwb2ludEVsZW1lbnRB ZGRlZE9yUmVtb3ZlZChldmVudCkKICAgICB7CiAgICAgICAgIGxldCB0cmVlRWxlbWVudCA9IGV2 ZW50LmRhdGEuZWxlbWVudDsKQEAgLTE0OTksMTEgKzE0OTcsNiBAQCBXSS5Tb3VyY2VzTmF2aWdh dGlvblNpZGViYXJQYW5lbCA9IGNsYXNzIFNvdXJjZXNOYXZpZ2F0aW9uU2lkZWJhclBhbmVsIGV4 dGVuZHMgVwogCiAgICAgICAgIGlmIChzZXR0aW5nKQogICAgICAgICAgICAgc2V0dGluZy52YWx1 ZSA9ICEhdHJlZUVsZW1lbnQucGFyZW50OwotCi0gICAgICAgIGxldCBjb3VudCA9IHRoaXMuX2Jy ZWFrcG9pbnRzVHJlZU91dGxpbmUuY2hpbGRyZW4ubGVuZ3RoOwotICAgICAgICBmb3IgKGxldCBj aGlsZCBvZiB0aGlzLl9icmVha3BvaW50c1RyZWVPdXRsaW5lLmNoaWxkcmVuKQotICAgICAgICAg ICAgY291bnQgKz0gY2hpbGQuY2hpbGRyZW4ubGVuZ3RoOwotICAgICAgICB0aGlzLmVsZW1lbnQu c3R5bGUuc2V0UHJvcGVydHkoIi0tYnJlYWtwb2ludHMtY291bnQiLCBjb3VudCk7CiAgICAgfQog CiAgICAgX3BvcHVsYXRlQ3JlYXRlQnJlYWtwb2ludENvbnRleHRNZW51KGNvbnRleHRNZW51KQpA QCAtMTY5NCwxMCArMTY4NywxMCBAQCBXSS5Tb3VyY2VzTmF2aWdhdGlvblNpZGViYXJQYW5lbCA9 IGNsYXNzIFNvdXJjZXNOYXZpZ2F0aW9uU2lkZWJhclBhbmVsIGV4dGVuZHMgVwogCiAgICAgX2hh bmRsZURlYnVnZ2VyUGF1c2VkKGV2ZW50KQogICAgIHsKLSAgICAgICAgdGhpcy5jb250ZW50Vmll dy5lbGVtZW50Lmluc2VydEJlZm9yZSh0aGlzLl9jYWxsU3RhY2tTZWN0aW9uLmVsZW1lbnQsIHRo aXMuY29udGVudFZpZXcuZWxlbWVudC5maXJzdENoaWxkKTsKKyAgICAgICAgdGhpcy5jb250ZW50 Vmlldy5lbGVtZW50Lmluc2VydEJlZm9yZSh0aGlzLl9jYWxsU3RhY2tDb250YWluZXIsIHRoaXMu Y29udGVudFZpZXcuZWxlbWVudC5maXJzdENoaWxkKTsKIAogICAgICAgICBpZiAodGhpcy5fdXBk YXRlUGF1c2VSZWFzb24oKSkKLSAgICAgICAgICAgIHRoaXMuY29udGVudFZpZXcuZWxlbWVudC5p bnNlcnRCZWZvcmUodGhpcy5fcGF1c2VSZWFzb25TZWN0aW9uLmVsZW1lbnQsIHRoaXMuY29udGVu dFZpZXcuZWxlbWVudC5maXJzdENoaWxkKTsKKyAgICAgICAgICAgIHRoaXMuY29udGVudFZpZXcu ZWxlbWVudC5pbnNlcnRCZWZvcmUodGhpcy5fcGF1c2VSZWFzb25Db250YWluZXIsIHRoaXMuY29u dGVudFZpZXcuZWxlbWVudC5maXJzdENoaWxkKTsKIAogICAgICAgICB0aGlzLl9kZWJ1Z2dlclBh dXNlUmVzdW1lQnV0dG9uSXRlbS5lbmFibGVkID0gdHJ1ZTsKICAgICAgICAgdGhpcy5fZGVidWdn ZXJQYXVzZVJlc3VtZUJ1dHRvbkl0ZW0udG9nZ2xlZCA9IHRydWU7CkBAIC0xNzEwLDkgKzE3MDMs OSBAQCBXSS5Tb3VyY2VzTmF2aWdhdGlvblNpZGViYXJQYW5lbCA9IGNsYXNzIFNvdXJjZXNOYXZp Z2F0aW9uU2lkZWJhclBhbmVsIGV4dGVuZHMgVwogCiAgICAgX2hhbmRsZURlYnVnZ2VyUmVzdW1l ZChldmVudCkKICAgICB7Ci0gICAgICAgIHRoaXMuX2NhbGxTdGFja1NlY3Rpb24uZWxlbWVudC5y ZW1vdmUoKTsKKyAgICAgICAgdGhpcy5fY2FsbFN0YWNrQ29udGFpbmVyLnJlbW92ZSgpOwogCi0g ICAgICAgIHRoaXMuX3BhdXNlUmVhc29uU2VjdGlvbi5lbGVtZW50LnJlbW92ZSgpOworICAgICAg ICB0aGlzLl9wYXVzZVJlYXNvbkNvbnRhaW5lci5yZW1vdmUoKTsKIAogICAgICAgICB0aGlzLl9k ZWJ1Z2dlclBhdXNlUmVzdW1lQnV0dG9uSXRlbS5lbmFibGVkID0gdHJ1ZTsKICAgICAgICAgdGhp cy5fZGVidWdnZXJQYXVzZVJlc3VtZUJ1dHRvbkl0ZW0udG9nZ2xlZCA9IGZhbHNlOwo= 375100 2019-07-29 14:11:14 -0700 2019-08-09 14:59:35 -0700 Patch bug-200236.patch text/plain 18453 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDI3ZjBmOGQyZjViMmNkMGMwNDlhNWU0NmRiZWNm MGNhZDZlY2NjYjguLjE3MGRhZjM3NWJlZTAxZTcxM2FiYTMxMTE5Y2IyY2IzNGRmNmM0NmQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDY5IEBACisyMDE5LTA3LTI5ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBT b3VyY2VzOiBpbmNyZWFzZSB0aGUgdmVydGljYWwgc3BhY2UgYWxsb2NhdGVkIHRvIHRoZSBjYWxs IHN0YWNrIHdoZW4gcGF1c2VkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMDAyMzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBSYXRoZXIgdGhhbiB1bmlmb3JtbHkgY29uc3RyaWN0IHRoZSBoZWlnaHQgb2Yg dGhlIENhbGwgU3RhY2sgYW5kIEJyZWFrcG9pbnRzIHNlY3Rpb25zLCB0aGV5CisgICAgICAgIHNo b3VsZCAiZmxleCIgYmFzZWQgb24gdGhlaXIgaW1wb3J0YW5jZSwgd2hpY2ggY2FuIGxpa2VseSBi ZSBkZXJpdmVkIGZyb20gdGhlIGN1cnJlbnQgc3RhdGUuCisgICAgICAgIFRoaXMgd2F5LCBpdCdz IHBvc3NpYmxlIHRvIHNlZSBpbmZvcm1hdGlvbiBmcm9tIGVhY2ggc2VjdGlvbiBhdCB0aGUgc2Ft ZSB0aW1lLCBidXQgc3RpbGwKKyAgICAgICAgaGF2ZSBlbm91Z2ggc3BhY2UgaW4gZWFjaCBzZWN0 aW9uIHRvIGJlIGFibGUgdG8gZG8gc29tZXRoaW5nIHVzZWZ1bC4KKworICAgICAgICBXaGVuIHBh dXNlZCwgdGhlIG1vc3QgdXNlZnVsIGRhdGEgaXMgdGhlIGNhbGwgc3RhY2ssIHNvIGdpdmUgdGhl IENhbGwgU3RhY2sgc2VjdGlvbiB0aGUgbW9zdAorICAgICAgICB2ZXJ0aWNhbCBzcGFjZSAodGhl IFBhdXNlIFJlYXNvbiBpcyBhbHNvIGltcG9ydGFudCwgYnV0IGl0IHVzdWFsbHkgbmVlZHMgdmVy eSBsaXR0bGUgc3BhY2UpLgorCisgICAgICAgIFdoZW4gbm90IHBhdXNlZCwgaXQncyBsaWtlbHkg dGhhdCB0aGUgdXNlciBjYXJlcyBtb3JlIGFib3V0IHRoZSByZXNvdXJjZXMgd2l0aCBicmVha3Bv aW50cworICAgICAgICB0aGFuIHRob3NlIHdpdGhvdXQsIHNvIGZhdm9yIHRoZSBCcmVha3BvaW50 cyBzZWN0aW9uLgorCisgICAgICAgIEVhY2ggc2VjdGlvbiB3aWxsIG9ubHkgZXhwYW5kIHRvIGZp dCBpdCdzIG1heGltdW0gY29udGVudCBoZWlnaHQuCisKKyAgICAgICAgSWYgdGhlIGluc3BlY3Rv ciB3aW5kb3cgYmVjb21lcyB0b28gc2hvcnQsIHJlbW92ZSB0aGUgImZsZXgiIGVudGlyZWx5IGFu ZCBoYXZlIGFsbCB0aGUKKyAgICAgICAgY29udGVudCBiZSBwYXJ0IG9mIGEgc2luZ2xlIHNjcm9s bCBhcmVhIGluc3RlYWQuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1NvdXJjZXNO YXZpZ2F0aW9uU2lkZWJhclBhbmVsLmpzOgorICAgICAgICAoV0kuU291cmNlc05hdmlnYXRpb25T aWRlYmFyUGFuZWwpOgorICAgICAgICAoV0kuU291cmNlc05hdmlnYXRpb25TaWRlYmFyUGFuZWwu cHJvdG90eXBlLmNyZWF0ZUNvbnRlbnRUcmVlT3V0bGluZSk6CisgICAgICAgIChXSS5Tb3VyY2Vz TmF2aWdhdGlvblNpZGViYXJQYW5lbC5wcm90b3R5cGUuX2hhbmRsZUJyZWFrcG9pbnRFbGVtZW50 QWRkZWRPclJlbW92ZWQpOgorICAgICAgICAoV0kuU291cmNlc05hdmlnYXRpb25TaWRlYmFyUGFu ZWwucHJvdG90eXBlLl9oYW5kbGVEZWJ1Z2dlclBhdXNlZCk6CisgICAgICAgIChXSS5Tb3VyY2Vz TmF2aWdhdGlvblNpZGViYXJQYW5lbC5wcm90b3R5cGUuX2hhbmRsZURlYnVnZ2VyUmVzdW1lZCk6 CisgICAgICAgIChXSS5Tb3VyY2VzTmF2aWdhdGlvblNpZGViYXJQYW5lbC5wcm90b3R5cGUuX2hh bmRsZUNhbGxTdGFja0VsZW1lbnRBZGRlZE9yUmVtb3ZlZCk6IERlbGV0ZWQuCisgICAgICAgICog VXNlckludGVyZmFjZS9WaWV3cy9Tb3VyY2VzTmF2aWdhdGlvblNpZGViYXJQYW5lbC5jc3M6Cisg ICAgICAgICguc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLnNvdXJjZXMgPiAuY29udGVudCA+ IDptYXRjaGVzKC5wYXVzZS1yZWFzb24tY29udGFpbmVyLCAuY2FsbC1zdGFjay1jb250YWluZXIs IC5icmVha3BvaW50cy1jb250YWluZXIpKTogQWRkZWQuCisgICAgICAgICguc2lkZWJhciA+IC5w YW5lbC5uYXZpZ2F0aW9uLnNvdXJjZXMgPiAuY29udGVudCAuZGV0YWlscy1zZWN0aW9uKTogQWRk ZWQuCisgICAgICAgICguc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLnNvdXJjZXMgPiAuY29u dGVudCAuZGV0YWlscy1zZWN0aW9uLmNvbGxhcHNlZCA+IC5oZWFkZXIgPiAub3B0aW9ucywgLnNp ZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi5zb3VyY2VzID4gLmNvbnRlbnQgLmRldGFpbHMtc2Vj dGlvbjpub3QoLmNvbGxhcHNlZCkgPiAuY29udGVudCwgLnNpZGViYXIgPiAucGFuZWwubmF2aWdh dGlvbi5zb3VyY2VzID4gLmNvbnRlbnQgLmRldGFpbHMtc2VjdGlvbjpub3QoLmNvbGxhcHNlZCkg PiAuY29udGVudCA+IC5ncm91cCk6IEFkZGVkLgorICAgICAgICAoLnNpZGViYXIgPiAucGFuZWwu bmF2aWdhdGlvbi5zb3VyY2VzID4gLmNvbnRlbnQgPiAuYnJlYWtwb2ludHMtY29udGFpbmVyIC5j cmVhdGUtYnJlYWtwb2ludCk6IEFkZGVkLgorICAgICAgICAoLnNpZGViYXIgPiAucGFuZWwubmF2 aWdhdGlvbi5zb3VyY2VzID4gLmNvbnRlbnQgPiAubmF2aWdhdGlvbi1iYXIpOiBBZGRlZC4KKyAg ICAgICAgKEBtZWRpYSAobWluLWhlaWdodDogNjUwcHgpKTogQWRkZWQuCisgICAgICAgICguc2lk ZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLnNvdXJjZXMgPiAuY29udGVudCA+IC5wYXVzZS1yZWFz b24tY29udGFpbmVyKTogQWRkZWQuCisgICAgICAgICguc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0 aW9uLnNvdXJjZXMgPiAuY29udGVudCA+IDptYXRjaGVzKC5jYWxsLXN0YWNrLWNvbnRhaW5lciwg LmJyZWFrcG9pbnRzLWNvbnRhaW5lciwgLnJlc291cmNlcykpOiBBZGRlZC4KKyAgICAgICAgKC5z aWRlYmFyID4gLnBhbmVsLm5hdmlnYXRpb24uc291cmNlcyA+IC5jb250ZW50ID4gLmNhbGwtc3Rh Y2stY29udGFpbmVyKTogQWRkZWQuCisgICAgICAgICguc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0 aW9uLnNvdXJjZXMgPiAuY29udGVudCA+IC5icmVha3BvaW50cy1jb250YWluZXIpOiBBZGRlZC4K KyAgICAgICAgKC5zaWRlYmFyID4gLnBhbmVsLm5hdmlnYXRpb24uc291cmNlcyA+IC5jb250ZW50 ID4gLnJlc291cmNlcyk6IEFkZGVkLgorICAgICAgICAoLnNpZGViYXIgPiAucGFuZWwubmF2aWdh dGlvbi5zb3VyY2VzID4gLmNvbnRlbnQgPiAuYnJlYWtwb2ludHMtY29udGFpbmVyIC50cmVlLW91 dGxpbmUgLml0ZW0uZXZlbnQtdGFyZ2V0LXdpbmRvdyAuaWNvbik6IEFkZGVkLgorICAgICAgICAo LnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi5zb3VyY2VzID4gLmNvbnRlbnQgPiAuZGV0YWls cy1zZWN0aW9uKTogRGVsZXRlZC4KKyAgICAgICAgKC5zaWRlYmFyID4gLnBhbmVsLm5hdmlnYXRp b24uc291cmNlcyA+IC5jb250ZW50ID4gLmRldGFpbHMtc2VjdGlvbjptYXRjaGVzKC5wYXVzZWQt cmVhc29uLCAuYnJlYWtwb2ludHMpLmNvbGxhcHNlZCA+IC5oZWFkZXIgPiAub3B0aW9ucywpOiBE ZWxldGVkLgorICAgICAgICAoLnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi5zb3VyY2VzID4g LmNvbnRlbnQgPiAuZGV0YWlscy1zZWN0aW9uLmNvbGxhcHNlZCA+IC5jb250ZW50KTogRGVsZXRl ZC4KKyAgICAgICAgKC5zaWRlYmFyID4gLnBhbmVsLm5hdmlnYXRpb24uc291cmNlcyA+IC5jb250 ZW50ID4gLmRldGFpbHMtc2VjdGlvbi5icmVha3BvaW50cyA+IC5oZWFkZXIgPiAub3B0aW9ucyAu Y3JlYXRlLWJyZWFrcG9pbnQpOiBEZWxldGVkLgorICAgICAgICAoLnNpZGViYXIgPiAucGFuZWwu bmF2aWdhdGlvbi5zb3VyY2VzID4gLmNvbnRlbnQgPiAuZGV0YWlscy1zZWN0aW9uOm1hdGNoZXMo LnBhdXNlLXJlYXNvbiwgLmNhbGwtc3RhY2ssIC5icmVha3BvaW50cykgPiAuY29udGVudCwpOiBE ZWxldGVkLgorICAgICAgICAoLnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi5zb3VyY2VzID4g LmNvbnRlbnQgPiAuZGV0YWlscy1zZWN0aW9uOm1hdGNoZXMoLmNhbGwtc3RhY2ssIC5icmVha3Bv aW50cykgPiAuY29udGVudCk6IERlbGV0ZWQuCisgICAgICAgICguc2lkZWJhciA+IC5wYW5lbC5u YXZpZ2F0aW9uLnNvdXJjZXMgPiAuY29udGVudCA+IC5kZXRhaWxzLXNlY3Rpb246bWF0Y2hlcygu Y2FsbC1zdGFjaywgLmJyZWFrcG9pbnRzKTpub3QoLmNvbGxhcHNlZCkgPiAuY29udGVudCk6IERl bGV0ZWQuCisgICAgICAgICguc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLnNvdXJjZXMgPiAu Y29udGVudCA+IC5kZXRhaWxzLXNlY3Rpb24uY2FsbC1zdGFjayk6IERlbGV0ZWQuCisgICAgICAg ICguc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLnNvdXJjZXMgPiAuY29udGVudCA+IC5kZXRh aWxzLXNlY3Rpb24uYnJlYWtwb2ludHMpOiBEZWxldGVkLgorICAgICAgICAoLnNpZGViYXIgPiAu cGFuZWwubmF2aWdhdGlvbi5zb3VyY2VzID4gLmNvbnRlbnQgPiAuZGV0YWlscy1zZWN0aW9uLmJy ZWFrcG9pbnRzIC5jcmVhdGUtYnJlYWtwb2ludCk6IERlbGV0ZWQuCisgICAgICAgIChAbWVkaWEg KG1pbi1oZWlnaHQ6IDYwMHB4KSk6IERlbGV0ZWQuCisgICAgICAgICguc2lkZWJhciA+IC5wYW5l bC5uYXZpZ2F0aW9uLnNvdXJjZXMgPiAuY29udGVudCA+IC5wYXVzZS1yZWFzb24pOiBEZWxldGVk LgorICAgICAgICAoLnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi5zb3VyY2VzID4gLmNvbnRl bnQgPiAuZGV0YWlscy1zZWN0aW9uOm1hdGNoZXMoLmNhbGwtc3RhY2ssIC5icmVha3BvaW50cyk6 bm90KC5jb2xsYXBzZWQpID4gLmNvbnRlbnQsKTogRGVsZXRlZC4KKyAgICAgICAgKC5zaWRlYmFy ID4gLnBhbmVsLm5hdmlnYXRpb24uc291cmNlcyA+IC5jb250ZW50ID4gLmRldGFpbHMtc2VjdGlv bi5icmVha3BvaW50cyAudHJlZS1vdXRsaW5lIC5pdGVtLmV2ZW50LXRhcmdldC13aW5kb3cgLmlj b24pOiBEZWxldGVkLgorICAgICAgICBXcmFwIHRoZSBQYXVzZSBSZWFzb24sIENhbGwgU3RhY2ss IGFuZCBCcmVha3BvaW50cyBgV0kuRGV0YWlsc1NlY3Rpb25gcyBpbiBhIGNvbnRhaW5lcgorICAg ICAgICBlbGVtZW50IHNvIHRoYXQgdGhlIHN0eWxpbmcgb2YgdGhlIHN0aWNreSBoZWFkZXIgZG9l c24ndCBnZXQgYWZmZWN0ZWQgYnkgdGhlIGNsYW1waW5nIG9mIHRoZQorICAgICAgICBjb250YWlu ZXIncyBoZWlnaHQuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0RldGFpbHNTZWN0 aW9uLmNzczoKKyAgICAgICAgKC5kZXRhaWxzLXNlY3Rpb24pOgorICAgICAgICAoLmRldGFpbHMt c2VjdGlvbiA+IC5oZWFkZXIpOgorICAgICAgICBDcmVhdGUgQ1NTIHZhcmlhYmxlcyBmb3Igc3R5 bGVzIHRoYXQgd2lsbCBiZSBvdmVycmlkZGVuIGJ5IHRoZSBTb3VyY2VzIG5hdmlnYXRpb24gc2lk ZWJhci4KKwogMjAxOS0wNy0yNCAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAK ICAgICAgICAgV2ViIEluc3BlY3RvcjogUkVHUkVTU0lPTjogbm8gY29udGV4dCBtZW51IGl0ZW1z IHdvcmsgd2hlbiBjb250ZXh0IG1lbnUgY2xpY2tpbmcgb24gIkFkZCBCcmVha3BvaW50IgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGV0YWls c1NlY3Rpb24uY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv RGV0YWlsc1NlY3Rpb24uY3NzCmluZGV4IDQ3ZDI3OGY2ZjliMjQ2NTkxZDBhODgxYWZjNDE5Yjdj MmM3NTNmMTcuLmYzZmI4MjI2NjkzNWQyODI0NmI2NDNkODQ5ZGU3NDE0YjZjNzg2YTIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RldGFpbHNT ZWN0aW9uLmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9EZXRhaWxzU2VjdGlvbi5jc3MKQEAgLTI2LDcgKzI2LDEwIEBACiAuZGV0YWlscy1zZWN0aW9u IHsKICAgICBmb250LXNpemU6IDEwcHg7CiAgICAgYmFja2dyb3VuZC1jb2xvcjogdmFyKC0tcGFu ZWwtYmFja2dyb3VuZC1jb2xvcik7Ci0gICAgYm9yZGVyLWJvdHRvbTogMXB4IHNvbGlkIHZhcigt LWJvcmRlci1jb2xvcik7CisgICAgYm9yZGVyLWJvdHRvbTogdmFyKC0tZGV0YWlscy1zZWN0aW9u LWJvcmRlci1ib3R0b20pOworCisgICAgLS1kZXRhaWxzLXNlY3Rpb24tYm9yZGVyLWJvdHRvbTog MXB4IHNvbGlkIHZhcigtLWJvcmRlci1jb2xvcik7CisgICAgLS1kZXRhaWxzLXNlY3Rpb24taGVh ZGVyLXRvcDogLTFweDsKIH0KIAogLmRldGFpbHMtc2VjdGlvbiAuZGV0YWlscy1zZWN0aW9uIHsK QEAgLTQ0LDcgKzQ3LDcgQEAKIAogLmRldGFpbHMtc2VjdGlvbiA+IC5oZWFkZXIgewogICAgIHBv c2l0aW9uOiBzdGlja3k7Ci0gICAgdG9wOiAtMXB4OworICAgIHRvcDogdmFyKC0tZGV0YWlscy1z ZWN0aW9uLWhlYWRlci10b3ApOwogICAgIGhlaWdodDogMjNweDsKICAgICBwYWRkaW5nOiA0cHgg MDsKICAgICAtd2Via2l0LXBhZGRpbmctZW5kOiA1cHg7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Tb3VyY2VzTmF2aWdhdGlvblNpZGViYXJQ YW5lbC5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Tb3Vy Y2VzTmF2aWdhdGlvblNpZGViYXJQYW5lbC5jc3MKaW5kZXggYWY2ZmFmOWY3YWU1ZGUzNGYwZjAw Y2M3YWQ5YWVjMGJjNzYyM2I3YS4uY2YwMTEzNDgxYjI3Yzg1ODc3NzRlNGQxZmY4NGQwMmFjYjc0 ZmUzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvU291cmNlc05hdmlnYXRpb25TaWRlYmFyUGFuZWwuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NvdXJjZXNOYXZpZ2F0aW9uU2lkZWJhclBhbmVs LmNzcwpAQCAtNjUsNTYgKzY1LDMxIEBACiAgICAgZGlzcGxheTogbm9uZTsKIH0KIAotLnNpZGVi YXIgPiAucGFuZWwubmF2aWdhdGlvbi5zb3VyY2VzID4gLmNvbnRlbnQgPiAuZGV0YWlscy1zZWN0 aW9uIHsKLSAgICBwYWRkaW5nLWJvdHRvbTogMXB4OwotICAgIGZvbnQtc2l6ZTogMTFweDsKLSAg ICBib3JkZXItYm90dG9tLXdpZHRoOiAxcHggIWltcG9ydGFudDsKKy5zaWRlYmFyID4gLnBhbmVs Lm5hdmlnYXRpb24uc291cmNlcyA+IC5jb250ZW50ID4gOm1hdGNoZXMoLnBhdXNlLXJlYXNvbi1j b250YWluZXIsIC5jYWxsLXN0YWNrLWNvbnRhaW5lciwgLmJyZWFrcG9pbnRzLWNvbnRhaW5lcikg eworICAgIGJvcmRlci1ib3R0b206IDFweCBzb2xpZCB2YXIoLS1ib3JkZXItY29sb3IpOwogfQog Ci0uc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLnNvdXJjZXMgPiAuY29udGVudCA+IC5kZXRh aWxzLXNlY3Rpb246bWF0Y2hlcygucGF1c2VkLXJlYXNvbiwgLmJyZWFrcG9pbnRzKS5jb2xsYXBz ZWQgPiAuaGVhZGVyID4gLm9wdGlvbnMsCi0uc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLnNv dXJjZXMgPiAuY29udGVudCA+IC5kZXRhaWxzLXNlY3Rpb24gPiAuY29udGVudCwKLS5zaWRlYmFy ID4gLnBhbmVsLm5hdmlnYXRpb24uc291cmNlcyA+IC5jb250ZW50ID4gLmRldGFpbHMtc2VjdGlv biA+IC5jb250ZW50ID4gLmdyb3VwIHsKKy5zaWRlYmFyID4gLnBhbmVsLm5hdmlnYXRpb24uc291 cmNlcyA+IC5jb250ZW50IC5kZXRhaWxzLXNlY3Rpb24geworICAgIGZvbnQtc2l6ZTogMTFweDsK KyAgICAtLWRldGFpbHMtc2VjdGlvbi1ib3JkZXItYm90dG9tOiBub25lOworfQorCisuc2lkZWJh ciA+IC5wYW5lbC5uYXZpZ2F0aW9uLnNvdXJjZXMgPiAuY29udGVudCAuZGV0YWlscy1zZWN0aW9u LmNvbGxhcHNlZCA+IC5oZWFkZXIgPiAub3B0aW9ucywKKy5zaWRlYmFyID4gLnBhbmVsLm5hdmln YXRpb24uc291cmNlcyA+IC5jb250ZW50IC5kZXRhaWxzLXNlY3Rpb246bm90KC5jb2xsYXBzZWQp ID4gLmNvbnRlbnQsCisuc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLnNvdXJjZXMgPiAuY29u dGVudCAuZGV0YWlscy1zZWN0aW9uOm5vdCguY29sbGFwc2VkKSA+IC5jb250ZW50ID4gLmdyb3Vw IHsKICAgICBkaXNwbGF5OiBibG9jazsKIH0KIAotLnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlv bi5zb3VyY2VzID4gLmNvbnRlbnQgPiAuZGV0YWlscy1zZWN0aW9uLmNvbGxhcHNlZCA+IC5jb250 ZW50IHsKLSAgICBkaXNwbGF5OiBub25lOwotfQotCi0uc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0 aW9uLnNvdXJjZXMgPiAuY29udGVudCA+IC5kZXRhaWxzLXNlY3Rpb24uYnJlYWtwb2ludHMgPiAu aGVhZGVyID4gLm9wdGlvbnMgLmNyZWF0ZS1icmVha3BvaW50IHsKLSAgICB3aWR0aDogMTVweDsK LX0KLQotLnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi5zb3VyY2VzID4gLmNvbnRlbnQgPiAu ZGV0YWlscy1zZWN0aW9uOm1hdGNoZXMoLnBhdXNlLXJlYXNvbiwgLmNhbGwtc3RhY2ssIC5icmVh a3BvaW50cykgPiAuY29udGVudCwKLS5zaWRlYmFyID4gLnBhbmVsLm5hdmlnYXRpb24uc291cmNl cyA+IC5jb250ZW50ID4gLnRyZWUtb3V0bGluZS5yZXNvdXJjZXMgewotICAgIG92ZXJmbG93LXk6 IGF1dG87Ci19Ci0KLS5zaWRlYmFyID4gLnBhbmVsLm5hdmlnYXRpb24uc291cmNlcyA+IC5jb250 ZW50ID4gLmRldGFpbHMtc2VjdGlvbjptYXRjaGVzKC5jYWxsLXN0YWNrLCAuYnJlYWtwb2ludHMp ID4gLmNvbnRlbnQgewotICAgIC8qIFNhbWUgY2FsY3VsYXRpb24gYXMgYmVsb3csIGJ1dCB3aXRo b3V0IHZhcigtLWl0ZW0tY291bnQpICovCi0gICAgbWF4LWhlaWdodDogMTEwcHg7Ci19Ci0KLS5z aWRlYmFyID4gLnBhbmVsLm5hdmlnYXRpb24uc291cmNlcyA+IC5jb250ZW50ID4gLmRldGFpbHMt c2VjdGlvbjptYXRjaGVzKC5jYWxsLXN0YWNrLCAuYnJlYWtwb2ludHMpOm5vdCguY29sbGFwc2Vk KSA+IC5jb250ZW50IHsKLSAgICAvKiAxcHggZnJvbSAuc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0 aW9uLnNvdXJjZXMgPiAuY29udGVudCA+IC5kZXRhaWxzLXNlY3Rpb24gKGJvcmRlci1ib3R0b20p ICovCi0gICAgLyogNS41IHRvIGVuc3VyZSB0aGF0IGhhbGYgb2YgdGhlIG5leHQgaXRlbSBpcyBz aG93biB3aGVuIG92ZXJmbG93aW5nICovCi0gICAgbWluLWhlaWdodDogY2FsYyhtaW4odmFyKC0t aXRlbS1jb3VudCksIDUuNSkgKiAyMHB4KTsKLX0KLQotLnNpZGViYXIgPiAucGFuZWwubmF2aWdh dGlvbi5zb3VyY2VzID4gLmNvbnRlbnQgPiAuZGV0YWlscy1zZWN0aW9uLmNhbGwtc3RhY2sgewot ICAgIC0taXRlbS1jb3VudDogdmFyKC0tY2FsbC1zdGFjay1jb3VudCk7Ci19Ci0KLS5zaWRlYmFy ID4gLnBhbmVsLm5hdmlnYXRpb24uc291cmNlcyA+IC5jb250ZW50ID4gLmRldGFpbHMtc2VjdGlv bi5icmVha3BvaW50cyB7Ci0gICAgLS1pdGVtLWNvdW50OiB2YXIoLS1icmVha3BvaW50cy1jb3Vu dCk7Ci19Ci0KLS5zaWRlYmFyID4gLnBhbmVsLm5hdmlnYXRpb24uc291cmNlcyA+IC5jb250ZW50 ID4gLmRldGFpbHMtc2VjdGlvbi5icmVha3BvaW50cyAuY3JlYXRlLWJyZWFrcG9pbnQgeworLnNp ZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi5zb3VyY2VzID4gLmNvbnRlbnQgPiAuYnJlYWtwb2lu dHMtY29udGFpbmVyIC5jcmVhdGUtYnJlYWtwb2ludCB7CiAgICAgd2lkdGg6IDE1cHg7CiB9CiAK IC5zaWRlYmFyID4gLnBhbmVsLm5hdmlnYXRpb24uc291cmNlcyA+IC5jb250ZW50ID4gLm5hdmln YXRpb24tYmFyIHsKKyAgICBwb3NpdGlvbjogc3RpY2t5OworICAgIHRvcDogMDsKKyAgICB6LWlu ZGV4OiB2YXIoLS16LWluZGV4LWhlYWRlcik7CiAgICAgbWFyZ2luLWJvdHRvbTogMXB4OworICAg IGJhY2tncm91bmQtY29sb3I6IHZhcigtLXBhbmVsLWJhY2tncm91bmQtY29sb3IpOwogfQogCiAu c2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLnNvdXJjZXMgPiAuY29udGVudCAudHJlZS1vdXRs aW5lLnNpbmdsZS10aHJlYWQgewpAQCAtMTI1LDI0ICsxMDAsNDUgQEAKICAgICBkaXNwbGF5OiBu b25lOwogfQogCi1AbWVkaWEgKG1pbi1oZWlnaHQ6IDYwMHB4KSB7CitAbWVkaWEgKG1pbi1oZWln aHQ6IDY1MHB4KSB7CiAgICAgLnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi5zb3VyY2VzID4g LmNvbnRlbnQgewogICAgICAgICBkaXNwbGF5OiBmbGV4OwogICAgICAgICBmbGV4LWRpcmVjdGlv bjogY29sdW1uOwogICAgICAgICBvdmVyZmxvdy15OiBoaWRkZW47CiAgICAgfQogCi0gICAgLnNp ZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi5zb3VyY2VzID4gLmNvbnRlbnQgPiAucGF1c2UtcmVh c29uIHsKLSAgICAgICAgZmxleC1zaHJpbms6IDA7CisgICAgLnNpZGViYXIgPiAucGFuZWwubmF2 aWdhdGlvbi5zb3VyY2VzID4gLmNvbnRlbnQgLmRldGFpbHMtc2VjdGlvbiB7CisgICAgICAgIC0t ZGV0YWlscy1zZWN0aW9uLWhlYWRlci10b3A6IDA7CiAgICAgfQogCi0gICAgLnNpZGViYXIgPiAu cGFuZWwubmF2aWdhdGlvbi5zb3VyY2VzID4gLmNvbnRlbnQgPiAuZGV0YWlscy1zZWN0aW9uOm1h dGNoZXMoLmNhbGwtc3RhY2ssIC5icmVha3BvaW50cyk6bm90KC5jb2xsYXBzZWQpID4gLmNvbnRl bnQsCi0gICAgLnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi5zb3VyY2VzID4gLmNvbnRlbnQg PiAudHJlZS1vdXRsaW5lLnJlc291cmNlcyB7CisgICAgLnNpZGViYXIgPiAucGFuZWwubmF2aWdh dGlvbi5zb3VyY2VzID4gLmNvbnRlbnQgPiAucGF1c2UtcmVhc29uLWNvbnRhaW5lciB7CisgICAg ICAgIGZsZXgtZ3JvdzogNDsKKyAgICAgICAgZmxleC1zaHJpbms6IDE7CisgICAgfQorCisgICAg LnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi5zb3VyY2VzID4gLmNvbnRlbnQgPiA6bWF0Y2hl cyguY2FsbC1zdGFjay1jb250YWluZXIsIC5icmVha3BvaW50cy1jb250YWluZXIsIC5yZXNvdXJj ZXMpIHsKICAgICAgICAgaGVpZ2h0OiAxMDAlOworICAgICAgICBtYXgtaGVpZ2h0OiBmaXQtY29u dGVudDsKKyAgICAgICAgb3ZlcmZsb3cteTogYXV0bzsKKyAgICB9CisKKyAgICAuc2lkZWJhciA+ IC5wYW5lbC5uYXZpZ2F0aW9uLnNvdXJjZXMgPiAuY29udGVudCA+IC5jYWxsLXN0YWNrLWNvbnRh aW5lciB7CisgICAgICAgIGZsZXgtZ3JvdzogMzsKKyAgICAgICAgZmxleC1zaHJpbms6IDI7Cisg ICAgfQorCisgICAgLnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi5zb3VyY2VzID4gLmNvbnRl bnQgPiAuYnJlYWtwb2ludHMtY29udGFpbmVyIHsKKyAgICAgICAgZmxleC1ncm93OiAyOworICAg ICAgICBmbGV4LXNocmluazogMzsKKyAgICB9CisKKyAgICAuc2lkZWJhciA+IC5wYW5lbC5uYXZp Z2F0aW9uLnNvdXJjZXMgPiAuY29udGVudCA+IC5yZXNvdXJjZXMgeworICAgICAgICBmbGV4LWdy b3c6IDE7CisgICAgICAgIGZsZXgtc2hyaW5rOiAzOwogICAgIH0KIH0KIAotLnNpZGViYXIgPiAu cGFuZWwubmF2aWdhdGlvbi5zb3VyY2VzID4gLmNvbnRlbnQgPiAuZGV0YWlscy1zZWN0aW9uLmJy ZWFrcG9pbnRzIC50cmVlLW91dGxpbmUgLml0ZW0uZXZlbnQtdGFyZ2V0LXdpbmRvdyAuaWNvbiB7 Cisuc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLnNvdXJjZXMgPiAuY29udGVudCA+IC5icmVh a3BvaW50cy1jb250YWluZXIgLnRyZWUtb3V0bGluZSAuaXRlbS5ldmVudC10YXJnZXQtd2luZG93 IC5pY29uIHsKICAgICBjb250ZW50OiB1cmwoLi4vSW1hZ2VzL1R5cGVPYmplY3Quc3ZnKTsKIH0K IApAQCAtMTUyLDMgKzE0OCw0IEBACiAgICAgICAgIGJhY2tncm91bmQtY29sb3I6IHZhcigtLXll bGxvdy1oaWdobGlnaHQtYmFja2dyb3VuZC1jb2xvcik7CiAgICAgfQogfQorCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Tb3VyY2VzTmF2aWdh dGlvblNpZGViYXJQYW5lbC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1NvdXJjZXNOYXZpZ2F0aW9uU2lkZWJhclBhbmVsLmpzCmluZGV4IGU5NTBiM2YwNTE1 NGYxMTc3ZDcyMWY2YTVjODA1YmIwNmRlOTlhYTkuLmQ2MzVjZjY4N2ZmMmM4MzYyZTk5ZWY4ZGJm YjA1ZTViYTgwM2M5MzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1NvdXJjZXNOYXZpZ2F0aW9uU2lkZWJhclBhbmVsLmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NvdXJjZXNOYXZpZ2F0aW9uU2lk ZWJhclBhbmVsLmpzCkBAIC0xMTMsOSArMTEzLDExIEBAIFdJLlNvdXJjZXNOYXZpZ2F0aW9uU2lk ZWJhclBhbmVsID0gY2xhc3MgU291cmNlc05hdmlnYXRpb25TaWRlYmFyUGFuZWwgZXh0ZW5kcyBX CiAgICAgICAgIHRoaXMuX3BhdXNlUmVhc29uR3JvdXAgPSBuZXcgV0kuRGV0YWlsc1NlY3Rpb25H cm91cChbdGhpcy5fcGF1c2VSZWFzb25UZXh0Um93XSk7CiAgICAgICAgIHRoaXMuX3BhdXNlUmVh c29uU2VjdGlvbiA9IG5ldyBXSS5EZXRhaWxzU2VjdGlvbigicGF1c2VkLXJlYXNvbiIsIFdJLlVJ U3RyaW5nKCJQYXVzZSBSZWFzb24iKSwgW3RoaXMuX3BhdXNlUmVhc29uR3JvdXBdLCB0aGlzLl9w YXVzZVJlYXNvbkxpbmtDb250YWluZXJFbGVtZW50KTsKIAorICAgICAgICB0aGlzLl9wYXVzZVJl YXNvbkNvbnRhaW5lciA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOworICAgICAgICB0 aGlzLl9wYXVzZVJlYXNvbkNvbnRhaW5lci5jbGFzc0xpc3QuYWRkKCJwYXVzZS1yZWFzb24tY29u dGFpbmVyIik7CisgICAgICAgIHRoaXMuX3BhdXNlUmVhc29uQ29udGFpbmVyLmFwcGVuZENoaWxk KHRoaXMuX3BhdXNlUmVhc29uU2VjdGlvbi5lbGVtZW50KTsKKwogICAgICAgICB0aGlzLl9jYWxs U3RhY2tUcmVlT3V0bGluZSA9IHRoaXMuY3JlYXRlQ29udGVudFRyZWVPdXRsaW5lKHtzdXBwcmVz c0ZpbHRlcmluZzogdHJ1ZX0pOwotICAgICAgICB0aGlzLl9jYWxsU3RhY2tUcmVlT3V0bGluZS5h ZGRFdmVudExpc3RlbmVyKFdJLlRyZWVPdXRsaW5lLkV2ZW50LkVsZW1lbnRBZGRlZCwgdGhpcy5f aGFuZGxlQ2FsbFN0YWNrRWxlbWVudEFkZGVkT3JSZW1vdmVkLCB0aGlzKTsKLSAgICAgICAgdGhp cy5fY2FsbFN0YWNrVHJlZU91dGxpbmUuYWRkRXZlbnRMaXN0ZW5lcihXSS5UcmVlT3V0bGluZS5F dmVudC5FbGVtZW50UmVtb3ZlZCwgdGhpcy5faGFuZGxlQ2FsbFN0YWNrRWxlbWVudEFkZGVkT3JS ZW1vdmVkLCB0aGlzKTsKICAgICAgICAgdGhpcy5fY2FsbFN0YWNrVHJlZU91dGxpbmUuYWRkRXZl bnRMaXN0ZW5lcihXSS5UcmVlT3V0bGluZS5FdmVudC5TZWxlY3Rpb25EaWRDaGFuZ2UsIHRoaXMu X2hhbmRsZVRyZWVTZWxlY3Rpb25EaWRDaGFuZ2UsIHRoaXMpOwogCiAgICAgICAgIGxldCBjYWxs U3RhY2tSb3cgPSBuZXcgV0kuRGV0YWlsc1NlY3Rpb25Sb3c7CkBAIC0xMjQsNiArMTI2LDEwIEBA IFdJLlNvdXJjZXNOYXZpZ2F0aW9uU2lkZWJhclBhbmVsID0gY2xhc3MgU291cmNlc05hdmlnYXRp b25TaWRlYmFyUGFuZWwgZXh0ZW5kcyBXCiAgICAgICAgIGxldCBjYWxsU3RhY2tHcm91cCA9IG5l dyBXSS5EZXRhaWxzU2VjdGlvbkdyb3VwKFtjYWxsU3RhY2tSb3ddKTsKICAgICAgICAgdGhpcy5f Y2FsbFN0YWNrU2VjdGlvbiA9IG5ldyBXSS5EZXRhaWxzU2VjdGlvbigiY2FsbC1zdGFjayIsIFdJ LlVJU3RyaW5nKCJDYWxsIFN0YWNrIiksIFtjYWxsU3RhY2tHcm91cF0pOwogCisgICAgICAgIHRo aXMuX2NhbGxTdGFja0NvbnRhaW5lciA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwor ICAgICAgICB0aGlzLl9jYWxsU3RhY2tDb250YWluZXIuY2xhc3NMaXN0LmFkZCgiY2FsbC1zdGFj ay1jb250YWluZXIiKTsKKyAgICAgICAgdGhpcy5fY2FsbFN0YWNrQ29udGFpbmVyLmFwcGVuZENo aWxkKHRoaXMuX2NhbGxTdGFja1NlY3Rpb24uZWxlbWVudCk7CisKICAgICAgICAgdGhpcy5fbWFp blRhcmdldFRyZWVFbGVtZW50ID0gbnVsbDsKICAgICAgICAgdGhpcy5fYWN0aXZlQ2FsbEZyYW1l VHJlZUVsZW1lbnQgPSBudWxsOwogCkBAIC0xOTMsMTEgKzE5OSwxNiBAQCBXSS5Tb3VyY2VzTmF2 aWdhdGlvblNpZGViYXJQYW5lbCA9IGNsYXNzIFNvdXJjZXNOYXZpZ2F0aW9uU2lkZWJhclBhbmVs IGV4dGVuZHMgVwogCiAgICAgICAgIGxldCBicmVha3BvaW50c0dyb3VwID0gbmV3IFdJLkRldGFp bHNTZWN0aW9uR3JvdXAoW2JyZWFrcG9pbnRzUm93XSk7CiAgICAgICAgIHRoaXMuX2JyZWFrcG9p bnRzU2VjdGlvbiA9IG5ldyBXSS5EZXRhaWxzU2VjdGlvbigiYnJlYWtwb2ludHMiLCBXSS5VSVN0 cmluZygiQnJlYWtwb2ludHMiKSwgW2JyZWFrcG9pbnRzR3JvdXBdLCBicmVha3BvaW50TmF2aWdh dGlvbkJhcldyYXBwZXIpOwotICAgICAgICB0aGlzLmNvbnRlbnRWaWV3LmVsZW1lbnQuaW5zZXJ0 QmVmb3JlKHRoaXMuX2JyZWFrcG9pbnRzU2VjdGlvbi5lbGVtZW50LCB0aGlzLmNvbnRlbnRWaWV3 LmVsZW1lbnQuZmlyc3RDaGlsZCk7CisKKyAgICAgICAgdGhpcy5fYnJlYWtwb2ludHNDb250YWlu ZXIgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKKyAgICAgICAgdGhpcy5fYnJlYWtw b2ludHNDb250YWluZXIuY2xhc3NMaXN0LmFkZCgiYnJlYWtwb2ludHMtY29udGFpbmVyIik7Cisg ICAgICAgIHRoaXMuX2JyZWFrcG9pbnRzQ29udGFpbmVyLmFwcGVuZENoaWxkKHRoaXMuX2JyZWFr cG9pbnRzU2VjdGlvbi5lbGVtZW50KTsKKworICAgICAgICB0aGlzLmNvbnRlbnRWaWV3LmVsZW1l bnQuaW5zZXJ0QmVmb3JlKHRoaXMuX2JyZWFrcG9pbnRzQ29udGFpbmVyLCB0aGlzLmNvbnRlbnRW aWV3LmVsZW1lbnQuZmlyc3RDaGlsZCk7CiAKICAgICAgICAgdGhpcy5fcmVzb3VyY2VzTmF2aWdh dGlvbkJhciA9IG5ldyBXSS5OYXZpZ2F0aW9uQmFyOwogICAgICAgICB0aGlzLmNvbnRlbnRWaWV3 LmFkZFN1YnZpZXcodGhpcy5fcmVzb3VyY2VzTmF2aWdhdGlvbkJhcik7Ci0gICAgICAgIHRoaXMu Y29udGVudFZpZXcuZWxlbWVudC5pbnNlcnRCZWZvcmUodGhpcy5fcmVzb3VyY2VzTmF2aWdhdGlv bkJhci5lbGVtZW50LCB0aGlzLl9icmVha3BvaW50c1NlY3Rpb24uZWxlbWVudC5uZXh0U2libGlu Zyk7CisgICAgICAgIHRoaXMuY29udGVudFZpZXcuZWxlbWVudC5pbnNlcnRCZWZvcmUodGhpcy5f cmVzb3VyY2VzTmF2aWdhdGlvbkJhci5lbGVtZW50LCB0aGlzLl9icmVha3BvaW50c0NvbnRhaW5l ci5uZXh0U2libGluZyk7CiAKICAgICAgICAgdGhpcy5fcmVzb3VyY2VzTmF2aWdhdGlvbkJhci5h ZGROYXZpZ2F0aW9uSXRlbShuZXcgV0kuRmxleGlibGVTcGFjZU5hdmlnYXRpb25JdGVtKTsKIApA QCAtNDc2LDcgKzQ4Nyw3IEBAIFdJLlNvdXJjZXNOYXZpZ2F0aW9uU2lkZWJhclBhbmVsID0gY2xh c3MgU291cmNlc05hdmlnYXRpb25TaWRlYmFyUGFuZWwgZXh0ZW5kcyBXCiAKICAgICBjcmVhdGVD b250ZW50VHJlZU91dGxpbmUob3B0aW9ucyA9IHt9KQogICAgIHsKLSAgICAgICAgbGV0IHRyZWVP dXRsaW5lID0gc3VwZXIuY3JlYXRlQ29udGVudFRyZWVPdXRsaW5lKG9wdGlvbnMpCisgICAgICAg IGxldCB0cmVlT3V0bGluZSA9IHN1cGVyLmNyZWF0ZUNvbnRlbnRUcmVlT3V0bGluZShvcHRpb25z KTsKIAogICAgICAgICB0cmVlT3V0bGluZS5hZGRFdmVudExpc3RlbmVyKFdJLlRyZWVPdXRsaW5l LkV2ZW50LkVsZW1lbnRSZXZlYWxlZCwgKGV2ZW50KSA9PiB7CiAgICAgICAgICAgICBsZXQgdHJl ZUVsZW1lbnQgPSBldmVudC5kYXRhLmVsZW1lbnQ7CkBAIC0xNDc0LDE5ICsxNDg1LDYgQEAgV0ku U291cmNlc05hdmlnYXRpb25TaWRlYmFyUGFuZWwgPSBjbGFzcyBTb3VyY2VzTmF2aWdhdGlvblNp ZGViYXJQYW5lbCBleHRlbmRzIFcKICAgICAgICAgY29uc29sZS5lcnJvcigiVW5rbm93biB0cmVl IGVsZW1lbnQiLCB0cmVlRWxlbWVudCk7CiAgICAgfQogCi0gICAgX2hhbmRsZUNhbGxTdGFja0Vs ZW1lbnRBZGRlZE9yUmVtb3ZlZChldmVudCkKLSAgICB7Ci0gICAgICAgIGxldCBjb3VudCA9IHRo aXMuX2NhbGxTdGFja1RyZWVPdXRsaW5lLmNoaWxkcmVuLmxlbmd0aDsKLSAgICAgICAgZm9yIChs ZXQgY2hpbGQgb2YgdGhpcy5fY2FsbFN0YWNrVHJlZU91dGxpbmUuY2hpbGRyZW4pCi0gICAgICAg ICAgICBjb3VudCArPSBjaGlsZC5jaGlsZHJlbi5sZW5ndGg7Ci0KLSAgICAgICAgLy8gRG9uJ3Qg Y291bnQgdGhlIG1haW4gdGhyZWFkIGVsZW1lbnQgd2hlbiBpdCBpcyBoaWRkZW4uCi0gICAgICAg IGlmIChXSS50YXJnZXRzLmxlbmd0aCA9PT0gMSkKLSAgICAgICAgICAgIC0tY291bnQ7Ci0KLSAg ICAgICAgdGhpcy5lbGVtZW50LnN0eWxlLnNldFByb3BlcnR5KCItLWNhbGwtc3RhY2stY291bnQi LCBjb3VudCk7Ci0gICAgfQotCiAgICAgX2hhbmRsZUJyZWFrcG9pbnRFbGVtZW50QWRkZWRPclJl bW92ZWQoZXZlbnQpCiAgICAgewogICAgICAgICBsZXQgdHJlZUVsZW1lbnQgPSBldmVudC5kYXRh LmVsZW1lbnQ7CkBAIC0xNDk5LDExICsxNDk3LDYgQEAgV0kuU291cmNlc05hdmlnYXRpb25TaWRl YmFyUGFuZWwgPSBjbGFzcyBTb3VyY2VzTmF2aWdhdGlvblNpZGViYXJQYW5lbCBleHRlbmRzIFcK IAogICAgICAgICBpZiAoc2V0dGluZykKICAgICAgICAgICAgIHNldHRpbmcudmFsdWUgPSAhIXRy ZWVFbGVtZW50LnBhcmVudDsKLQotICAgICAgICBsZXQgY291bnQgPSB0aGlzLl9icmVha3BvaW50 c1RyZWVPdXRsaW5lLmNoaWxkcmVuLmxlbmd0aDsKLSAgICAgICAgZm9yIChsZXQgY2hpbGQgb2Yg dGhpcy5fYnJlYWtwb2ludHNUcmVlT3V0bGluZS5jaGlsZHJlbikKLSAgICAgICAgICAgIGNvdW50 ICs9IGNoaWxkLmNoaWxkcmVuLmxlbmd0aDsKLSAgICAgICAgdGhpcy5lbGVtZW50LnN0eWxlLnNl dFByb3BlcnR5KCItLWJyZWFrcG9pbnRzLWNvdW50IiwgY291bnQpOwogICAgIH0KIAogICAgIF9w b3B1bGF0ZUNyZWF0ZUJyZWFrcG9pbnRDb250ZXh0TWVudShjb250ZXh0TWVudSkKQEAgLTE2OTQs MTAgKzE2ODcsMTAgQEAgV0kuU291cmNlc05hdmlnYXRpb25TaWRlYmFyUGFuZWwgPSBjbGFzcyBT b3VyY2VzTmF2aWdhdGlvblNpZGViYXJQYW5lbCBleHRlbmRzIFcKIAogICAgIF9oYW5kbGVEZWJ1 Z2dlclBhdXNlZChldmVudCkKICAgICB7Ci0gICAgICAgIHRoaXMuY29udGVudFZpZXcuZWxlbWVu dC5pbnNlcnRCZWZvcmUodGhpcy5fY2FsbFN0YWNrU2VjdGlvbi5lbGVtZW50LCB0aGlzLmNvbnRl bnRWaWV3LmVsZW1lbnQuZmlyc3RDaGlsZCk7CisgICAgICAgIHRoaXMuY29udGVudFZpZXcuZWxl bWVudC5pbnNlcnRCZWZvcmUodGhpcy5fY2FsbFN0YWNrQ29udGFpbmVyLCB0aGlzLmNvbnRlbnRW aWV3LmVsZW1lbnQuZmlyc3RDaGlsZCk7CiAKICAgICAgICAgaWYgKHRoaXMuX3VwZGF0ZVBhdXNl UmVhc29uKCkpCi0gICAgICAgICAgICB0aGlzLmNvbnRlbnRWaWV3LmVsZW1lbnQuaW5zZXJ0QmVm b3JlKHRoaXMuX3BhdXNlUmVhc29uU2VjdGlvbi5lbGVtZW50LCB0aGlzLmNvbnRlbnRWaWV3LmVs ZW1lbnQuZmlyc3RDaGlsZCk7CisgICAgICAgICAgICB0aGlzLmNvbnRlbnRWaWV3LmVsZW1lbnQu aW5zZXJ0QmVmb3JlKHRoaXMuX3BhdXNlUmVhc29uQ29udGFpbmVyLCB0aGlzLmNvbnRlbnRWaWV3 LmVsZW1lbnQuZmlyc3RDaGlsZCk7CiAKICAgICAgICAgdGhpcy5fZGVidWdnZXJQYXVzZVJlc3Vt ZUJ1dHRvbkl0ZW0uZW5hYmxlZCA9IHRydWU7CiAgICAgICAgIHRoaXMuX2RlYnVnZ2VyUGF1c2VS ZXN1bWVCdXR0b25JdGVtLnRvZ2dsZWQgPSB0cnVlOwpAQCAtMTcxMCw5ICsxNzAzLDkgQEAgV0ku U291cmNlc05hdmlnYXRpb25TaWRlYmFyUGFuZWwgPSBjbGFzcyBTb3VyY2VzTmF2aWdhdGlvblNp ZGViYXJQYW5lbCBleHRlbmRzIFcKIAogICAgIF9oYW5kbGVEZWJ1Z2dlclJlc3VtZWQoZXZlbnQp CiAgICAgewotICAgICAgICB0aGlzLl9jYWxsU3RhY2tTZWN0aW9uLmVsZW1lbnQucmVtb3ZlKCk7 CisgICAgICAgIHRoaXMuX2NhbGxTdGFja0NvbnRhaW5lci5yZW1vdmUoKTsKIAotICAgICAgICB0 aGlzLl9wYXVzZVJlYXNvblNlY3Rpb24uZWxlbWVudC5yZW1vdmUoKTsKKyAgICAgICAgdGhpcy5f cGF1c2VSZWFzb25Db250YWluZXIucmVtb3ZlKCk7CiAKICAgICAgICAgdGhpcy5fZGVidWdnZXJQ YXVzZVJlc3VtZUJ1dHRvbkl0ZW0uZW5hYmxlZCA9IHRydWU7CiAgICAgICAgIHRoaXMuX2RlYnVn Z2VyUGF1c2VSZXN1bWVCdXR0b25JdGVtLnRvZ2dsZWQgPSBmYWxzZTsK