28174 2009-08-11 05:49:34 -0700 Profile and Database views' status bar buttons are blank 2009-08-13 05:17:25 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 mnaganov webkit-unassigned joepeck pfeldman timothy oldest_to_newest 138942 0 mnaganov 2009-08-11 05:49:34 -0700 This bug was introduced in r46979. Profile view buttons (those shown below a profile view) wasn't updated to use createStatusBarButton method. As a result, they are blank. Trying to fix it naively, I've found that as profile view doesn't have a reference to a Profiles panel, it would need to access the createStatusBarButton function through WebInspector.panels.profiler, which isn't good. So I've decided to encapsulate glyph-based buttons into a new class. As an additional benifit, this allowed to encapsulate toggling and hiding functionality. 138945 1 34552 mnaganov 2009-08-11 05:59:18 -0700 Created attachment 34552 Proposed change 138988 2 34552 timothy 2009-08-11 09:33:10 -0700 Comment on attachment 34552 Proposed change I like the new class, but it should go into it's own file and not part of Panel.js. Also I think toggled would be a better name for the getter/setter than toggledOn. 139278 3 34644 mnaganov 2009-08-12 02:00:21 -0700 Created attachment 34644 Updated patch---comments addressed 139727 4 joepeck 2009-08-12 22:23:51 -0700 Mikhail this is pretty awesome! Heads up on a few other buttons. - delete button in DOMStorageItemsView.js. - delete button in CookieItemsView.js. (just added) The Refresh button has not yet been converted to a glyph, but both of those files have a refresh button as well if you feel they are applicable. 139730 5 pfeldman 2009-08-12 22:45:47 -0700 > The Refresh button has not yet been converted to a glyph, but both of those > files have a refresh button as well if you feel they are applicable. There is an Images/reloadButtonGlyph.png in place, it is just that .refresh-storage-status-bar-item was not updated to use it. Mikhail, could you add the fix into your patch? 139758 6 34723 mnaganov 2009-08-13 02:13:05 -0700 Created attachment 34723 Storage view also converted to use StatusBarButton, fixed Reload button css to support glyph. 139759 7 mnaganov 2009-08-13 02:14:00 -0700 Joseph and Pavel, I've addressed your comments. 139761 8 34724 mnaganov 2009-08-13 02:21:05 -0700 Created attachment 34724 noticed that I've accidentally made "Delete" button in Cookies view hidden---fixed 139802 9 34724 timothy 2009-08-13 04:52:53 -0700 Comment on attachment 34724 noticed that I've accidentally made "Delete" button in Cookies view hidden---fixed Nice! 139807 10 pfeldman 2009-08-13 05:17:25 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/WebCore.gypi M WebCore/WebCore.vcproj/WebCore.vcproj M WebCore/inspector/front-end/CookieItemsView.js M WebCore/inspector/front-end/DOMStorageItemsView.js M WebCore/inspector/front-end/ElementsPanel.js M WebCore/inspector/front-end/Panel.js M WebCore/inspector/front-end/ProfileView.js M WebCore/inspector/front-end/ProfilesPanel.js M WebCore/inspector/front-end/ResourcesPanel.js M WebCore/inspector/front-end/ScriptsPanel.js M WebCore/inspector/front-end/WebKit.qrc M WebCore/inspector/front-end/inspector.css M WebCore/inspector/front-end/inspector.html Committed r47192 34552 2009-08-11 05:59:18 -0700 2009-08-12 02:00:21 -0700 Proposed change fix-profiler-buttons-patch text/plain 24037 mnaganov ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NTNjMjY5MC4uMTRhZTkwZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSw1NCBAQAorMjAwOS0wOC0xMSAgTWlraGFpbCBOYWdh bm92ICA8bW5hZ2Fub3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEludHJvZHVjZWQgYW5kIHVzZWQgU3RhdHVzQmFyQnV0dG9u IGNsYXNzIHRoYXQgZW5jYXBzdWxhdGVkCisgICAgICAgIHJlY2VudGx5IGFkZGVkIGdseXBocyBz dXBwb3J0LgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yODE3NAorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1BhbmVsLmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkVsZW1lbnRzUGFuZWwpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkVsZW1lbnRzUGFuZWwucHJvdG90eXBlLmdldCBzdGF0dXNCYXJJdGVtcyk6CisgICAg ICAgICAgICB1cGRhdGVkIHRvIHJldHJpZXZlIERPTSBlbGVtZW50IGZyb20gU3RhdHVzQmFyQnV0 dG9uIGluc3RhbmNlLgorICAgICAgICAoV2ViSW5zcGVjdG9yLkVsZW1lbnRzUGFuZWwucHJvdG90 eXBlLmhpZGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkVsZW1lbnRzUGFuZWwucHJvdG90eXBl Ll9ub2RlU2VhcmNoQnV0dG9uQ2xpY2tlZCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVu ZC9QYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdGF0dXNCYXJCdXR0b24pOgorICAg ICAgICAgICAgYSBuZXcgY2xhc3MgZW5jYXBzdWxhdGluZyBnbHlwaHMgdXNhZ2UsIHRvZ2dsaW5n LCBhbmQgaGlkaW5nLgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0YXR1c0JhckJ1dHRvbi5wcm90 b3R5cGUuX2NsaWNrZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0YXR1c0JhckJ1dHRvbi5w cm90b3R5cGUuZ2V0IGRpc2FibGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdGF0dXNCYXJC dXR0b24ucHJvdG90eXBlLnNldCBkaXNhYmxlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3Rh dHVzQmFyQnV0dG9uLnByb3RvdHlwZS5nZXQgdGl0bGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlN0YXR1c0JhckJ1dHRvbi5wcm90b3R5cGUuc2V0IHRpdGxlKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5TdGF0dXNCYXJCdXR0b24ucHJvdG90eXBlLmdldCB0b2dnbGVkT24pOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlN0YXR1c0JhckJ1dHRvbi5wcm90b3R5cGUuc2V0IHRvZ2dsZWRPbik6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuU3RhdHVzQmFyQnV0dG9uLnByb3RvdHlwZS5nZXQgdmlzaWJs ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3RhdHVzQmFyQnV0dG9uLnByb3RvdHlwZS5zZXQg dmlzaWJsZSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlVmlldy5qczoK KyAgICAgICAgKFdlYkluc3BlY3Rvci5Qcm9maWxlVmlldyk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuUHJvZmlsZVZpZXcucHJvdG90eXBlLmdldCBzdGF0dXNCYXJJdGVtcyk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuUHJvZmlsZVZpZXcucHJvdG90eXBlLl91cGRhdGVQZXJjZW50QnV0dG9uKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5Qcm9maWxlVmlldy5wcm90b3R5cGUuX2ZvY3VzQ2xpY2tl ZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUHJvZmlsZVZpZXcucHJvdG90eXBlLl9leGNsdWRl Q2xpY2tlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUHJvZmlsZVZpZXcucHJvdG90eXBlLl9y ZXNldENsaWNrZWQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZXNQYW5l bC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Qcm9maWxlc1BhbmVsKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5Qcm9maWxlc1BhbmVsLnByb3RvdHlwZS5nZXQgc3RhdHVzQmFySXRlbXMpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlByb2ZpbGVzUGFuZWwucHJvdG90eXBlLnNldFJlY29yZGlu Z1Byb2ZpbGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlByb2ZpbGVzUGFuZWwucHJvdG90eXBl Ll91cGRhdGVJbnRlcmZhY2UpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmVzb3Vy Y2VzUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90 eXBlLmdldCBzdGF0dXNCYXJJdGVtcyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2Vz UGFuZWwucHJvdG90eXBlLnJlc2V0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQ YW5lbC5wcm90b3R5cGUuX3RvZ2dsZUxhcmdlclJlc291cmNlcyk6CisgICAgICAgICogaW5zcGVj dG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2Ny aXB0c1BhbmVsKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBl LmdldCBzdGF0dXNCYXJJdGVtcyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVs LnByb3RvdHlwZS5fdXBkYXRlUGF1c2VPbkV4Y2VwdGlvbnNCdXR0b24pOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuX3VwZGF0ZURlYnVnZ2VyQnV0dG9ucyk6 CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuY3NzOgorICAgICAgICAg ICAgZm9yIHVuaWZvcm1pdHksIGNsYXNzIG5hbWVzIGFyZSB1c2VkIGFsd2F5cy4KKwogMjAwOS0w OC0xMSAgU2ltb24gSGF1c21hbm4gIDxzaW1vbi5oYXVzbWFubkBub2tpYS5jb20+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgSG9sZ2VyIEZyZXl0aGVyLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzUGFuZWwuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvRWxlbWVudHNQYW5lbC5qcwppbmRleCBmZmEwMDAwLi4zM2JkOGI1IDEwMDY0NAotLS0g YS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNQYW5lbC5qcworKysgYi9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNQYW5lbC5qcwpAQCAtOTcsMTAgKzk3LDcg QEAgV2ViSW5zcGVjdG9yLkVsZW1lbnRzUGFuZWwgPSBmdW5jdGlvbigpCiAgICAgdGhpcy5zaWRl YmFyUmVzaXplRWxlbWVudC5jbGFzc05hbWUgPSAic2lkZWJhci1yZXNpemVyLXZlcnRpY2FsIjsK ICAgICB0aGlzLnNpZGViYXJSZXNpemVFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNlZG93 biIsIHRoaXMucmlnaHRTaWRlYmFyUmVzaXplckRyYWdTdGFydC5iaW5kKHRoaXMpLCBmYWxzZSk7 CiAKLSAgICB0aGlzLm5vZGVTZWFyY2hCdXR0b24gPSB0aGlzLmNyZWF0ZVN0YXR1c0JhckJ1dHRv bigpOwotICAgIHRoaXMubm9kZVNlYXJjaEJ1dHRvbi50aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0 cmluZygiU2VsZWN0IGFuIGVsZW1lbnQgaW4gdGhlIHBhZ2UgdG8gaW5zcGVjdCBpdC4iKTsKLSAg ICB0aGlzLm5vZGVTZWFyY2hCdXR0b24uaWQgPSAibm9kZS1zZWFyY2gtc3RhdHVzLWJhci1pdGVt IjsKLSAgICB0aGlzLm5vZGVTZWFyY2hCdXR0b24uY2xhc3NOYW1lID0gInN0YXR1cy1iYXItaXRl bSI7CisgICAgdGhpcy5ub2RlU2VhcmNoQnV0dG9uID0gbmV3IFdlYkluc3BlY3Rvci5TdGF0dXNC YXJCdXR0b24oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTZWxlY3QgYW4gZWxlbWVudCBpbiB0aGUg cGFnZSB0byBpbnNwZWN0IGl0LiIpLCAibm9kZS1zZWFyY2gtc3RhdHVzLWJhci1pdGVtIik7CiAg ICAgdGhpcy5ub2RlU2VhcmNoQnV0dG9uLmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5f bm9kZVNlYXJjaEJ1dHRvbkNsaWNrZWQuYmluZCh0aGlzKSwgZmFsc2UpOwogCiAgICAgdGhpcy5z ZWFyY2hpbmdGb3JOb2RlID0gZmFsc2U7CkBAIC0xMzAsNyArMTI3LDcgQEAgV2ViSW5zcGVjdG9y LkVsZW1lbnRzUGFuZWwucHJvdG90eXBlID0gewogCiAgICAgZ2V0IHN0YXR1c0Jhckl0ZW1zKCkK ICAgICB7Ci0gICAgICAgIHJldHVybiBbdGhpcy5ub2RlU2VhcmNoQnV0dG9uLCB0aGlzLmNydW1i c0VsZW1lbnRdOworICAgICAgICByZXR1cm4gW3RoaXMubm9kZVNlYXJjaEJ1dHRvbi5lbGVtZW50 LCB0aGlzLmNydW1ic0VsZW1lbnRdOwogICAgIH0sCiAKICAgICB1cGRhdGVTdGF0dXNCYXJJdGVt czogZnVuY3Rpb24oKQpAQCAtMTU2LDcgKzE1Myw3IEBAIFdlYkluc3BlY3Rvci5FbGVtZW50c1Bh bmVsLnByb3RvdHlwZSA9IHsKIAogICAgICAgICBpZiAoSW5zcGVjdG9yQ29udHJvbGxlci5zZWFy Y2hpbmdGb3JOb2RlKCkpIHsKICAgICAgICAgICAgIEluc3BlY3RvckNvbnRyb2xsZXIudG9nZ2xl Tm9kZVNlYXJjaCgpOwotICAgICAgICAgICAgdGhpcy5ub2RlU2VhcmNoQnV0dG9uLnJlbW92ZVN0 eWxlQ2xhc3MoInRvZ2dsZWQtb24iKTsKKyAgICAgICAgICAgIHRoaXMubm9kZVNlYXJjaEJ1dHRv bi50b2dnbGVkT24gPSBmYWxzZTsKICAgICAgICAgfQogICAgIH0sCiAKQEAgLTE3NSw3ICsxNzIs NyBAQCBXZWJJbnNwZWN0b3IuRWxlbWVudHNQYW5lbC5wcm90b3R5cGUgPSB7CiAKICAgICAgICAg aWYgKEluc3BlY3RvckNvbnRyb2xsZXIuc2VhcmNoaW5nRm9yTm9kZSgpKSB7CiAgICAgICAgICAg ICBJbnNwZWN0b3JDb250cm9sbGVyLnRvZ2dsZU5vZGVTZWFyY2goKTsKLSAgICAgICAgICAgIHRo aXMubm9kZVNlYXJjaEJ1dHRvbi5yZW1vdmVTdHlsZUNsYXNzKCJ0b2dnbGVkLW9uIik7CisgICAg ICAgICAgICB0aGlzLm5vZGVTZWFyY2hCdXR0b24udG9nZ2xlZE9uID0gZmFsc2U7CiAgICAgICAg IH0KIAogICAgICAgICB0aGlzLnJlY2VudGx5TW9kaWZpZWROb2RlcyA9IFtdOwpAQCAtMTMxNiwx MCArMTMxMyw3IEBAIFdlYkluc3BlY3Rvci5FbGVtZW50c1BhbmVsLnByb3RvdHlwZSA9IHsKICAg ICB7CiAgICAgICAgIEluc3BlY3RvckNvbnRyb2xsZXIudG9nZ2xlTm9kZVNlYXJjaCgpOwogCi0g ICAgICAgIGlmIChJbnNwZWN0b3JDb250cm9sbGVyLnNlYXJjaGluZ0Zvck5vZGUoKSkKLSAgICAg ICAgICAgIHRoaXMubm9kZVNlYXJjaEJ1dHRvbi5hZGRTdHlsZUNsYXNzKCJ0b2dnbGVkLW9uIik7 Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIHRoaXMubm9kZVNlYXJjaEJ1dHRvbi5yZW1vdmVT dHlsZUNsYXNzKCJ0b2dnbGVkLW9uIik7CisgICAgICAgIHRoaXMubm9kZVNlYXJjaEJ1dHRvbi50 b2dnbGVkT24gPSBJbnNwZWN0b3JDb250cm9sbGVyLnNlYXJjaGluZ0Zvck5vZGUoKTsKICAgICB9 CiB9CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9QYW5lbC5qcyBi L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9QYW5lbC5qcwppbmRleCAzZTIyMTJjLi5jZWI1 MTE4IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUGFuZWwuanMKKysr IGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1BhbmVsLmpzCkBAIC02NiwxOCArNjYsNiBA QCBXZWJJbnNwZWN0b3IuUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4gdGhpcy5f dG9vbGJhckl0ZW07CiAgICAgfSwKIAotICAgIGNyZWF0ZVN0YXR1c0JhckJ1dHRvbjogZnVuY3Rp b24oKQotICAgIHsKLSAgICAgICAgdmFyIGJ1dHRvbiA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQo ImJ1dHRvbiIpOwotICAgICAgICB2YXIgZ2x5cGggPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJk aXYiKTsKLSAgICAgICAgZ2x5cGguY2xhc3NOYW1lID0gImdseXBoIjsKLSAgICAgICAgYnV0dG9u LmFwcGVuZENoaWxkKGdseXBoKTsKLSAgICAgICAgdmFyIGdseXBoU2hhZG93ID0gZG9jdW1lbnQu Y3JlYXRlRWxlbWVudCgiZGl2Iik7Ci0gICAgICAgIGdseXBoU2hhZG93LmNsYXNzTmFtZSA9ICJn bHlwaCBzaGFkb3ciOwotICAgICAgICBidXR0b24uYXBwZW5kQ2hpbGQoZ2x5cGhTaGFkb3cpOwot ICAgICAgICByZXR1cm4gYnV0dG9uOwotICAgIH0sCi0KICAgICBzaG93OiBmdW5jdGlvbigpCiAg ICAgewogICAgICAgICBXZWJJbnNwZWN0b3IuVmlldy5wcm90b3R5cGUuc2hvdy5jYWxsKHRoaXMp OwpAQCAtMjgzLDMgKzI3MSw4NSBAQCBXZWJJbnNwZWN0b3IuUGFuZWwucHJvdG90eXBlID0gewog fQogCiBXZWJJbnNwZWN0b3IuUGFuZWwucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rv ci5WaWV3LnByb3RvdHlwZTsKKworV2ViSW5zcGVjdG9yLlN0YXR1c0JhckJ1dHRvbiA9IGZ1bmN0 aW9uKHRpdGxlLCBjbGFzc05hbWUpCit7CisgICAgdGhpcy5lbGVtZW50ID0gZG9jdW1lbnQuY3Jl YXRlRWxlbWVudCgiYnV0dG9uIik7CisgICAgdGhpcy5lbGVtZW50LnRpdGxlID0gdGl0bGU7Cisg ICAgdGhpcy5lbGVtZW50LmNsYXNzTmFtZSA9IGNsYXNzTmFtZSArICIgc3RhdHVzLWJhci1pdGVt IjsKKyAgICB0aGlzLmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0aGlzLl9jbGlj a2VkLmJpbmQodGhpcyksIGZhbHNlKTsKKworICAgIHRoaXMuX3RvZ2dsZWRPbiA9IGZhbHNlOwor ICAgIHRoaXMuX3Zpc2libGUgPSB0cnVlOworCisgICAgdGhpcy5nbHlwaCA9IGRvY3VtZW50LmNy ZWF0ZUVsZW1lbnQoImRpdiIpOworICAgIHRoaXMuZ2x5cGguY2xhc3NOYW1lID0gImdseXBoIjsK KyAgICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5nbHlwaCk7CisKKyAgICB0aGlzLmds eXBoU2hhZG93ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CisgICAgdGhpcy5nbHlw aFNoYWRvdy5jbGFzc05hbWUgPSAiZ2x5cGggc2hhZG93IjsKKyAgICB0aGlzLmVsZW1lbnQuYXBw ZW5kQ2hpbGQodGhpcy5nbHlwaFNoYWRvdyk7Cit9CisKK1dlYkluc3BlY3Rvci5TdGF0dXNCYXJC dXR0b24ucHJvdG90eXBlID0geworICAgIF9jbGlja2VkOiBmdW5jdGlvbigpCisgICAgeworICAg ICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycygiY2xpY2siKTsKKyAgICB9LAorCisg ICAgZ2V0IGRpc2FibGVkKCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLmVsZW1lbnQuZGlz YWJsZWQ7CisgICAgfSwKKworICAgIHNldCBkaXNhYmxlZCh4KQorICAgIHsKKyAgICAgICAgdGhp cy5lbGVtZW50LmRpc2FibGVkID0geDsKKyAgICB9LAorCisgICAgZ2V0IHRpdGxlKCkKKyAgICB7 CisgICAgICAgIHJldHVybiB0aGlzLmVsZW1lbnQudGl0bGU7CisgICAgfSwKKworICAgIHNldCB0 aXRsZSh0aXRsZSkKKyAgICB7CisgICAgICAgIHRoaXMuZWxlbWVudC50aXRsZSA9IHRpdGxlOwor ICAgIH0sCisKKyAgICBnZXQgdG9nZ2xlZE9uKCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlz Ll90b2dnbGVkT247CisgICAgfSwKKworICAgIHNldCB0b2dnbGVkT24oeCkKKyAgICB7CisgICAg ICAgIGlmICh0aGlzLl90b2dnbGVkT24gPT09IHgpCisgICAgICAgICAgICByZXR1cm47CisKKyAg ICAgICAgaWYgKHgpCisgICAgICAgICAgICB0aGlzLmVsZW1lbnQuYWRkU3R5bGVDbGFzcygidG9n Z2xlZC1vbiIpOworICAgICAgICBlbHNlCisgICAgICAgICAgICB0aGlzLmVsZW1lbnQucmVtb3Zl U3R5bGVDbGFzcygidG9nZ2xlZC1vbiIpOworICAgICAgICB0aGlzLl90b2dnbGVkT24gPSB4Owor ICAgIH0sCisKKyAgICBnZXQgdmlzaWJsZSgpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5f dmlzaWJsZTsKKyAgICB9LAorCisgICAgc2V0IHZpc2libGUoeCkKKyAgICB7CisgICAgICAgIGlm ICh0aGlzLl92aXNpYmxlID09PSB4KQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIGlm ICh4KQorICAgICAgICAgICAgdGhpcy5lbGVtZW50LnJlbW92ZVN0eWxlQ2xhc3MoImhpZGRlbiIp OworICAgICAgICBlbHNlCisgICAgICAgICAgICB0aGlzLmVsZW1lbnQuYWRkU3R5bGVDbGFzcygi aGlkZGVuIik7CisgICAgICAgIHRoaXMuX3Zpc2libGUgPSB4OworICAgIH0KK30KKworV2ViSW5z cGVjdG9yLlN0YXR1c0JhckJ1dHRvbi5wcm90b3R5cGUuX19wcm90b19fID0gV2ViSW5zcGVjdG9y Lk9iamVjdC5wcm90b3R5cGU7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvUHJvZmlsZVZpZXcuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZVZp ZXcuanMKaW5kZXggMjUxN2JkMi4uODhjNWMzYyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1Byb2ZpbGVWaWV3LmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9Qcm9maWxlVmlldy5qcwpAQCAtNTYsMjUgKzU2LDE5IEBAIFdlYkluc3BlY3Rvci5Qcm9m aWxlVmlldyA9IGZ1bmN0aW9uKHByb2ZpbGUpCiAgICAgdGhpcy52aWV3U2VsZWN0RWxlbWVudC5h cHBlbmRDaGlsZChoZWF2eVZpZXdPcHRpb24pOwogICAgIHRoaXMudmlld1NlbGVjdEVsZW1lbnQu YXBwZW5kQ2hpbGQodHJlZVZpZXdPcHRpb24pOwogCi0gICAgdGhpcy5wZXJjZW50QnV0dG9uID0g ZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiYnV0dG9uIik7Ci0gICAgdGhpcy5wZXJjZW50QnV0dG9u LmNsYXNzTmFtZSA9ICJwZXJjZW50LXRpbWUtc3RhdHVzLWJhci1pdGVtIHN0YXR1cy1iYXItaXRl bSI7CisgICAgdGhpcy5wZXJjZW50QnV0dG9uID0gbmV3IFdlYkluc3BlY3Rvci5TdGF0dXNCYXJC dXR0b24oIiIsICJwZXJjZW50LXRpbWUtc3RhdHVzLWJhci1pdGVtIik7CiAgICAgdGhpcy5wZXJj ZW50QnV0dG9uLmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5fcGVyY2VudENsaWNrZWQu YmluZCh0aGlzKSwgZmFsc2UpOwogCi0gICAgdGhpcy5mb2N1c0J1dHRvbiA9IGRvY3VtZW50LmNy ZWF0ZUVsZW1lbnQoImJ1dHRvbiIpOwotICAgIHRoaXMuZm9jdXNCdXR0b24udGl0bGUgPSBXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoIkZvY3VzIHNlbGVjdGVkIGZ1bmN0aW9uLiIpOwotICAgIHRoaXMu Zm9jdXNCdXR0b24uY2xhc3NOYW1lID0gImZvY3VzLXByb2ZpbGUtbm9kZS1zdGF0dXMtYmFyLWl0 ZW0gc3RhdHVzLWJhci1pdGVtIjsKKyAgICB0aGlzLmZvY3VzQnV0dG9uID0gbmV3IFdlYkluc3Bl Y3Rvci5TdGF0dXNCYXJCdXR0b24oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJGb2N1cyBzZWxlY3Rl ZCBmdW5jdGlvbi4iKSwgImZvY3VzLXByb2ZpbGUtbm9kZS1zdGF0dXMtYmFyLWl0ZW0iKTsKICAg ICB0aGlzLmZvY3VzQnV0dG9uLmRpc2FibGVkID0gdHJ1ZTsKICAgICB0aGlzLmZvY3VzQnV0dG9u LmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5fZm9jdXNDbGlja2VkLmJpbmQodGhpcyks IGZhbHNlKTsKIAotICAgIHRoaXMuZXhjbHVkZUJ1dHRvbiA9IGRvY3VtZW50LmNyZWF0ZUVsZW1l bnQoImJ1dHRvbiIpOwotICAgIHRoaXMuZXhjbHVkZUJ1dHRvbi50aXRsZSA9IFdlYkluc3BlY3Rv ci5VSVN0cmluZygiRXhjbHVkZSBzZWxlY3RlZCBmdW5jdGlvbi4iKTsKLSAgICB0aGlzLmV4Y2x1 ZGVCdXR0b24uY2xhc3NOYW1lID0gImV4Y2x1ZGUtcHJvZmlsZS1ub2RlLXN0YXR1cy1iYXItaXRl bSBzdGF0dXMtYmFyLWl0ZW0iOworICAgIHRoaXMuZXhjbHVkZUJ1dHRvbiA9IG5ldyBXZWJJbnNw ZWN0b3IuU3RhdHVzQmFyQnV0dG9uKFdlYkluc3BlY3Rvci5VSVN0cmluZygiRXhjbHVkZSBzZWxl Y3RlZCBmdW5jdGlvbi4iKSwgImV4Y2x1ZGUtcHJvZmlsZS1ub2RlLXN0YXR1cy1iYXItaXRlbSIp OwogICAgIHRoaXMuZXhjbHVkZUJ1dHRvbi5kaXNhYmxlZCA9IHRydWU7CiAgICAgdGhpcy5leGNs dWRlQnV0dG9uLmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5fZXhjbHVkZUNsaWNrZWQu YmluZCh0aGlzKSwgZmFsc2UpOwogCi0gICAgdGhpcy5yZXNldEJ1dHRvbiA9IGRvY3VtZW50LmNy ZWF0ZUVsZW1lbnQoImJ1dHRvbiIpOwotICAgIHRoaXMucmVzZXRCdXR0b24udGl0bGUgPSBXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoIlJlc3RvcmUgYWxsIGZ1bmN0aW9ucy4iKTsKLSAgICB0aGlzLnJl c2V0QnV0dG9uLmNsYXNzTmFtZSA9ICJyZXNldC1wcm9maWxlLXN0YXR1cy1iYXItaXRlbSBzdGF0 dXMtYmFyLWl0ZW0gaGlkZGVuIjsKKyAgICB0aGlzLnJlc2V0QnV0dG9uID0gbmV3IFdlYkluc3Bl Y3Rvci5TdGF0dXNCYXJCdXR0b24oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJSZXN0b3JlIGFsbCBm dW5jdGlvbnMuIiksICJyZXNldC1wcm9maWxlLXN0YXR1cy1iYXItaXRlbSIpOworICAgIHRoaXMu cmVzZXRCdXR0b24udmlzaWJsZSA9IGZhbHNlOwogICAgIHRoaXMucmVzZXRCdXR0b24uYWRkRXZl bnRMaXN0ZW5lcigiY2xpY2siLCB0aGlzLl9yZXNldENsaWNrZWQuYmluZCh0aGlzKSwgZmFsc2Up OwogCiAgICAgdGhpcy5wcm9maWxlID0gcHJvZmlsZTsKQEAgLTkwLDcgKzg0LDcgQEAgV2ViSW5z cGVjdG9yLlByb2ZpbGVWaWV3ID0gZnVuY3Rpb24ocHJvZmlsZSkKIFdlYkluc3BlY3Rvci5Qcm9m aWxlVmlldy5wcm90b3R5cGUgPSB7CiAgICAgZ2V0IHN0YXR1c0Jhckl0ZW1zKCkKICAgICB7Ci0g ICAgICAgIHJldHVybiBbdGhpcy52aWV3U2VsZWN0RWxlbWVudCwgdGhpcy5wZXJjZW50QnV0dG9u LCB0aGlzLmZvY3VzQnV0dG9uLCB0aGlzLmV4Y2x1ZGVCdXR0b24sIHRoaXMucmVzZXRCdXR0b25d OworICAgICAgICByZXR1cm4gW3RoaXMudmlld1NlbGVjdEVsZW1lbnQsIHRoaXMucGVyY2VudEJ1 dHRvbi5lbGVtZW50LCB0aGlzLmZvY3VzQnV0dG9uLmVsZW1lbnQsIHRoaXMuZXhjbHVkZUJ1dHRv bi5lbGVtZW50LCB0aGlzLnJlc2V0QnV0dG9uLmVsZW1lbnRdOwogICAgIH0sCiAKICAgICBnZXQg cHJvZmlsZSgpCkBAIC00MzksMTAgKzQzMywxMCBAQCBXZWJJbnNwZWN0b3IuUHJvZmlsZVZpZXcu cHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAgaWYgKHRoaXMuc2hvd1NlbGZUaW1lQXNQZXJj ZW50ICYmIHRoaXMuc2hvd1RvdGFsVGltZUFzUGVyY2VudCAmJiB0aGlzLnNob3dBdmVyYWdlVGlt ZUFzUGVyY2VudCkgewogICAgICAgICAgICAgdGhpcy5wZXJjZW50QnV0dG9uLnRpdGxlID0gV2Vi SW5zcGVjdG9yLlVJU3RyaW5nKCJTaG93IGFic29sdXRlIHRvdGFsIGFuZCBzZWxmIHRpbWVzLiIp OwotICAgICAgICAgICAgdGhpcy5wZXJjZW50QnV0dG9uLmFkZFN0eWxlQ2xhc3MoInRvZ2dsZWQt b24iKTsKKyAgICAgICAgICAgIHRoaXMucGVyY2VudEJ1dHRvbi50b2dnbGVkT24gPSB0cnVlOwog ICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgdGhpcy5wZXJjZW50QnV0dG9uLnRpdGxlID0g V2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTaG93IHRvdGFsIGFuZCBzZWxmIHRpbWVzIGFzIHBlcmNl bnRhZ2VzLiIpOwotICAgICAgICAgICAgdGhpcy5wZXJjZW50QnV0dG9uLnJlbW92ZVN0eWxlQ2xh c3MoInRvZ2dsZWQtb24iKTsKKyAgICAgICAgICAgIHRoaXMucGVyY2VudEJ1dHRvbi50b2dnbGVk T24gPSBmYWxzZTsKICAgICAgICAgfQogICAgIH0sCiAKQEAgLTQ1MSw3ICs0NDUsNyBAQCBXZWJJ bnNwZWN0b3IuUHJvZmlsZVZpZXcucHJvdG90eXBlID0gewogICAgICAgICBpZiAoIXRoaXMuZGF0 YUdyaWQuc2VsZWN0ZWROb2RlKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIHRoaXMu cmVzZXRCdXR0b24ucmVtb3ZlU3R5bGVDbGFzcygiaGlkZGVuIik7CisgICAgICAgIHRoaXMucmVz ZXRCdXR0b24udmlzaWJsZSA9IHRydWU7CiAgICAgICAgIHRoaXMucHJvZmlsZURhdGFHcmlkVHJl ZS5mb2N1cyh0aGlzLmRhdGFHcmlkLnNlbGVjdGVkTm9kZSk7CiAgICAgICAgIHRoaXMucmVmcmVz aCgpOwogICAgICAgICB0aGlzLnJlZnJlc2hWaXNpYmxlRGF0YSgpOwpAQCAtNDY2LDcgKzQ2MCw3 IEBAIFdlYkluc3BlY3Rvci5Qcm9maWxlVmlldy5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgc2Vs ZWN0ZWROb2RlLmRlc2VsZWN0KCk7CiAKLSAgICAgICAgdGhpcy5yZXNldEJ1dHRvbi5yZW1vdmVT dHlsZUNsYXNzKCJoaWRkZW4iKTsKKyAgICAgICAgdGhpcy5yZXNldEJ1dHRvbi52aXNpYmxlID0g dHJ1ZTsKICAgICAgICAgdGhpcy5wcm9maWxlRGF0YUdyaWRUcmVlLmV4Y2x1ZGUoc2VsZWN0ZWRO b2RlKTsKICAgICAgICAgdGhpcy5yZWZyZXNoKCk7CiAgICAgICAgIHRoaXMucmVmcmVzaFZpc2li bGVEYXRhKCk7CkBAIC00NzQsNyArNDY4LDcgQEAgV2ViSW5zcGVjdG9yLlByb2ZpbGVWaWV3LnBy b3RvdHlwZSA9IHsKIAogICAgIF9yZXNldENsaWNrZWQ6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsK LSAgICAgICAgdGhpcy5yZXNldEJ1dHRvbi5hZGRTdHlsZUNsYXNzKCJoaWRkZW4iKTsKKyAgICAg ICAgdGhpcy5yZXNldEJ1dHRvbi52aXNpYmxlID0gZmFsc2U7CiAgICAgICAgIHRoaXMucHJvZmls ZURhdGFHcmlkVHJlZS5yZXN0b3JlKCk7CiAgICAgICAgIHRoaXMucmVmcmVzaCgpOwogICAgICAg ICB0aGlzLnJlZnJlc2hWaXNpYmxlRGF0YSgpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1Byb2ZpbGVzUGFuZWwuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvUHJvZmlsZXNQYW5lbC5qcwppbmRleCBjOGI5NDhhLi41MTg2NTkwIDEwMDY0NAotLS0gYS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZXNQYW5lbC5qcworKysgYi9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZXNQYW5lbC5qcwpAQCAtNTksMTQgKzU5LDEwIEBA IFdlYkluc3BlY3Rvci5Qcm9maWxlc1BhbmVsID0gZnVuY3Rpb24oKQogICAgIHRoaXMucHJvZmls ZVZpZXdzLmlkID0gInByb2ZpbGUtdmlld3MiOwogICAgIHRoaXMuZWxlbWVudC5hcHBlbmRDaGls ZCh0aGlzLnByb2ZpbGVWaWV3cyk7CiAKLSAgICB0aGlzLmVuYWJsZVRvZ2dsZUJ1dHRvbiA9IHRo aXMuY3JlYXRlU3RhdHVzQmFyQnV0dG9uKCk7Ci0gICAgdGhpcy5lbmFibGVUb2dnbGVCdXR0b24u Y2xhc3NOYW1lID0gImVuYWJsZS10b2dnbGUtc3RhdHVzLWJhci1pdGVtIHN0YXR1cy1iYXItaXRl bSI7CisgICAgdGhpcy5lbmFibGVUb2dnbGVCdXR0b24gPSBuZXcgV2ViSW5zcGVjdG9yLlN0YXR1 c0JhckJ1dHRvbigiIiwgImVuYWJsZS10b2dnbGUtc3RhdHVzLWJhci1pdGVtIik7CiAgICAgdGhp cy5lbmFibGVUb2dnbGVCdXR0b24uYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0aGlzLl90b2dn bGVQcm9maWxpbmcuYmluZCh0aGlzKSwgZmFsc2UpOwogCi0gICAgdGhpcy5yZWNvcmRCdXR0b24g PSB0aGlzLmNyZWF0ZVN0YXR1c0JhckJ1dHRvbigpOwotICAgIHRoaXMucmVjb3JkQnV0dG9uLnRp dGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTdGFydCBwcm9maWxpbmcuIik7Ci0gICAgdGhp cy5yZWNvcmRCdXR0b24uaWQgPSAicmVjb3JkLXByb2ZpbGUtc3RhdHVzLWJhci1pdGVtIjsKLSAg ICB0aGlzLnJlY29yZEJ1dHRvbi5jbGFzc05hbWUgPSAic3RhdHVzLWJhci1pdGVtIjsKKyAgICB0 aGlzLnJlY29yZEJ1dHRvbiA9IG5ldyBXZWJJbnNwZWN0b3IuU3RhdHVzQmFyQnV0dG9uKFdlYklu c3BlY3Rvci5VSVN0cmluZygiU3RhcnQgcHJvZmlsaW5nLiIpLCAicmVjb3JkLXByb2ZpbGUtc3Rh dHVzLWJhci1pdGVtIik7CiAgICAgdGhpcy5yZWNvcmRCdXR0b24uYWRkRXZlbnRMaXN0ZW5lcigi Y2xpY2siLCB0aGlzLl9yZWNvcmRDbGlja2VkLmJpbmQodGhpcyksIGZhbHNlKTsKIAogICAgIHRo aXMucmVjb3JkaW5nID0gZmFsc2U7CkBAIC04Nyw3ICs4Myw3IEBAIFdlYkluc3BlY3Rvci5Qcm9m aWxlc1BhbmVsLnByb3RvdHlwZSA9IHsKIAogICAgIGdldCBzdGF0dXNCYXJJdGVtcygpCiAgICAg ewotICAgICAgICByZXR1cm4gW3RoaXMuZW5hYmxlVG9nZ2xlQnV0dG9uLCB0aGlzLnJlY29yZEJ1 dHRvbiwgdGhpcy5wcm9maWxlVmlld1N0YXR1c0Jhckl0ZW1zQ29udGFpbmVyXTsKKyAgICAgICAg cmV0dXJuIFt0aGlzLmVuYWJsZVRvZ2dsZUJ1dHRvbi5lbGVtZW50LCB0aGlzLnJlY29yZEJ1dHRv bi5lbGVtZW50LCB0aGlzLnByb2ZpbGVWaWV3U3RhdHVzQmFySXRlbXNDb250YWluZXJdOwogICAg IH0sCiAKICAgICBzaG93OiBmdW5jdGlvbigpCkBAIC0zMTcsMTAgKzMxMywxMCBAQCBXZWJJbnNw ZWN0b3IuUHJvZmlsZXNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMucmVjb3JkaW5n ID0gaXNQcm9maWxpbmc7CiAKICAgICAgICAgaWYgKGlzUHJvZmlsaW5nKSB7Ci0gICAgICAgICAg ICB0aGlzLnJlY29yZEJ1dHRvbi5hZGRTdHlsZUNsYXNzKCJ0b2dnbGVkLW9uIik7CisgICAgICAg ICAgICB0aGlzLnJlY29yZEJ1dHRvbi50b2dnbGVkT24gPSB0cnVlOwogICAgICAgICAgICAgdGhp cy5yZWNvcmRCdXR0b24udGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlN0b3AgcHJvZmls aW5nLiIpOwogICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgdGhpcy5yZWNvcmRCdXR0b24u cmVtb3ZlU3R5bGVDbGFzcygidG9nZ2xlZC1vbiIpOworICAgICAgICAgICAgdGhpcy5yZWNvcmRC dXR0b24udG9nZ2xlZE9uID0gZmFsc2U7CiAgICAgICAgICAgICB0aGlzLnJlY29yZEJ1dHRvbi50 aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiU3RhcnQgcHJvZmlsaW5nLiIpOwogICAgICAg ICB9CiAgICAgfSwKQEAgLTMzNiwxNCArMzMyLDE0IEBAIFdlYkluc3BlY3Rvci5Qcm9maWxlc1Bh bmVsLnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAgIGlmIChJbnNwZWN0b3JDb250cm9sbGVy LnByb2ZpbGVyRW5hYmxlZCgpKSB7CiAgICAgICAgICAgICB0aGlzLmVuYWJsZVRvZ2dsZUJ1dHRv bi50aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiUHJvZmlsaW5nIGVuYWJsZWQuIENsaWNr IHRvIGRpc2FibGUuIik7Ci0gICAgICAgICAgICB0aGlzLmVuYWJsZVRvZ2dsZUJ1dHRvbi5hZGRT dHlsZUNsYXNzKCJ0b2dnbGVkLW9uIik7Ci0gICAgICAgICAgICB0aGlzLnJlY29yZEJ1dHRvbi5y ZW1vdmVTdHlsZUNsYXNzKCJoaWRkZW4iKTsKKyAgICAgICAgICAgIHRoaXMuZW5hYmxlVG9nZ2xl QnV0dG9uLnRvZ2dsZWRPbiA9IHRydWU7CisgICAgICAgICAgICB0aGlzLnJlY29yZEJ1dHRvbi52 aXNpYmxlID0gdHJ1ZTsKICAgICAgICAgICAgIHRoaXMucHJvZmlsZVZpZXdTdGF0dXNCYXJJdGVt c0NvbnRhaW5lci5yZW1vdmVTdHlsZUNsYXNzKCJoaWRkZW4iKTsKICAgICAgICAgICAgIHRoaXMu cGFuZWxFbmFibGVyVmlldy52aXNpYmxlID0gZmFsc2U7CiAgICAgICAgIH0gZWxzZSB7CiAgICAg ICAgICAgICB0aGlzLmVuYWJsZVRvZ2dsZUJ1dHRvbi50aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0 cmluZygiUHJvZmlsaW5nIGRpc2FibGVkLiBDbGljayB0byBlbmFibGUuIik7Ci0gICAgICAgICAg ICB0aGlzLmVuYWJsZVRvZ2dsZUJ1dHRvbi5yZW1vdmVTdHlsZUNsYXNzKCJ0b2dnbGVkLW9uIik7 Ci0gICAgICAgICAgICB0aGlzLnJlY29yZEJ1dHRvbi5hZGRTdHlsZUNsYXNzKCJoaWRkZW4iKTsK KyAgICAgICAgICAgIHRoaXMuZW5hYmxlVG9nZ2xlQnV0dG9uLnRvZ2dsZWRPbiA9IGZhbHNlOwor ICAgICAgICAgICAgdGhpcy5yZWNvcmRCdXR0b24udmlzaWJsZSA9IGZhbHNlOwogICAgICAgICAg ICAgdGhpcy5wcm9maWxlVmlld1N0YXR1c0Jhckl0ZW1zQ29udGFpbmVyLmFkZFN0eWxlQ2xhc3Mo ImhpZGRlbiIpOwogICAgICAgICAgICAgdGhpcy5wYW5lbEVuYWJsZXJWaWV3LnZpc2libGUgPSB0 cnVlOwogICAgICAgICB9CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv UmVzb3VyY2VzUGFuZWwuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2Vz UGFuZWwuanMKaW5kZXggZmI0MzU1MS4uNTBhMGQwNiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcwpAQCAtMTM5LDE0ICsxMzksMTEgQEAgV2ViSW5z cGVjdG9yLlJlc291cmNlc1BhbmVsID0gZnVuY3Rpb24oKQogCiAgICAgdGhpcy5lbGVtZW50LmFw cGVuZENoaWxkKHRoaXMucGFuZWxFbmFibGVyVmlldy5lbGVtZW50KTsKIAotICAgIHRoaXMuZW5h YmxlVG9nZ2xlQnV0dG9uID0gdGhpcy5jcmVhdGVTdGF0dXNCYXJCdXR0b24oKTsKLSAgICB0aGlz LmVuYWJsZVRvZ2dsZUJ1dHRvbi5jbGFzc05hbWUgPSAiZW5hYmxlLXRvZ2dsZS1zdGF0dXMtYmFy LWl0ZW0gc3RhdHVzLWJhci1pdGVtIjsKKyAgICB0aGlzLmVuYWJsZVRvZ2dsZUJ1dHRvbiA9IG5l dyBXZWJJbnNwZWN0b3IuU3RhdHVzQmFyQnV0dG9uKCIiLCAiZW5hYmxlLXRvZ2dsZS1zdGF0dXMt YmFyLWl0ZW0iKTsKICAgICB0aGlzLmVuYWJsZVRvZ2dsZUJ1dHRvbi5hZGRFdmVudExpc3RlbmVy KCJjbGljayIsIHRoaXMuX3RvZ2dsZVJlc291cmNlVHJhY2tpbmcuYmluZCh0aGlzKSwgZmFsc2Up OwogCi0gICAgdGhpcy5sYXJnZXJSZXNvdXJjZXNCdXR0b24gPSB0aGlzLmNyZWF0ZVN0YXR1c0Jh ckJ1dHRvbigpOwotICAgIHRoaXMubGFyZ2VyUmVzb3VyY2VzQnV0dG9uLmlkID0gInJlc291cmNl cy1sYXJnZXItcmVzb3VyY2VzLXN0YXR1cy1iYXItaXRlbSI7Ci0gICAgdGhpcy5sYXJnZXJSZXNv dXJjZXNCdXR0b24uY2xhc3NOYW1lID0gInN0YXR1cy1iYXItaXRlbSB0b2dnbGVkLW9uIjsKLSAg ICB0aGlzLmxhcmdlclJlc291cmNlc0J1dHRvbi50aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiVXNlIHNtYWxsIHJlc291cmNlIHJvd3MuIik7CisgICAgdGhpcy5sYXJnZXJSZXNvdXJjZXNC dXR0b24gPSBuZXcgV2ViSW5zcGVjdG9yLlN0YXR1c0JhckJ1dHRvbihXZWJJbnNwZWN0b3IuVUlT dHJpbmcoIlVzZSBzbWFsbCByZXNvdXJjZSByb3dzLiIpLCAicmVzb3VyY2VzLWxhcmdlci1yZXNv dXJjZXMtc3RhdHVzLWJhci1pdGVtIik7CisgICAgdGhpcy5sYXJnZXJSZXNvdXJjZXNCdXR0b24u dG9nZ2xlZE9uID0gdHJ1ZTsKICAgICB0aGlzLmxhcmdlclJlc291cmNlc0J1dHRvbi5hZGRFdmVu dExpc3RlbmVyKCJjbGljayIsIHRoaXMuX3RvZ2dsZUxhcmdlclJlc291cmNlcy5iaW5kKHRoaXMp LCBmYWxzZSk7CiAKICAgICB0aGlzLnNvcnRpbmdTZWxlY3RFbGVtZW50ID0gZG9jdW1lbnQuY3Jl YXRlRWxlbWVudCgic2VsZWN0Iik7CkBAIC0yMTEsNyArMjA4LDcgQEAgV2ViSW5zcGVjdG9yLlJl c291cmNlc1BhbmVsLnByb3RvdHlwZSA9IHsKIAogICAgIGdldCBzdGF0dXNCYXJJdGVtcygpCiAg ICAgewotICAgICAgICByZXR1cm4gW3RoaXMuZW5hYmxlVG9nZ2xlQnV0dG9uLCB0aGlzLmxhcmdl clJlc291cmNlc0J1dHRvbiwgdGhpcy5zb3J0aW5nU2VsZWN0RWxlbWVudF07CisgICAgICAgIHJl dHVybiBbdGhpcy5lbmFibGVUb2dnbGVCdXR0b24uZWxlbWVudCwgdGhpcy5sYXJnZXJSZXNvdXJj ZXNCdXR0b24uZWxlbWVudCwgdGhpcy5zb3J0aW5nU2VsZWN0RWxlbWVudF07CiAgICAgfSwKIAog ICAgIHNob3c6IGZ1bmN0aW9uKCkKQEAgLTQ2NywxNCArNDY0LDE0IEBAIFdlYkluc3BlY3Rvci5S ZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgaWYgKEluc3BlY3RvckNvbnRy b2xsZXIucmVzb3VyY2VUcmFja2luZ0VuYWJsZWQoKSkgewogICAgICAgICAgICAgdGhpcy5lbmFi bGVUb2dnbGVCdXR0b24udGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlJlc291cmNlIHRy YWNraW5nIGVuYWJsZWQuIENsaWNrIHRvIGRpc2FibGUuIik7Ci0gICAgICAgICAgICB0aGlzLmVu YWJsZVRvZ2dsZUJ1dHRvbi5hZGRTdHlsZUNsYXNzKCJ0b2dnbGVkLW9uIik7Ci0gICAgICAgICAg ICB0aGlzLmxhcmdlclJlc291cmNlc0J1dHRvbi5yZW1vdmVTdHlsZUNsYXNzKCJoaWRkZW4iKTsK KyAgICAgICAgICAgIHRoaXMuZW5hYmxlVG9nZ2xlQnV0dG9uLnRvZ2dsZWRPbiA9IHRydWU7Cisg ICAgICAgICAgICB0aGlzLmxhcmdlclJlc291cmNlc0J1dHRvbi52aXNpYmxlID0gdHJ1ZTsKICAg ICAgICAgICAgIHRoaXMuc29ydGluZ1NlbGVjdEVsZW1lbnQucmVtb3ZlU3R5bGVDbGFzcygiaGlk ZGVuIik7CiAgICAgICAgICAgICB0aGlzLnBhbmVsRW5hYmxlclZpZXcudmlzaWJsZSA9IGZhbHNl OwogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgdGhpcy5lbmFibGVUb2dnbGVCdXR0b24u dGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlJlc291cmNlIHRyYWNraW5nIGRpc2FibGVk LiBDbGljayB0byBlbmFibGUuIik7Ci0gICAgICAgICAgICB0aGlzLmVuYWJsZVRvZ2dsZUJ1dHRv bi5yZW1vdmVTdHlsZUNsYXNzKCJ0b2dnbGVkLW9uIik7Ci0gICAgICAgICAgICB0aGlzLmxhcmdl clJlc291cmNlc0J1dHRvbi5hZGRTdHlsZUNsYXNzKCJoaWRkZW4iKTsKKyAgICAgICAgICAgIHRo aXMuZW5hYmxlVG9nZ2xlQnV0dG9uLnRvZ2dsZWRPbiA9IGZhbHNlOworICAgICAgICAgICAgdGhp cy5sYXJnZXJSZXNvdXJjZXNCdXR0b24udmlzaWJsZSA9IGZhbHNlOwogICAgICAgICAgICAgdGhp cy5zb3J0aW5nU2VsZWN0RWxlbWVudC5hZGRTdHlsZUNsYXNzKCJoaWRkZW4iKTsKICAgICAgICAg ICAgIHRoaXMucGFuZWxFbmFibGVyVmlldy52aXNpYmxlID0gdHJ1ZTsKICAgICAgICAgfQpAQCAt MTA3NiwxMiArMTA3MywxMiBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBl ID0gewogICAgICAgICBpZiAodGhpcy5yZXNvdXJjZXNUcmVlRWxlbWVudC5zbWFsbENoaWxkcmVu KSB7CiAgICAgICAgICAgICB0aGlzLnJlc291cmNlc0dyYXBoc0VsZW1lbnQuYWRkU3R5bGVDbGFz cygic21hbGwiKTsKICAgICAgICAgICAgIHRoaXMubGFyZ2VyUmVzb3VyY2VzQnV0dG9uLnRpdGxl ID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJVc2UgbGFyZ2UgcmVzb3VyY2Ugcm93cy4iKTsKLSAg ICAgICAgICAgIHRoaXMubGFyZ2VyUmVzb3VyY2VzQnV0dG9uLnJlbW92ZVN0eWxlQ2xhc3MoInRv Z2dsZWQtb24iKTsKKyAgICAgICAgICAgIHRoaXMubGFyZ2VyUmVzb3VyY2VzQnV0dG9uLnRvZ2ds ZWRPbiA9IGZhbHNlOwogICAgICAgICAgICAgdGhpcy5fYWRqdXN0U2Nyb2xsUG9zaXRpb24oKTsK ICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIHRoaXMucmVzb3VyY2VzR3JhcGhzRWxlbWVu dC5yZW1vdmVTdHlsZUNsYXNzKCJzbWFsbCIpOwogICAgICAgICAgICAgdGhpcy5sYXJnZXJSZXNv dXJjZXNCdXR0b24udGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlVzZSBzbWFsbCByZXNv dXJjZSByb3dzLiIpOwotICAgICAgICAgICAgdGhpcy5sYXJnZXJSZXNvdXJjZXNCdXR0b24uYWRk U3R5bGVDbGFzcygidG9nZ2xlZC1vbiIpOworICAgICAgICAgICAgdGhpcy5sYXJnZXJSZXNvdXJj ZXNCdXR0b24udG9nZ2xlZE9uID0gdHJ1ZTsKICAgICAgICAgfQogICAgIH0sCiAKZGlmZiAtLWdp dCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMgYi9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCmluZGV4IDAwNTgzNzQuLmI3YjYz ODYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwu anMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcwpAQCAt MTUxLDEzICsxNTEsMTAgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbCA9IGZ1bmN0aW9uKCkK ICAgICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5zaWRlYmFyRWxlbWVudCk7CiAgICAg dGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuc2lkZWJhclJlc2l6ZUVsZW1lbnQpOwogCi0g ICAgdGhpcy5lbmFibGVUb2dnbGVCdXR0b24gPSB0aGlzLmNyZWF0ZVN0YXR1c0JhckJ1dHRvbigp OwotICAgIHRoaXMuZW5hYmxlVG9nZ2xlQnV0dG9uLmNsYXNzTmFtZSA9ICJlbmFibGUtdG9nZ2xl LXN0YXR1cy1iYXItaXRlbSBzdGF0dXMtYmFyLWl0ZW0iOworICAgIHRoaXMuZW5hYmxlVG9nZ2xl QnV0dG9uID0gbmV3IFdlYkluc3BlY3Rvci5TdGF0dXNCYXJCdXR0b24oIiIsICJlbmFibGUtdG9n Z2xlLXN0YXR1cy1iYXItaXRlbSIpOwogICAgIHRoaXMuZW5hYmxlVG9nZ2xlQnV0dG9uLmFkZEV2 ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5fdG9nZ2xlRGVidWdnaW5nLmJpbmQodGhpcyksIGZh bHNlKTsKIAotICAgIHRoaXMucGF1c2VPbkV4Y2VwdGlvbkJ1dHRvbiA9IHRoaXMuY3JlYXRlU3Rh dHVzQmFyQnV0dG9uKCk7Ci0gICAgdGhpcy5wYXVzZU9uRXhjZXB0aW9uQnV0dG9uLmlkID0gInNj cmlwdHMtcGF1c2Utb24tZXhjZXB0aW9ucy1zdGF0dXMtYmFyLWl0ZW0iOwotICAgIHRoaXMucGF1 c2VPbkV4Y2VwdGlvbkJ1dHRvbi5jbGFzc05hbWUgPSAic3RhdHVzLWJhci1pdGVtIjsKKyAgICB0 aGlzLnBhdXNlT25FeGNlcHRpb25CdXR0b24gPSBuZXcgV2ViSW5zcGVjdG9yLlN0YXR1c0JhckJ1 dHRvbigiIiwgInNjcmlwdHMtcGF1c2Utb24tZXhjZXB0aW9ucy1zdGF0dXMtYmFyLWl0ZW0iKTsK ICAgICB0aGlzLnBhdXNlT25FeGNlcHRpb25CdXR0b24uYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2si LCB0aGlzLl90b2dnbGVQYXVzZU9uRXhjZXB0aW9ucy5iaW5kKHRoaXMpLCBmYWxzZSk7CiAKICAg ICB0aGlzLl9icmVha3BvaW50c1VSTE1hcCA9IHt9OwpAQCAtMjA4LDcgKzIwNSw3IEBAIFdlYklu c3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogCiAgICAgZ2V0IHN0YXR1c0Jhckl0 ZW1zKCkKICAgICB7Ci0gICAgICAgIHJldHVybiBbdGhpcy5lbmFibGVUb2dnbGVCdXR0b24sIHRo aXMucGF1c2VPbkV4Y2VwdGlvbkJ1dHRvbl07CisgICAgICAgIHJldHVybiBbdGhpcy5lbmFibGVU b2dnbGVCdXR0b24uZWxlbWVudCwgdGhpcy5wYXVzZU9uRXhjZXB0aW9uQnV0dG9uLmVsZW1lbnRd OwogICAgIH0sCiAKICAgICBnZXQgcGF1c2VkKCkKQEAgLTc2NCwxMCArNzYxLDEwIEBAIFdlYklu c3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAgaWYgKElu c3BlY3RvckNvbnRyb2xsZXIucGF1c2VPbkV4Y2VwdGlvbnMoKSkgewogICAgICAgICAgICAgdGhp cy5wYXVzZU9uRXhjZXB0aW9uQnV0dG9uLnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJE b24ndCBwYXVzZSBvbiBleGNlcHRpb25zLiIpOwotICAgICAgICAgICAgdGhpcy5wYXVzZU9uRXhj ZXB0aW9uQnV0dG9uLmFkZFN0eWxlQ2xhc3MoInRvZ2dsZWQtb24iKTsKKyAgICAgICAgICAgIHRo aXMucGF1c2VPbkV4Y2VwdGlvbkJ1dHRvbi50b2dnbGVkT24gPSB0cnVlOwogICAgICAgICB9IGVs c2UgewogICAgICAgICAgICAgdGhpcy5wYXVzZU9uRXhjZXB0aW9uQnV0dG9uLnRpdGxlID0gV2Vi SW5zcGVjdG9yLlVJU3RyaW5nKCJQYXVzZSBvbiBleGNlcHRpb25zLiIpOwotICAgICAgICAgICAg dGhpcy5wYXVzZU9uRXhjZXB0aW9uQnV0dG9uLnJlbW92ZVN0eWxlQ2xhc3MoInRvZ2dsZWQtb24i KTsKKyAgICAgICAgICAgIHRoaXMucGF1c2VPbkV4Y2VwdGlvbkJ1dHRvbi50b2dnbGVkT24gPSBm YWxzZTsKICAgICAgICAgfQogICAgIH0sCiAKQEAgLTc3NSwxMyArNzcyLDEzIEBAIFdlYkluc3Bl Y3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAgaWYgKEluc3Bl Y3RvckNvbnRyb2xsZXIuZGVidWdnZXJFbmFibGVkKCkpIHsKICAgICAgICAgICAgIHRoaXMuZW5h YmxlVG9nZ2xlQnV0dG9uLnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJEZWJ1Z2dpbmcg ZW5hYmxlZC4gQ2xpY2sgdG8gZGlzYWJsZS4iKTsKLSAgICAgICAgICAgIHRoaXMuZW5hYmxlVG9n Z2xlQnV0dG9uLmFkZFN0eWxlQ2xhc3MoInRvZ2dsZWQtb24iKTsKLSAgICAgICAgICAgIHRoaXMu cGF1c2VPbkV4Y2VwdGlvbkJ1dHRvbi5yZW1vdmVTdHlsZUNsYXNzKCJoaWRkZW4iKTsKKyAgICAg ICAgICAgIHRoaXMuZW5hYmxlVG9nZ2xlQnV0dG9uLnRvZ2dsZWRPbiA9IHRydWU7CisgICAgICAg ICAgICB0aGlzLnBhdXNlT25FeGNlcHRpb25CdXR0b24udmlzaWJsZSA9IHRydWU7CiAgICAgICAg ICAgICB0aGlzLnBhbmVsRW5hYmxlclZpZXcudmlzaWJsZSA9IGZhbHNlOwogICAgICAgICB9IGVs c2UgewogICAgICAgICAgICAgdGhpcy5lbmFibGVUb2dnbGVCdXR0b24udGl0bGUgPSBXZWJJbnNw ZWN0b3IuVUlTdHJpbmcoIkRlYnVnZ2luZyBkaXNhYmxlZC4gQ2xpY2sgdG8gZW5hYmxlLiIpOwot ICAgICAgICAgICAgdGhpcy5lbmFibGVUb2dnbGVCdXR0b24ucmVtb3ZlU3R5bGVDbGFzcygidG9n Z2xlZC1vbiIpOwotICAgICAgICAgICAgdGhpcy5wYXVzZU9uRXhjZXB0aW9uQnV0dG9uLmFkZFN0 eWxlQ2xhc3MoImhpZGRlbiIpOworICAgICAgICAgICAgdGhpcy5lbmFibGVUb2dnbGVCdXR0b24u dG9nZ2xlZE9uID0gZmFsc2U7CisgICAgICAgICAgICB0aGlzLnBhdXNlT25FeGNlcHRpb25CdXR0 b24udmlzaWJsZSA9IGZhbHNlOwogICAgICAgICAgICAgdGhpcy5wYW5lbEVuYWJsZXJWaWV3LnZp c2libGUgPSB0cnVlOwogICAgICAgICB9CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9pbnNwZWN0b3IuY3NzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2lu c3BlY3Rvci5jc3MKaW5kZXggNTFkNjI2YS4uMjYwODI2MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5jc3MKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL2luc3BlY3Rvci5jc3MKQEAgLTIwOTEsNyArMjA5MSw3IEBAIGJ1dHRvbi5lbmFi bGUtdG9nZ2xlLXN0YXR1cy1iYXItaXRlbS50b2dnbGVkLW9uIC5nbHlwaCB7CiAgICAgLXdlYmtp dC1tYXNrLWltYWdlOiB1cmwoSW1hZ2VzL2VuYWJsZVNvbGlkQnV0dG9uR2x5cGgucG5nKTsKIH0K IAotI3NjcmlwdHMtcGF1c2Utb24tZXhjZXB0aW9ucy1zdGF0dXMtYmFyLWl0ZW0gLmdseXBoIHsK Ky5zY3JpcHRzLXBhdXNlLW9uLWV4Y2VwdGlvbnMtc3RhdHVzLWJhci1pdGVtIC5nbHlwaCB7CiAg ICAgLXdlYmtpdC1tYXNrLWltYWdlOiB1cmwoSW1hZ2VzL3BhdXNlT25FeGNlcHRpb25CdXR0b25H bHlwaC5wbmcpOwogfQogCkBAIC0yMjA5LDcgKzIyMDksNyBAQCBidXR0b24uZW5hYmxlLXRvZ2ds ZS1zdGF0dXMtYmFyLWl0ZW0udG9nZ2xlZC1vbiAuZ2x5cGggewogICAgIG92ZXJmbG93OiBhdXRv OwogfQogCi0jcmVzb3VyY2VzLWxhcmdlci1yZXNvdXJjZXMtc3RhdHVzLWJhci1pdGVtIC5nbHlw aCB7CisucmVzb3VyY2VzLWxhcmdlci1yZXNvdXJjZXMtc3RhdHVzLWJhci1pdGVtIC5nbHlwaCB7 CiAgICAgLXdlYmtpdC1tYXNrLWltYWdlOiB1cmwoSW1hZ2VzL2xhcmdlclJlc291cmNlc0J1dHRv bkdseXBoLnBuZyk7CiB9CiAKQEAgLTMwOTMsMTYgKzMwOTMsMTYgQEAgYm9keS5pbmFjdGl2ZSAu c2lkZWJhci10cmVlLWl0ZW0uc2VsZWN0ZWQgLmJ1YmJsZS5zZWFyY2gtbWF0Y2hlcyB7CiBidXR0 b24uZW5hYmxlLXRvZ2dsZS1zdGF0dXMtYmFyLWl0ZW0gLmdseXBoIHsKIH0KIAotI3JlY29yZC1w cm9maWxlLXN0YXR1cy1iYXItaXRlbSAuZ2x5cGggeworLnJlY29yZC1wcm9maWxlLXN0YXR1cy1i YXItaXRlbSAuZ2x5cGggewogICAgIC13ZWJraXQtbWFzay1pbWFnZTogdXJsKEltYWdlcy9yZWNv cmRCdXR0b25HbHlwaC5wbmcpOwogfQogCi0jcmVjb3JkLXByb2ZpbGUtc3RhdHVzLWJhci1pdGVt LnRvZ2dsZWQtb24gLmdseXBoIHsKKy5yZWNvcmQtcHJvZmlsZS1zdGF0dXMtYmFyLWl0ZW0udG9n Z2xlZC1vbiAuZ2x5cGggewogICAgIC13ZWJraXQtbWFzay1pbWFnZTogdXJsKEltYWdlcy9yZWNv cmRUb2dnbGVkQnV0dG9uR2x5cGgucG5nKTsKLSAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2IoMjE2 LCAwLCAwKTsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2IoMjE2LCAwLCAwKSAhaW1wb3J0YW50 OwogfQogCi0jbm9kZS1zZWFyY2gtc3RhdHVzLWJhci1pdGVtIC5nbHlwaCB7Cisubm9kZS1zZWFy Y2gtc3RhdHVzLWJhci1pdGVtIC5nbHlwaCB7CiAgICAgLXdlYmtpdC1tYXNrLWltYWdlOiB1cmwo SW1hZ2VzL25vZGVTZWFyY2hCdXR0b25HbHlwaC5wbmcpOwogfQogCg== 34644 2009-08-12 02:00:21 -0700 2009-08-13 02:13:05 -0700 Updated patch---comments addressed fix-profiler-buttons-patch text/plain 28294 mnaganov ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg OWVmMmY3OS4uZWI5ODBlMyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSw1OCBAQAogMjAwOS0wOC0xMiAgTWlraGFpbCBOYWdh bm92ICA8bW5hZ2Fub3ZAY2hyb21pdW0ub3JnPgogCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEludHJvZHVjZWQgYW5kIHVzZWQgU3RhdHVzQmFyQnV0dG9u IGNsYXNzIHRoYXQgZW5jYXBzdWxhdGVkCisgICAgICAgIHJlY2VudGx5IGFkZGVkIGdseXBocyBz dXBwb3J0LgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yODE3NAorCisgICAgICAgICogV2ViQ29yZS5neXBpOgorICAgICAgICAqIFdlYkNvcmUudmNw cm9qL1dlYkNvcmUudmNwcm9qOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVu dHNQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5FbGVtZW50c1BhbmVsKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5FbGVtZW50c1BhbmVsLnByb3RvdHlwZS5nZXQgc3RhdHVzQmFySXRl bXMpOiBVcGRhdGVkIHRvIHJldHJpZXZlIERPTSBlbGVtZW50IGZyb20gU3RhdHVzQmFyQnV0dG9u IGluc3RhbmNlIChoZXJlIGFuZCBpbiBzaW1pbGFyIGdldHRlcnMgYmVsb3cuKQorICAgICAgICAo V2ViSW5zcGVjdG9yLkVsZW1lbnRzUGFuZWwucHJvdG90eXBlLmhpZGUpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkVsZW1lbnRzUGFuZWwucHJvdG90eXBlLl9ub2RlU2VhcmNoQnV0dG9uQ2xpY2tl ZCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9QYW5lbC5qczoKKyAgICAgICAgKiBp bnNwZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlByb2ZpbGVWaWV3KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Qcm9maWxlVmlldy5wcm90b3R5 cGUuZ2V0IHN0YXR1c0Jhckl0ZW1zKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Qcm9maWxlVmll dy5wcm90b3R5cGUuX3VwZGF0ZVBlcmNlbnRCdXR0b24pOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlByb2ZpbGVWaWV3LnByb3RvdHlwZS5fZm9jdXNDbGlja2VkKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5Qcm9maWxlVmlldy5wcm90b3R5cGUuX2V4Y2x1ZGVDbGlja2VkKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5Qcm9maWxlVmlldy5wcm90b3R5cGUuX3Jlc2V0Q2xpY2tlZCk6CisgICAgICAg ICogaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlc1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlByb2ZpbGVzUGFuZWwpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlByb2ZpbGVzUGFu ZWwucHJvdG90eXBlLmdldCBzdGF0dXNCYXJJdGVtcyk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu UHJvZmlsZXNQYW5lbC5wcm90b3R5cGUuc2V0UmVjb3JkaW5nUHJvZmlsZSk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuUHJvZmlsZXNQYW5lbC5wcm90b3R5cGUuX3VwZGF0ZUludGVyZmFjZSk6Cisg ICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUuZ2V0IHN0YXR1c0Jhckl0ZW1z KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUucmVzZXQp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsLnByb3RvdHlwZS5fdG9nZ2xl TGFyZ2VyUmVzb3VyY2VzKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQ YW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuZ2V0IHN0YXR1c0Jhckl0ZW1zKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLl91cGRhdGVQYXVz ZU9uRXhjZXB0aW9uc0J1dHRvbik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVs LnByb3RvdHlwZS5fdXBkYXRlRGVidWdnZXJCdXR0b25zKToKKyAgICAgICAgKiBpbnNwZWN0b3Iv ZnJvbnQtZW5kL1N0YXR1c0JhckJ1dHRvbi5qczogQWRkZWQuCisgICAgICAgIChXZWJJbnNwZWN0 b3IuU3RhdHVzQmFyQnV0dG9uKTogTmV3IGNsYXNzIGVuY2Fwc3VsYXRpbmcgZ2x5cGhzIHVzYWdl LCB0b2dnbGluZywgYW5kIGhpZGluZy4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdGF0dXNCYXJC dXR0b24ucHJvdG90eXBlLl9jbGlja2VkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdGF0dXNC YXJCdXR0b24ucHJvdG90eXBlLmdldCBkaXNhYmxlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu U3RhdHVzQmFyQnV0dG9uLnByb3RvdHlwZS5zZXQgZGlzYWJsZWQpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlN0YXR1c0JhckJ1dHRvbi5wcm90b3R5cGUuZ2V0IHRpdGxlKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5TdGF0dXNCYXJCdXR0b24ucHJvdG90eXBlLnNldCB0aXRsZSk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuU3RhdHVzQmFyQnV0dG9uLnByb3RvdHlwZS5nZXQgdG9nZ2xlZCk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuU3RhdHVzQmFyQnV0dG9uLnByb3RvdHlwZS5zZXQgdG9nZ2xl ZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3RhdHVzQmFyQnV0dG9uLnByb3RvdHlwZS5nZXQg dmlzaWJsZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3RhdHVzQmFyQnV0dG9uLnByb3RvdHlw ZS5zZXQgdmlzaWJsZSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9XZWJLaXQucXJj OgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmNzczogRm9yIHVuaWZv cm1pdHksIGNsYXNzIG5hbWVzIGFyZSBhbHdheXMgdXNlZCB0byBpZGVudGlmeSBzdGF0dXMgYmFy IGJ1dHRvbnMuCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuaHRtbDoK KworMjAwOS0wOC0xMiAgTWlraGFpbCBOYWdhbm92ICA8bW5hZ2Fub3ZAY2hyb21pdW0ub3JnPgor CiAgICAgICAgIFJldmlld2VkIGJ5IFRpbW90aHkgSGF0Y2hlci4KIAogICAgICAgICBDaGFuZ2Vk IE51bWJlci5ieXRlc1RvU3RyaW5nIHRvIHN1cHBvcnQgbG93LXJlc29sdXRpb24gb3V0cHV0Lgpk aWZmIC0tZ2l0IGEvV2ViQ29yZS9XZWJDb3JlLmd5cGkgYi9XZWJDb3JlL1dlYkNvcmUuZ3lwaQpp bmRleCAwOWFmYzM5Li4zODA0NmVlIDEwMDY0NAotLS0gYS9XZWJDb3JlL1dlYkNvcmUuZ3lwaQor KysgYi9XZWJDb3JlL1dlYkNvcmUuZ3lwaQpAQCAtMzQ2NSw2ICszNDY1LDcgQEAKICAgICAgICAg ICAgICdpbnNwZWN0b3IvZnJvbnQtZW5kL1NpZGViYXJUcmVlRWxlbWVudC5qcycsCiAgICAgICAg ICAgICAnaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5qcycsCiAgICAgICAgICAgICAn aW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VWaWV3LmpzJywKKyAgICAgICAgICAgICdpbnNwZWN0 b3IvZnJvbnQtZW5kL1N0YXR1c0JhckJ1dHRvbi5qcycsCiAgICAgICAgICAgICAnaW5zcGVjdG9y L2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qcycsCiAgICAgICAgICAgICAnaW5zcGVjdG9y L2Zyb250LWVuZC9UZXh0UHJvbXB0LmpzJywKICAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQt ZW5kL1RvcERvd25Qcm9maWxlRGF0YUdyaWRUcmVlLmpzJywKZGlmZiAtLWdpdCBhL1dlYkNvcmUv V2ViQ29yZS52Y3Byb2ovV2ViQ29yZS52Y3Byb2ogYi9XZWJDb3JlL1dlYkNvcmUudmNwcm9qL1dl YkNvcmUudmNwcm9qCmluZGV4IDRjZDBlOGEuLjY4MzFkZGIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUv V2ViQ29yZS52Y3Byb2ovV2ViQ29yZS52Y3Byb2oKKysrIGIvV2ViQ29yZS9XZWJDb3JlLnZjcHJv ai9XZWJDb3JlLnZjcHJvagpAQCAtMzEyMTUsNiArMzEyMTUsMTAgQEAKIAkJCQkJPg0KIAkJCQk8 L0ZpbGU+DQogCQkJCTxGaWxlDQorCQkJCQlSZWxhdGl2ZVBhdGg9Ii4uXGluc3BlY3Rvclxmcm9u dC1lbmRcU3RhdHVzQmFyQnV0dG9uLmpzIg0KKwkJCQkJPg0KKwkJCQk8L0ZpbGU+DQorCQkJCTxG aWxlDQogCQkJCQlSZWxhdGl2ZVBhdGg9Ii4uXGluc3BlY3Rvclxmcm9udC1lbmRcU3R5bGVzU2lk ZWJhclBhbmUuanMiDQogCQkJCQk+DQogCQkJCTwvRmlsZT4NCmRpZmYgLS1naXQgYS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNQYW5lbC5qcyBiL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9FbGVtZW50c1BhbmVsLmpzCmluZGV4IGZmYTAwMDAuLjk5ZjYwN2YgMTAwNjQ0 Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1BhbmVsLmpzCisrKyBi L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1BhbmVsLmpzCkBAIC05NywxMCAr OTcsNyBAQCBXZWJJbnNwZWN0b3IuRWxlbWVudHNQYW5lbCA9IGZ1bmN0aW9uKCkKICAgICB0aGlz LnNpZGViYXJSZXNpemVFbGVtZW50LmNsYXNzTmFtZSA9ICJzaWRlYmFyLXJlc2l6ZXItdmVydGlj YWwiOwogICAgIHRoaXMuc2lkZWJhclJlc2l6ZUVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91 c2Vkb3duIiwgdGhpcy5yaWdodFNpZGViYXJSZXNpemVyRHJhZ1N0YXJ0LmJpbmQodGhpcyksIGZh bHNlKTsKIAotICAgIHRoaXMubm9kZVNlYXJjaEJ1dHRvbiA9IHRoaXMuY3JlYXRlU3RhdHVzQmFy QnV0dG9uKCk7Ci0gICAgdGhpcy5ub2RlU2VhcmNoQnV0dG9uLnRpdGxlID0gV2ViSW5zcGVjdG9y LlVJU3RyaW5nKCJTZWxlY3QgYW4gZWxlbWVudCBpbiB0aGUgcGFnZSB0byBpbnNwZWN0IGl0LiIp OwotICAgIHRoaXMubm9kZVNlYXJjaEJ1dHRvbi5pZCA9ICJub2RlLXNlYXJjaC1zdGF0dXMtYmFy LWl0ZW0iOwotICAgIHRoaXMubm9kZVNlYXJjaEJ1dHRvbi5jbGFzc05hbWUgPSAic3RhdHVzLWJh ci1pdGVtIjsKKyAgICB0aGlzLm5vZGVTZWFyY2hCdXR0b24gPSBuZXcgV2ViSW5zcGVjdG9yLlN0 YXR1c0JhckJ1dHRvbihXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNlbGVjdCBhbiBlbGVtZW50IGlu IHRoZSBwYWdlIHRvIGluc3BlY3QgaXQuIiksICJub2RlLXNlYXJjaC1zdGF0dXMtYmFyLWl0ZW0i KTsKICAgICB0aGlzLm5vZGVTZWFyY2hCdXR0b24uYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0 aGlzLl9ub2RlU2VhcmNoQnV0dG9uQ2xpY2tlZC5iaW5kKHRoaXMpLCBmYWxzZSk7CiAKICAgICB0 aGlzLnNlYXJjaGluZ0Zvck5vZGUgPSBmYWxzZTsKQEAgLTEzMCw3ICsxMjcsNyBAQCBXZWJJbnNw ZWN0b3IuRWxlbWVudHNQYW5lbC5wcm90b3R5cGUgPSB7CiAKICAgICBnZXQgc3RhdHVzQmFySXRl bXMoKQogICAgIHsKLSAgICAgICAgcmV0dXJuIFt0aGlzLm5vZGVTZWFyY2hCdXR0b24sIHRoaXMu Y3J1bWJzRWxlbWVudF07CisgICAgICAgIHJldHVybiBbdGhpcy5ub2RlU2VhcmNoQnV0dG9uLmVs ZW1lbnQsIHRoaXMuY3J1bWJzRWxlbWVudF07CiAgICAgfSwKIAogICAgIHVwZGF0ZVN0YXR1c0Jh ckl0ZW1zOiBmdW5jdGlvbigpCkBAIC0xNTYsNyArMTUzLDcgQEAgV2ViSW5zcGVjdG9yLkVsZW1l bnRzUGFuZWwucHJvdG90eXBlID0gewogCiAgICAgICAgIGlmIChJbnNwZWN0b3JDb250cm9sbGVy LnNlYXJjaGluZ0Zvck5vZGUoKSkgewogICAgICAgICAgICAgSW5zcGVjdG9yQ29udHJvbGxlci50 b2dnbGVOb2RlU2VhcmNoKCk7Ci0gICAgICAgICAgICB0aGlzLm5vZGVTZWFyY2hCdXR0b24ucmVt b3ZlU3R5bGVDbGFzcygidG9nZ2xlZC1vbiIpOworICAgICAgICAgICAgdGhpcy5ub2RlU2VhcmNo QnV0dG9uLnRvZ2dsZWQgPSBmYWxzZTsKICAgICAgICAgfQogICAgIH0sCiAKQEAgLTE3NSw3ICsx NzIsNyBAQCBXZWJJbnNwZWN0b3IuRWxlbWVudHNQYW5lbC5wcm90b3R5cGUgPSB7CiAKICAgICAg ICAgaWYgKEluc3BlY3RvckNvbnRyb2xsZXIuc2VhcmNoaW5nRm9yTm9kZSgpKSB7CiAgICAgICAg ICAgICBJbnNwZWN0b3JDb250cm9sbGVyLnRvZ2dsZU5vZGVTZWFyY2goKTsKLSAgICAgICAgICAg IHRoaXMubm9kZVNlYXJjaEJ1dHRvbi5yZW1vdmVTdHlsZUNsYXNzKCJ0b2dnbGVkLW9uIik7Cisg ICAgICAgICAgICB0aGlzLm5vZGVTZWFyY2hCdXR0b24udG9nZ2xlZCA9IGZhbHNlOwogICAgICAg ICB9CiAKICAgICAgICAgdGhpcy5yZWNlbnRseU1vZGlmaWVkTm9kZXMgPSBbXTsKQEAgLTEzMTYs MTAgKzEzMTMsNyBAQCBXZWJJbnNwZWN0b3IuRWxlbWVudHNQYW5lbC5wcm90b3R5cGUgPSB7CiAg ICAgewogICAgICAgICBJbnNwZWN0b3JDb250cm9sbGVyLnRvZ2dsZU5vZGVTZWFyY2goKTsKIAot ICAgICAgICBpZiAoSW5zcGVjdG9yQ29udHJvbGxlci5zZWFyY2hpbmdGb3JOb2RlKCkpCi0gICAg ICAgICAgICB0aGlzLm5vZGVTZWFyY2hCdXR0b24uYWRkU3R5bGVDbGFzcygidG9nZ2xlZC1vbiIp OwotICAgICAgICBlbHNlCi0gICAgICAgICAgICB0aGlzLm5vZGVTZWFyY2hCdXR0b24ucmVtb3Zl U3R5bGVDbGFzcygidG9nZ2xlZC1vbiIpOworICAgICAgICB0aGlzLm5vZGVTZWFyY2hCdXR0b24u dG9nZ2xlZCA9IEluc3BlY3RvckNvbnRyb2xsZXIuc2VhcmNoaW5nRm9yTm9kZSgpOwogICAgIH0K IH0KIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1BhbmVsLmpzIGIv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1BhbmVsLmpzCmluZGV4IDNlMjIxMmMuLjUwNDZm NmIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9QYW5lbC5qcworKysg Yi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUGFuZWwuanMKQEAgLTY2LDE4ICs2Niw2IEBA IFdlYkluc3BlY3Rvci5QYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiB0aGlzLl90 b29sYmFySXRlbTsKICAgICB9LAogCi0gICAgY3JlYXRlU3RhdHVzQmFyQnV0dG9uOiBmdW5jdGlv bigpCi0gICAgewotICAgICAgICB2YXIgYnV0dG9uID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgi YnV0dG9uIik7Ci0gICAgICAgIHZhciBnbHlwaCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRp diIpOwotICAgICAgICBnbHlwaC5jbGFzc05hbWUgPSAiZ2x5cGgiOwotICAgICAgICBidXR0b24u YXBwZW5kQ2hpbGQoZ2x5cGgpOwotICAgICAgICB2YXIgZ2x5cGhTaGFkb3cgPSBkb2N1bWVudC5j cmVhdGVFbGVtZW50KCJkaXYiKTsKLSAgICAgICAgZ2x5cGhTaGFkb3cuY2xhc3NOYW1lID0gImds eXBoIHNoYWRvdyI7Ci0gICAgICAgIGJ1dHRvbi5hcHBlbmRDaGlsZChnbHlwaFNoYWRvdyk7Ci0g ICAgICAgIHJldHVybiBidXR0b247Ci0gICAgfSwKLQogICAgIHNob3c6IGZ1bmN0aW9uKCkKICAg ICB7CiAgICAgICAgIFdlYkluc3BlY3Rvci5WaWV3LnByb3RvdHlwZS5zaG93LmNhbGwodGhpcyk7 CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZVZpZXcuanMg Yi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZVZpZXcuanMKaW5kZXggMjUxN2Jk Mi4uNWM5ZmNkYSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Byb2Zp bGVWaWV3LmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlVmlldy5q cwpAQCAtNTYsMjUgKzU2LDE5IEBAIFdlYkluc3BlY3Rvci5Qcm9maWxlVmlldyA9IGZ1bmN0aW9u KHByb2ZpbGUpCiAgICAgdGhpcy52aWV3U2VsZWN0RWxlbWVudC5hcHBlbmRDaGlsZChoZWF2eVZp ZXdPcHRpb24pOwogICAgIHRoaXMudmlld1NlbGVjdEVsZW1lbnQuYXBwZW5kQ2hpbGQodHJlZVZp ZXdPcHRpb24pOwogCi0gICAgdGhpcy5wZXJjZW50QnV0dG9uID0gZG9jdW1lbnQuY3JlYXRlRWxl bWVudCgiYnV0dG9uIik7Ci0gICAgdGhpcy5wZXJjZW50QnV0dG9uLmNsYXNzTmFtZSA9ICJwZXJj ZW50LXRpbWUtc3RhdHVzLWJhci1pdGVtIHN0YXR1cy1iYXItaXRlbSI7CisgICAgdGhpcy5wZXJj ZW50QnV0dG9uID0gbmV3IFdlYkluc3BlY3Rvci5TdGF0dXNCYXJCdXR0b24oIiIsICJwZXJjZW50 LXRpbWUtc3RhdHVzLWJhci1pdGVtIik7CiAgICAgdGhpcy5wZXJjZW50QnV0dG9uLmFkZEV2ZW50 TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5fcGVyY2VudENsaWNrZWQuYmluZCh0aGlzKSwgZmFsc2Up OwogCi0gICAgdGhpcy5mb2N1c0J1dHRvbiA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImJ1dHRv biIpOwotICAgIHRoaXMuZm9jdXNCdXR0b24udGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmco IkZvY3VzIHNlbGVjdGVkIGZ1bmN0aW9uLiIpOwotICAgIHRoaXMuZm9jdXNCdXR0b24uY2xhc3NO YW1lID0gImZvY3VzLXByb2ZpbGUtbm9kZS1zdGF0dXMtYmFyLWl0ZW0gc3RhdHVzLWJhci1pdGVt IjsKKyAgICB0aGlzLmZvY3VzQnV0dG9uID0gbmV3IFdlYkluc3BlY3Rvci5TdGF0dXNCYXJCdXR0 b24oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJGb2N1cyBzZWxlY3RlZCBmdW5jdGlvbi4iKSwgImZv Y3VzLXByb2ZpbGUtbm9kZS1zdGF0dXMtYmFyLWl0ZW0iKTsKICAgICB0aGlzLmZvY3VzQnV0dG9u LmRpc2FibGVkID0gdHJ1ZTsKICAgICB0aGlzLmZvY3VzQnV0dG9uLmFkZEV2ZW50TGlzdGVuZXIo ImNsaWNrIiwgdGhpcy5fZm9jdXNDbGlja2VkLmJpbmQodGhpcyksIGZhbHNlKTsKIAotICAgIHRo aXMuZXhjbHVkZUJ1dHRvbiA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImJ1dHRvbiIpOwotICAg IHRoaXMuZXhjbHVkZUJ1dHRvbi50aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiRXhjbHVk ZSBzZWxlY3RlZCBmdW5jdGlvbi4iKTsKLSAgICB0aGlzLmV4Y2x1ZGVCdXR0b24uY2xhc3NOYW1l ID0gImV4Y2x1ZGUtcHJvZmlsZS1ub2RlLXN0YXR1cy1iYXItaXRlbSBzdGF0dXMtYmFyLWl0ZW0i OworICAgIHRoaXMuZXhjbHVkZUJ1dHRvbiA9IG5ldyBXZWJJbnNwZWN0b3IuU3RhdHVzQmFyQnV0 dG9uKFdlYkluc3BlY3Rvci5VSVN0cmluZygiRXhjbHVkZSBzZWxlY3RlZCBmdW5jdGlvbi4iKSwg ImV4Y2x1ZGUtcHJvZmlsZS1ub2RlLXN0YXR1cy1iYXItaXRlbSIpOwogICAgIHRoaXMuZXhjbHVk ZUJ1dHRvbi5kaXNhYmxlZCA9IHRydWU7CiAgICAgdGhpcy5leGNsdWRlQnV0dG9uLmFkZEV2ZW50 TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5fZXhjbHVkZUNsaWNrZWQuYmluZCh0aGlzKSwgZmFsc2Up OwogCi0gICAgdGhpcy5yZXNldEJ1dHRvbiA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImJ1dHRv biIpOwotICAgIHRoaXMucmVzZXRCdXR0b24udGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmco IlJlc3RvcmUgYWxsIGZ1bmN0aW9ucy4iKTsKLSAgICB0aGlzLnJlc2V0QnV0dG9uLmNsYXNzTmFt ZSA9ICJyZXNldC1wcm9maWxlLXN0YXR1cy1iYXItaXRlbSBzdGF0dXMtYmFyLWl0ZW0gaGlkZGVu IjsKKyAgICB0aGlzLnJlc2V0QnV0dG9uID0gbmV3IFdlYkluc3BlY3Rvci5TdGF0dXNCYXJCdXR0 b24oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJSZXN0b3JlIGFsbCBmdW5jdGlvbnMuIiksICJyZXNl dC1wcm9maWxlLXN0YXR1cy1iYXItaXRlbSIpOworICAgIHRoaXMucmVzZXRCdXR0b24udmlzaWJs ZSA9IGZhbHNlOwogICAgIHRoaXMucmVzZXRCdXR0b24uYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2si LCB0aGlzLl9yZXNldENsaWNrZWQuYmluZCh0aGlzKSwgZmFsc2UpOwogCiAgICAgdGhpcy5wcm9m aWxlID0gcHJvZmlsZTsKQEAgLTkwLDcgKzg0LDcgQEAgV2ViSW5zcGVjdG9yLlByb2ZpbGVWaWV3 ID0gZnVuY3Rpb24ocHJvZmlsZSkKIFdlYkluc3BlY3Rvci5Qcm9maWxlVmlldy5wcm90b3R5cGUg PSB7CiAgICAgZ2V0IHN0YXR1c0Jhckl0ZW1zKCkKICAgICB7Ci0gICAgICAgIHJldHVybiBbdGhp cy52aWV3U2VsZWN0RWxlbWVudCwgdGhpcy5wZXJjZW50QnV0dG9uLCB0aGlzLmZvY3VzQnV0dG9u LCB0aGlzLmV4Y2x1ZGVCdXR0b24sIHRoaXMucmVzZXRCdXR0b25dOworICAgICAgICByZXR1cm4g W3RoaXMudmlld1NlbGVjdEVsZW1lbnQsIHRoaXMucGVyY2VudEJ1dHRvbi5lbGVtZW50LCB0aGlz LmZvY3VzQnV0dG9uLmVsZW1lbnQsIHRoaXMuZXhjbHVkZUJ1dHRvbi5lbGVtZW50LCB0aGlzLnJl c2V0QnV0dG9uLmVsZW1lbnRdOwogICAgIH0sCiAKICAgICBnZXQgcHJvZmlsZSgpCkBAIC00Mzks MTAgKzQzMywxMCBAQCBXZWJJbnNwZWN0b3IuUHJvZmlsZVZpZXcucHJvdG90eXBlID0gewogICAg IHsKICAgICAgICAgaWYgKHRoaXMuc2hvd1NlbGZUaW1lQXNQZXJjZW50ICYmIHRoaXMuc2hvd1Rv dGFsVGltZUFzUGVyY2VudCAmJiB0aGlzLnNob3dBdmVyYWdlVGltZUFzUGVyY2VudCkgewogICAg ICAgICAgICAgdGhpcy5wZXJjZW50QnV0dG9uLnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5n KCJTaG93IGFic29sdXRlIHRvdGFsIGFuZCBzZWxmIHRpbWVzLiIpOwotICAgICAgICAgICAgdGhp cy5wZXJjZW50QnV0dG9uLmFkZFN0eWxlQ2xhc3MoInRvZ2dsZWQtb24iKTsKKyAgICAgICAgICAg IHRoaXMucGVyY2VudEJ1dHRvbi50b2dnbGVkID0gdHJ1ZTsKICAgICAgICAgfSBlbHNlIHsKICAg ICAgICAgICAgIHRoaXMucGVyY2VudEJ1dHRvbi50aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiU2hvdyB0b3RhbCBhbmQgc2VsZiB0aW1lcyBhcyBwZXJjZW50YWdlcy4iKTsKLSAgICAgICAg ICAgIHRoaXMucGVyY2VudEJ1dHRvbi5yZW1vdmVTdHlsZUNsYXNzKCJ0b2dnbGVkLW9uIik7Cisg ICAgICAgICAgICB0aGlzLnBlcmNlbnRCdXR0b24udG9nZ2xlZCA9IGZhbHNlOwogICAgICAgICB9 CiAgICAgfSwKIApAQCAtNDUxLDcgKzQ0NSw3IEBAIFdlYkluc3BlY3Rvci5Qcm9maWxlVmlldy5w cm90b3R5cGUgPSB7CiAgICAgICAgIGlmICghdGhpcy5kYXRhR3JpZC5zZWxlY3RlZE5vZGUpCiAg ICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgdGhpcy5yZXNldEJ1dHRvbi5yZW1vdmVTdHls ZUNsYXNzKCJoaWRkZW4iKTsKKyAgICAgICAgdGhpcy5yZXNldEJ1dHRvbi52aXNpYmxlID0gdHJ1 ZTsKICAgICAgICAgdGhpcy5wcm9maWxlRGF0YUdyaWRUcmVlLmZvY3VzKHRoaXMuZGF0YUdyaWQu c2VsZWN0ZWROb2RlKTsKICAgICAgICAgdGhpcy5yZWZyZXNoKCk7CiAgICAgICAgIHRoaXMucmVm cmVzaFZpc2libGVEYXRhKCk7CkBAIC00NjYsNyArNDYwLDcgQEAgV2ViSW5zcGVjdG9yLlByb2Zp bGVWaWV3LnByb3RvdHlwZSA9IHsKIAogICAgICAgICBzZWxlY3RlZE5vZGUuZGVzZWxlY3QoKTsK IAotICAgICAgICB0aGlzLnJlc2V0QnV0dG9uLnJlbW92ZVN0eWxlQ2xhc3MoImhpZGRlbiIpOwor ICAgICAgICB0aGlzLnJlc2V0QnV0dG9uLnZpc2libGUgPSB0cnVlOwogICAgICAgICB0aGlzLnBy b2ZpbGVEYXRhR3JpZFRyZWUuZXhjbHVkZShzZWxlY3RlZE5vZGUpOwogICAgICAgICB0aGlzLnJl ZnJlc2goKTsKICAgICAgICAgdGhpcy5yZWZyZXNoVmlzaWJsZURhdGEoKTsKQEAgLTQ3NCw3ICs0 NjgsNyBAQCBXZWJJbnNwZWN0b3IuUHJvZmlsZVZpZXcucHJvdG90eXBlID0gewogCiAgICAgX3Jl c2V0Q2xpY2tlZDogZnVuY3Rpb24oZXZlbnQpCiAgICAgewotICAgICAgICB0aGlzLnJlc2V0QnV0 dG9uLmFkZFN0eWxlQ2xhc3MoImhpZGRlbiIpOworICAgICAgICB0aGlzLnJlc2V0QnV0dG9uLnZp c2libGUgPSBmYWxzZTsKICAgICAgICAgdGhpcy5wcm9maWxlRGF0YUdyaWRUcmVlLnJlc3RvcmUo KTsKICAgICAgICAgdGhpcy5yZWZyZXNoKCk7CiAgICAgICAgIHRoaXMucmVmcmVzaFZpc2libGVE YXRhKCk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZXNQ YW5lbC5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlc1BhbmVsLmpzCmlu ZGV4IGM4Yjk0OGEuLmU3ZWUwNjQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9Qcm9maWxlc1BhbmVsLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Q cm9maWxlc1BhbmVsLmpzCkBAIC01OSwxNCArNTksMTAgQEAgV2ViSW5zcGVjdG9yLlByb2ZpbGVz UGFuZWwgPSBmdW5jdGlvbigpCiAgICAgdGhpcy5wcm9maWxlVmlld3MuaWQgPSAicHJvZmlsZS12 aWV3cyI7CiAgICAgdGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKHRoaXMucHJvZmlsZVZpZXdzKTsK IAotICAgIHRoaXMuZW5hYmxlVG9nZ2xlQnV0dG9uID0gdGhpcy5jcmVhdGVTdGF0dXNCYXJCdXR0 b24oKTsKLSAgICB0aGlzLmVuYWJsZVRvZ2dsZUJ1dHRvbi5jbGFzc05hbWUgPSAiZW5hYmxlLXRv Z2dsZS1zdGF0dXMtYmFyLWl0ZW0gc3RhdHVzLWJhci1pdGVtIjsKKyAgICB0aGlzLmVuYWJsZVRv Z2dsZUJ1dHRvbiA9IG5ldyBXZWJJbnNwZWN0b3IuU3RhdHVzQmFyQnV0dG9uKCIiLCAiZW5hYmxl LXRvZ2dsZS1zdGF0dXMtYmFyLWl0ZW0iKTsKICAgICB0aGlzLmVuYWJsZVRvZ2dsZUJ1dHRvbi5h ZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuX3RvZ2dsZVByb2ZpbGluZy5iaW5kKHRoaXMp LCBmYWxzZSk7CiAKLSAgICB0aGlzLnJlY29yZEJ1dHRvbiA9IHRoaXMuY3JlYXRlU3RhdHVzQmFy QnV0dG9uKCk7Ci0gICAgdGhpcy5yZWNvcmRCdXR0b24udGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlT dHJpbmcoIlN0YXJ0IHByb2ZpbGluZy4iKTsKLSAgICB0aGlzLnJlY29yZEJ1dHRvbi5pZCA9ICJy ZWNvcmQtcHJvZmlsZS1zdGF0dXMtYmFyLWl0ZW0iOwotICAgIHRoaXMucmVjb3JkQnV0dG9uLmNs YXNzTmFtZSA9ICJzdGF0dXMtYmFyLWl0ZW0iOworICAgIHRoaXMucmVjb3JkQnV0dG9uID0gbmV3 IFdlYkluc3BlY3Rvci5TdGF0dXNCYXJCdXR0b24oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTdGFy dCBwcm9maWxpbmcuIiksICJyZWNvcmQtcHJvZmlsZS1zdGF0dXMtYmFyLWl0ZW0iKTsKICAgICB0 aGlzLnJlY29yZEJ1dHRvbi5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuX3JlY29yZENs aWNrZWQuYmluZCh0aGlzKSwgZmFsc2UpOwogCiAgICAgdGhpcy5yZWNvcmRpbmcgPSBmYWxzZTsK QEAgLTg3LDcgKzgzLDcgQEAgV2ViSW5zcGVjdG9yLlByb2ZpbGVzUGFuZWwucHJvdG90eXBlID0g ewogCiAgICAgZ2V0IHN0YXR1c0Jhckl0ZW1zKCkKICAgICB7Ci0gICAgICAgIHJldHVybiBbdGhp cy5lbmFibGVUb2dnbGVCdXR0b24sIHRoaXMucmVjb3JkQnV0dG9uLCB0aGlzLnByb2ZpbGVWaWV3 U3RhdHVzQmFySXRlbXNDb250YWluZXJdOworICAgICAgICByZXR1cm4gW3RoaXMuZW5hYmxlVG9n Z2xlQnV0dG9uLmVsZW1lbnQsIHRoaXMucmVjb3JkQnV0dG9uLmVsZW1lbnQsIHRoaXMucHJvZmls ZVZpZXdTdGF0dXNCYXJJdGVtc0NvbnRhaW5lcl07CiAgICAgfSwKIAogICAgIHNob3c6IGZ1bmN0 aW9uKCkKQEAgLTMxNywxMCArMzEzLDEwIEBAIFdlYkluc3BlY3Rvci5Qcm9maWxlc1BhbmVsLnBy b3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5yZWNvcmRpbmcgPSBpc1Byb2ZpbGluZzsKIAogICAg ICAgICBpZiAoaXNQcm9maWxpbmcpIHsKLSAgICAgICAgICAgIHRoaXMucmVjb3JkQnV0dG9uLmFk ZFN0eWxlQ2xhc3MoInRvZ2dsZWQtb24iKTsKKyAgICAgICAgICAgIHRoaXMucmVjb3JkQnV0dG9u LnRvZ2dsZWQgPSB0cnVlOwogICAgICAgICAgICAgdGhpcy5yZWNvcmRCdXR0b24udGl0bGUgPSBX ZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlN0b3AgcHJvZmlsaW5nLiIpOwogICAgICAgICB9IGVsc2Ug ewotICAgICAgICAgICAgdGhpcy5yZWNvcmRCdXR0b24ucmVtb3ZlU3R5bGVDbGFzcygidG9nZ2xl ZC1vbiIpOworICAgICAgICAgICAgdGhpcy5yZWNvcmRCdXR0b24udG9nZ2xlZCA9IGZhbHNlOwog ICAgICAgICAgICAgdGhpcy5yZWNvcmRCdXR0b24udGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJp bmcoIlN0YXJ0IHByb2ZpbGluZy4iKTsKICAgICAgICAgfQogICAgIH0sCkBAIC0zMzYsMTQgKzMz MiwxNCBAQCBXZWJJbnNwZWN0b3IuUHJvZmlsZXNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgewog ICAgICAgICBpZiAoSW5zcGVjdG9yQ29udHJvbGxlci5wcm9maWxlckVuYWJsZWQoKSkgewogICAg ICAgICAgICAgdGhpcy5lbmFibGVUb2dnbGVCdXR0b24udGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlT dHJpbmcoIlByb2ZpbGluZyBlbmFibGVkLiBDbGljayB0byBkaXNhYmxlLiIpOwotICAgICAgICAg ICAgdGhpcy5lbmFibGVUb2dnbGVCdXR0b24uYWRkU3R5bGVDbGFzcygidG9nZ2xlZC1vbiIpOwot ICAgICAgICAgICAgdGhpcy5yZWNvcmRCdXR0b24ucmVtb3ZlU3R5bGVDbGFzcygiaGlkZGVuIik7 CisgICAgICAgICAgICB0aGlzLmVuYWJsZVRvZ2dsZUJ1dHRvbi50b2dnbGVkID0gdHJ1ZTsKKyAg ICAgICAgICAgIHRoaXMucmVjb3JkQnV0dG9uLnZpc2libGUgPSB0cnVlOwogICAgICAgICAgICAg dGhpcy5wcm9maWxlVmlld1N0YXR1c0Jhckl0ZW1zQ29udGFpbmVyLnJlbW92ZVN0eWxlQ2xhc3Mo ImhpZGRlbiIpOwogICAgICAgICAgICAgdGhpcy5wYW5lbEVuYWJsZXJWaWV3LnZpc2libGUgPSBm YWxzZTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIHRoaXMuZW5hYmxlVG9nZ2xlQnV0 dG9uLnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJQcm9maWxpbmcgZGlzYWJsZWQuIENs aWNrIHRvIGVuYWJsZS4iKTsKLSAgICAgICAgICAgIHRoaXMuZW5hYmxlVG9nZ2xlQnV0dG9uLnJl bW92ZVN0eWxlQ2xhc3MoInRvZ2dsZWQtb24iKTsKLSAgICAgICAgICAgIHRoaXMucmVjb3JkQnV0 dG9uLmFkZFN0eWxlQ2xhc3MoImhpZGRlbiIpOworICAgICAgICAgICAgdGhpcy5lbmFibGVUb2dn bGVCdXR0b24udG9nZ2xlZCA9IGZhbHNlOworICAgICAgICAgICAgdGhpcy5yZWNvcmRCdXR0b24u dmlzaWJsZSA9IGZhbHNlOwogICAgICAgICAgICAgdGhpcy5wcm9maWxlVmlld1N0YXR1c0Jhckl0 ZW1zQ29udGFpbmVyLmFkZFN0eWxlQ2xhc3MoImhpZGRlbiIpOwogICAgICAgICAgICAgdGhpcy5w YW5lbEVuYWJsZXJWaWV3LnZpc2libGUgPSB0cnVlOwogICAgICAgICB9CmRpZmYgLS1naXQgYS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMgYi9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMKaW5kZXggZmI0MzU1MS4uYWUzNjli MiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVs LmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcwpA QCAtMTM5LDE0ICsxMzksMTEgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsID0gZnVuY3Rp b24oKQogCiAgICAgdGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKHRoaXMucGFuZWxFbmFibGVyVmll dy5lbGVtZW50KTsKIAotICAgIHRoaXMuZW5hYmxlVG9nZ2xlQnV0dG9uID0gdGhpcy5jcmVhdGVT dGF0dXNCYXJCdXR0b24oKTsKLSAgICB0aGlzLmVuYWJsZVRvZ2dsZUJ1dHRvbi5jbGFzc05hbWUg PSAiZW5hYmxlLXRvZ2dsZS1zdGF0dXMtYmFyLWl0ZW0gc3RhdHVzLWJhci1pdGVtIjsKKyAgICB0 aGlzLmVuYWJsZVRvZ2dsZUJ1dHRvbiA9IG5ldyBXZWJJbnNwZWN0b3IuU3RhdHVzQmFyQnV0dG9u KCIiLCAiZW5hYmxlLXRvZ2dsZS1zdGF0dXMtYmFyLWl0ZW0iKTsKICAgICB0aGlzLmVuYWJsZVRv Z2dsZUJ1dHRvbi5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuX3RvZ2dsZVJlc291cmNl VHJhY2tpbmcuYmluZCh0aGlzKSwgZmFsc2UpOwogCi0gICAgdGhpcy5sYXJnZXJSZXNvdXJjZXNC dXR0b24gPSB0aGlzLmNyZWF0ZVN0YXR1c0JhckJ1dHRvbigpOwotICAgIHRoaXMubGFyZ2VyUmVz b3VyY2VzQnV0dG9uLmlkID0gInJlc291cmNlcy1sYXJnZXItcmVzb3VyY2VzLXN0YXR1cy1iYXIt aXRlbSI7Ci0gICAgdGhpcy5sYXJnZXJSZXNvdXJjZXNCdXR0b24uY2xhc3NOYW1lID0gInN0YXR1 cy1iYXItaXRlbSB0b2dnbGVkLW9uIjsKLSAgICB0aGlzLmxhcmdlclJlc291cmNlc0J1dHRvbi50 aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiVXNlIHNtYWxsIHJlc291cmNlIHJvd3MuIik7 CisgICAgdGhpcy5sYXJnZXJSZXNvdXJjZXNCdXR0b24gPSBuZXcgV2ViSW5zcGVjdG9yLlN0YXR1 c0JhckJ1dHRvbihXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlVzZSBzbWFsbCByZXNvdXJjZSByb3dz LiIpLCAicmVzb3VyY2VzLWxhcmdlci1yZXNvdXJjZXMtc3RhdHVzLWJhci1pdGVtIik7CisgICAg dGhpcy5sYXJnZXJSZXNvdXJjZXNCdXR0b24udG9nZ2xlZCA9IHRydWU7CiAgICAgdGhpcy5sYXJn ZXJSZXNvdXJjZXNCdXR0b24uYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0aGlzLl90b2dnbGVM YXJnZXJSZXNvdXJjZXMuYmluZCh0aGlzKSwgZmFsc2UpOwogCiAgICAgdGhpcy5zb3J0aW5nU2Vs ZWN0RWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInNlbGVjdCIpOwpAQCAtMjExLDcg KzIwOCw3IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUgPSB7CiAKICAg ICBnZXQgc3RhdHVzQmFySXRlbXMoKQogICAgIHsKLSAgICAgICAgcmV0dXJuIFt0aGlzLmVuYWJs ZVRvZ2dsZUJ1dHRvbiwgdGhpcy5sYXJnZXJSZXNvdXJjZXNCdXR0b24sIHRoaXMuc29ydGluZ1Nl bGVjdEVsZW1lbnRdOworICAgICAgICByZXR1cm4gW3RoaXMuZW5hYmxlVG9nZ2xlQnV0dG9uLmVs ZW1lbnQsIHRoaXMubGFyZ2VyUmVzb3VyY2VzQnV0dG9uLmVsZW1lbnQsIHRoaXMuc29ydGluZ1Nl bGVjdEVsZW1lbnRdOwogICAgIH0sCiAKICAgICBzaG93OiBmdW5jdGlvbigpCkBAIC00NjcsMTQg KzQ2NCwxNCBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlID0gewogCiAg ICAgICAgIGlmIChJbnNwZWN0b3JDb250cm9sbGVyLnJlc291cmNlVHJhY2tpbmdFbmFibGVkKCkp IHsKICAgICAgICAgICAgIHRoaXMuZW5hYmxlVG9nZ2xlQnV0dG9uLnRpdGxlID0gV2ViSW5zcGVj dG9yLlVJU3RyaW5nKCJSZXNvdXJjZSB0cmFja2luZyBlbmFibGVkLiBDbGljayB0byBkaXNhYmxl LiIpOwotICAgICAgICAgICAgdGhpcy5lbmFibGVUb2dnbGVCdXR0b24uYWRkU3R5bGVDbGFzcygi dG9nZ2xlZC1vbiIpOwotICAgICAgICAgICAgdGhpcy5sYXJnZXJSZXNvdXJjZXNCdXR0b24ucmVt b3ZlU3R5bGVDbGFzcygiaGlkZGVuIik7CisgICAgICAgICAgICB0aGlzLmVuYWJsZVRvZ2dsZUJ1 dHRvbi50b2dnbGVkID0gdHJ1ZTsKKyAgICAgICAgICAgIHRoaXMubGFyZ2VyUmVzb3VyY2VzQnV0 dG9uLnZpc2libGUgPSB0cnVlOwogICAgICAgICAgICAgdGhpcy5zb3J0aW5nU2VsZWN0RWxlbWVu dC5yZW1vdmVTdHlsZUNsYXNzKCJoaWRkZW4iKTsKICAgICAgICAgICAgIHRoaXMucGFuZWxFbmFi bGVyVmlldy52aXNpYmxlID0gZmFsc2U7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICB0 aGlzLmVuYWJsZVRvZ2dsZUJ1dHRvbi50aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiUmVz b3VyY2UgdHJhY2tpbmcgZGlzYWJsZWQuIENsaWNrIHRvIGVuYWJsZS4iKTsKLSAgICAgICAgICAg IHRoaXMuZW5hYmxlVG9nZ2xlQnV0dG9uLnJlbW92ZVN0eWxlQ2xhc3MoInRvZ2dsZWQtb24iKTsK LSAgICAgICAgICAgIHRoaXMubGFyZ2VyUmVzb3VyY2VzQnV0dG9uLmFkZFN0eWxlQ2xhc3MoImhp ZGRlbiIpOworICAgICAgICAgICAgdGhpcy5lbmFibGVUb2dnbGVCdXR0b24udG9nZ2xlZCA9IGZh bHNlOworICAgICAgICAgICAgdGhpcy5sYXJnZXJSZXNvdXJjZXNCdXR0b24udmlzaWJsZSA9IGZh bHNlOwogICAgICAgICAgICAgdGhpcy5zb3J0aW5nU2VsZWN0RWxlbWVudC5hZGRTdHlsZUNsYXNz KCJoaWRkZW4iKTsKICAgICAgICAgICAgIHRoaXMucGFuZWxFbmFibGVyVmlldy52aXNpYmxlID0g dHJ1ZTsKICAgICAgICAgfQpAQCAtMTA3NiwxMiArMTA3MywxMiBAQCBXZWJJbnNwZWN0b3IuUmVz b3VyY2VzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICBpZiAodGhpcy5yZXNvdXJjZXNUcmVl RWxlbWVudC5zbWFsbENoaWxkcmVuKSB7CiAgICAgICAgICAgICB0aGlzLnJlc291cmNlc0dyYXBo c0VsZW1lbnQuYWRkU3R5bGVDbGFzcygic21hbGwiKTsKICAgICAgICAgICAgIHRoaXMubGFyZ2Vy UmVzb3VyY2VzQnV0dG9uLnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJVc2UgbGFyZ2Ug cmVzb3VyY2Ugcm93cy4iKTsKLSAgICAgICAgICAgIHRoaXMubGFyZ2VyUmVzb3VyY2VzQnV0dG9u LnJlbW92ZVN0eWxlQ2xhc3MoInRvZ2dsZWQtb24iKTsKKyAgICAgICAgICAgIHRoaXMubGFyZ2Vy UmVzb3VyY2VzQnV0dG9uLnRvZ2dsZWQgPSBmYWxzZTsKICAgICAgICAgICAgIHRoaXMuX2FkanVz dFNjcm9sbFBvc2l0aW9uKCk7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICB0aGlzLnJl c291cmNlc0dyYXBoc0VsZW1lbnQucmVtb3ZlU3R5bGVDbGFzcygic21hbGwiKTsKICAgICAgICAg ICAgIHRoaXMubGFyZ2VyUmVzb3VyY2VzQnV0dG9uLnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3Ry aW5nKCJVc2Ugc21hbGwgcmVzb3VyY2Ugcm93cy4iKTsKLSAgICAgICAgICAgIHRoaXMubGFyZ2Vy UmVzb3VyY2VzQnV0dG9uLmFkZFN0eWxlQ2xhc3MoInRvZ2dsZWQtb24iKTsKKyAgICAgICAgICAg IHRoaXMubGFyZ2VyUmVzb3VyY2VzQnV0dG9uLnRvZ2dsZWQgPSB0cnVlOwogICAgICAgICB9CiAg ICAgfSwKIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQ YW5lbC5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKaW5k ZXggMDA1ODM3NC4uNjliMjFmMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1NjcmlwdHNQYW5lbC5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2Ny aXB0c1BhbmVsLmpzCkBAIC0xNTEsMTMgKzE1MSwxMCBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1Bh bmVsID0gZnVuY3Rpb24oKQogICAgIHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLnNpZGVi YXJFbGVtZW50KTsKICAgICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5zaWRlYmFyUmVz aXplRWxlbWVudCk7CiAKLSAgICB0aGlzLmVuYWJsZVRvZ2dsZUJ1dHRvbiA9IHRoaXMuY3JlYXRl U3RhdHVzQmFyQnV0dG9uKCk7Ci0gICAgdGhpcy5lbmFibGVUb2dnbGVCdXR0b24uY2xhc3NOYW1l ID0gImVuYWJsZS10b2dnbGUtc3RhdHVzLWJhci1pdGVtIHN0YXR1cy1iYXItaXRlbSI7CisgICAg dGhpcy5lbmFibGVUb2dnbGVCdXR0b24gPSBuZXcgV2ViSW5zcGVjdG9yLlN0YXR1c0JhckJ1dHRv bigiIiwgImVuYWJsZS10b2dnbGUtc3RhdHVzLWJhci1pdGVtIik7CiAgICAgdGhpcy5lbmFibGVU b2dnbGVCdXR0b24uYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0aGlzLl90b2dnbGVEZWJ1Z2dp bmcuYmluZCh0aGlzKSwgZmFsc2UpOwogCi0gICAgdGhpcy5wYXVzZU9uRXhjZXB0aW9uQnV0dG9u ID0gdGhpcy5jcmVhdGVTdGF0dXNCYXJCdXR0b24oKTsKLSAgICB0aGlzLnBhdXNlT25FeGNlcHRp b25CdXR0b24uaWQgPSAic2NyaXB0cy1wYXVzZS1vbi1leGNlcHRpb25zLXN0YXR1cy1iYXItaXRl bSI7Ci0gICAgdGhpcy5wYXVzZU9uRXhjZXB0aW9uQnV0dG9uLmNsYXNzTmFtZSA9ICJzdGF0dXMt YmFyLWl0ZW0iOworICAgIHRoaXMucGF1c2VPbkV4Y2VwdGlvbkJ1dHRvbiA9IG5ldyBXZWJJbnNw ZWN0b3IuU3RhdHVzQmFyQnV0dG9uKCIiLCAic2NyaXB0cy1wYXVzZS1vbi1leGNlcHRpb25zLXN0 YXR1cy1iYXItaXRlbSIpOwogICAgIHRoaXMucGF1c2VPbkV4Y2VwdGlvbkJ1dHRvbi5hZGRFdmVu dExpc3RlbmVyKCJjbGljayIsIHRoaXMuX3RvZ2dsZVBhdXNlT25FeGNlcHRpb25zLmJpbmQodGhp cyksIGZhbHNlKTsKIAogICAgIHRoaXMuX2JyZWFrcG9pbnRzVVJMTWFwID0ge307CkBAIC0yMDgs NyArMjA1LDcgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAKICAg ICBnZXQgc3RhdHVzQmFySXRlbXMoKQogICAgIHsKLSAgICAgICAgcmV0dXJuIFt0aGlzLmVuYWJs ZVRvZ2dsZUJ1dHRvbiwgdGhpcy5wYXVzZU9uRXhjZXB0aW9uQnV0dG9uXTsKKyAgICAgICAgcmV0 dXJuIFt0aGlzLmVuYWJsZVRvZ2dsZUJ1dHRvbi5lbGVtZW50LCB0aGlzLnBhdXNlT25FeGNlcHRp b25CdXR0b24uZWxlbWVudF07CiAgICAgfSwKIAogICAgIGdldCBwYXVzZWQoKQpAQCAtNzY0LDEw ICs3NjEsMTAgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAg ewogICAgICAgICBpZiAoSW5zcGVjdG9yQ29udHJvbGxlci5wYXVzZU9uRXhjZXB0aW9ucygpKSB7 CiAgICAgICAgICAgICB0aGlzLnBhdXNlT25FeGNlcHRpb25CdXR0b24udGl0bGUgPSBXZWJJbnNw ZWN0b3IuVUlTdHJpbmcoIkRvbid0IHBhdXNlIG9uIGV4Y2VwdGlvbnMuIik7Ci0gICAgICAgICAg ICB0aGlzLnBhdXNlT25FeGNlcHRpb25CdXR0b24uYWRkU3R5bGVDbGFzcygidG9nZ2xlZC1vbiIp OworICAgICAgICAgICAgdGhpcy5wYXVzZU9uRXhjZXB0aW9uQnV0dG9uLnRvZ2dsZWQgPSB0cnVl OwogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgdGhpcy5wYXVzZU9uRXhjZXB0aW9uQnV0 dG9uLnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJQYXVzZSBvbiBleGNlcHRpb25zLiIp OwotICAgICAgICAgICAgdGhpcy5wYXVzZU9uRXhjZXB0aW9uQnV0dG9uLnJlbW92ZVN0eWxlQ2xh c3MoInRvZ2dsZWQtb24iKTsKKyAgICAgICAgICAgIHRoaXMucGF1c2VPbkV4Y2VwdGlvbkJ1dHRv bi50b2dnbGVkID0gZmFsc2U7CiAgICAgICAgIH0KICAgICB9LAogCkBAIC03NzUsMTMgKzc3Miwx MyBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAg ICAgIGlmIChJbnNwZWN0b3JDb250cm9sbGVyLmRlYnVnZ2VyRW5hYmxlZCgpKSB7CiAgICAgICAg ICAgICB0aGlzLmVuYWJsZVRvZ2dsZUJ1dHRvbi50aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiRGVidWdnaW5nIGVuYWJsZWQuIENsaWNrIHRvIGRpc2FibGUuIik7Ci0gICAgICAgICAgICB0 aGlzLmVuYWJsZVRvZ2dsZUJ1dHRvbi5hZGRTdHlsZUNsYXNzKCJ0b2dnbGVkLW9uIik7Ci0gICAg ICAgICAgICB0aGlzLnBhdXNlT25FeGNlcHRpb25CdXR0b24ucmVtb3ZlU3R5bGVDbGFzcygiaGlk ZGVuIik7CisgICAgICAgICAgICB0aGlzLmVuYWJsZVRvZ2dsZUJ1dHRvbi50b2dnbGVkID0gdHJ1 ZTsKKyAgICAgICAgICAgIHRoaXMucGF1c2VPbkV4Y2VwdGlvbkJ1dHRvbi52aXNpYmxlID0gdHJ1 ZTsKICAgICAgICAgICAgIHRoaXMucGFuZWxFbmFibGVyVmlldy52aXNpYmxlID0gZmFsc2U7CiAg ICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICB0aGlzLmVuYWJsZVRvZ2dsZUJ1dHRvbi50aXRs ZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiRGVidWdnaW5nIGRpc2FibGVkLiBDbGljayB0byBl bmFibGUuIik7Ci0gICAgICAgICAgICB0aGlzLmVuYWJsZVRvZ2dsZUJ1dHRvbi5yZW1vdmVTdHls ZUNsYXNzKCJ0b2dnbGVkLW9uIik7Ci0gICAgICAgICAgICB0aGlzLnBhdXNlT25FeGNlcHRpb25C dXR0b24uYWRkU3R5bGVDbGFzcygiaGlkZGVuIik7CisgICAgICAgICAgICB0aGlzLmVuYWJsZVRv Z2dsZUJ1dHRvbi50b2dnbGVkID0gZmFsc2U7CisgICAgICAgICAgICB0aGlzLnBhdXNlT25FeGNl cHRpb25CdXR0b24udmlzaWJsZSA9IGZhbHNlOwogICAgICAgICAgICAgdGhpcy5wYW5lbEVuYWJs ZXJWaWV3LnZpc2libGUgPSB0cnVlOwogICAgICAgICB9CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9TdGF0dXNCYXJCdXR0b24uanMgYi9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvU3RhdHVzQmFyQnV0dG9uLmpzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IDAwMDAwMDAuLjY0N2ZmMTIKLS0tIC9kZXYvbnVsbAorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvU3RhdHVzQmFyQnV0dG9uLmpzCkBAIC0wLDAgKzEsMTExIEBACisvKgorICogQ29w eXJpZ2h0IChDKSAyMDA5IEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgorICog UmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBv ciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0 aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMgYXJlCisgKiBtZXQ6CisgKgorICogICAgICogUmVkaXN0 cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQK KyAqIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlz Y2xhaW1lci4KKyAqICAgICAqIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJl cHJvZHVjZSB0aGUgYWJvdmUKKyAqIGNvcHlyaWdodCBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25k aXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIKKyAqIGluIHRoZSBkb2N1bWVudGF0 aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUKKyAqIGRpc3RyaWJ1 dGlvbi4KKyAqICAgICAqIE5laXRoZXIgdGhlIG5hbWUgb2YgR29vZ2xlIEluYy4gbm9yIHRoZSBu YW1lcyBvZiBpdHMKKyAqIGNvbnRyaWJ1dG9ycyBtYXkgYmUgdXNlZCB0byBlbmRvcnNlIG9yIHBy b21vdGUgcHJvZHVjdHMgZGVyaXZlZCBmcm9tCisgKiB0aGlzIHNvZnR3YXJlIHdpdGhvdXQgc3Bl Y2lmaWMgcHJpb3Igd3JpdHRlbiBwZXJtaXNzaW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMg UFJPVklERUQgQlkgVEhFIENPUFlSSUdIVCBIT0xERVJTIEFORCBDT05UUklCVVRPUlMKKyAqICJB UyBJUyIgQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBC VVQgTk9UCisgKiBMSU1JVEVEIFRPLCBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5U QUJJTElUWSBBTkQgRklUTkVTUyBGT1IKKyAqIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFSRSBESVND TEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBUSEUgQ09QWVJJR0hUCisgKiBPV05FUiBPUiBDT05U UklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwK KyAqIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJ TkcsIEJVVCBOT1QKKyAqIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09P RFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLAorICogREFUQSwgT1IgUFJPRklUUzsgT1IgQlVT SU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZCisgKiBUSEVPUlkg T0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBU T1JUCisgKiAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFO WSBXQVkgT1VUIE9GIFRIRSBVU0UKKyAqIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNF RCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworV2ViSW5zcGVjdG9y LlN0YXR1c0JhckJ1dHRvbiA9IGZ1bmN0aW9uKHRpdGxlLCBjbGFzc05hbWUpCit7CisgICAgdGhp cy5lbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiYnV0dG9uIik7CisgICAgdGhpcy5l bGVtZW50LnRpdGxlID0gdGl0bGU7CisgICAgdGhpcy5lbGVtZW50LmNsYXNzTmFtZSA9IGNsYXNz TmFtZSArICIgc3RhdHVzLWJhci1pdGVtIjsKKyAgICB0aGlzLmVsZW1lbnQuYWRkRXZlbnRMaXN0 ZW5lcigiY2xpY2siLCB0aGlzLl9jbGlja2VkLmJpbmQodGhpcyksIGZhbHNlKTsKKworICAgIHRo aXMuX3RvZ2dsZWQgPSBmYWxzZTsKKyAgICB0aGlzLl92aXNpYmxlID0gdHJ1ZTsKKworICAgIHRo aXMuZ2x5cGggPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKKyAgICB0aGlzLmdseXBo LmNsYXNzTmFtZSA9ICJnbHlwaCI7CisgICAgdGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKHRoaXMu Z2x5cGgpOworCisgICAgdGhpcy5nbHlwaFNoYWRvdyA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQo ImRpdiIpOworICAgIHRoaXMuZ2x5cGhTaGFkb3cuY2xhc3NOYW1lID0gImdseXBoIHNoYWRvdyI7 CisgICAgdGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuZ2x5cGhTaGFkb3cpOworfQorCitX ZWJJbnNwZWN0b3IuU3RhdHVzQmFyQnV0dG9uLnByb3RvdHlwZSA9IHsKKyAgICBfY2xpY2tlZDog ZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMo ImNsaWNrIik7CisgICAgfSwKKworICAgIGdldCBkaXNhYmxlZCgpCisgICAgeworICAgICAgICBy ZXR1cm4gdGhpcy5lbGVtZW50LmRpc2FibGVkOworICAgIH0sCisKKyAgICBzZXQgZGlzYWJsZWQo eCkKKyAgICB7CisgICAgICAgIHRoaXMuZWxlbWVudC5kaXNhYmxlZCA9IHg7CisgICAgfSwKKwor ICAgIGdldCB0aXRsZSgpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5lbGVtZW50LnRpdGxl OworICAgIH0sCisKKyAgICBzZXQgdGl0bGUodGl0bGUpCisgICAgeworICAgICAgICB0aGlzLmVs ZW1lbnQudGl0bGUgPSB0aXRsZTsKKyAgICB9LAorCisgICAgZ2V0IHRvZ2dsZWQoKQorICAgIHsK KyAgICAgICAgcmV0dXJuIHRoaXMuX3RvZ2dsZWQ7CisgICAgfSwKKworICAgIHNldCB0b2dnbGVk KHgpCisgICAgeworICAgICAgICBpZiAodGhpcy5fdG9nZ2xlZCA9PT0geCkKKyAgICAgICAgICAg IHJldHVybjsKKworICAgICAgICBpZiAoeCkKKyAgICAgICAgICAgIHRoaXMuZWxlbWVudC5hZGRT dHlsZUNsYXNzKCJ0b2dnbGVkLW9uIik7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIHRoaXMu ZWxlbWVudC5yZW1vdmVTdHlsZUNsYXNzKCJ0b2dnbGVkLW9uIik7CisgICAgICAgIHRoaXMuX3Rv Z2dsZWQgPSB4OworICAgIH0sCisKKyAgICBnZXQgdmlzaWJsZSgpCisgICAgeworICAgICAgICBy ZXR1cm4gdGhpcy5fdmlzaWJsZTsKKyAgICB9LAorCisgICAgc2V0IHZpc2libGUoeCkKKyAgICB7 CisgICAgICAgIGlmICh0aGlzLl92aXNpYmxlID09PSB4KQorICAgICAgICAgICAgcmV0dXJuOwor CisgICAgICAgIGlmICh4KQorICAgICAgICAgICAgdGhpcy5lbGVtZW50LnJlbW92ZVN0eWxlQ2xh c3MoImhpZGRlbiIpOworICAgICAgICBlbHNlCisgICAgICAgICAgICB0aGlzLmVsZW1lbnQuYWRk U3R5bGVDbGFzcygiaGlkZGVuIik7CisgICAgICAgIHRoaXMuX3Zpc2libGUgPSB4OworICAgIH0K K30KKworV2ViSW5zcGVjdG9yLlN0YXR1c0JhckJ1dHRvbi5wcm90b3R5cGUuX19wcm90b19fID0g V2ViSW5zcGVjdG9yLk9iamVjdC5wcm90b3R5cGU7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvV2ViS2l0LnFyYyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9X ZWJLaXQucXJjCmluZGV4IGMzOWM5NWIuLjdiYTIzZDkgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9XZWJLaXQucXJjCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9XZWJLaXQucXJjCkBAIC01MCw2ICs1MCw3IEBACiAgICAgPGZpbGU+U2lkZWJhclRyZWVF bGVtZW50LmpzPC9maWxlPgogICAgIDxmaWxlPlNvdXJjZUZyYW1lLmpzPC9maWxlPgogICAgIDxm aWxlPlNvdXJjZVZpZXcuanM8L2ZpbGU+CisgICAgPGZpbGU+U3RhdHVzQmFyQnV0dG9uLmpzPC9m aWxlPgogICAgIDxmaWxlPlN0eWxlc1NpZGViYXJQYW5lLmpzPC9maWxlPgogICAgIDxmaWxlPlRl eHRQcm9tcHQuanM8L2ZpbGU+CiAgICAgPGZpbGU+VG9wRG93blByb2ZpbGVEYXRhR3JpZFRyZWUu anM8L2ZpbGU+CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVj dG9yLmNzcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuY3NzCmluZGV4 IDUxZDYyNmEuLjI2MDgyNjAgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9pbnNwZWN0b3IuY3NzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0 b3IuY3NzCkBAIC0yMDkxLDcgKzIwOTEsNyBAQCBidXR0b24uZW5hYmxlLXRvZ2dsZS1zdGF0dXMt YmFyLWl0ZW0udG9nZ2xlZC1vbiAuZ2x5cGggewogICAgIC13ZWJraXQtbWFzay1pbWFnZTogdXJs KEltYWdlcy9lbmFibGVTb2xpZEJ1dHRvbkdseXBoLnBuZyk7CiB9CiAKLSNzY3JpcHRzLXBhdXNl LW9uLWV4Y2VwdGlvbnMtc3RhdHVzLWJhci1pdGVtIC5nbHlwaCB7Cisuc2NyaXB0cy1wYXVzZS1v bi1leGNlcHRpb25zLXN0YXR1cy1iYXItaXRlbSAuZ2x5cGggewogICAgIC13ZWJraXQtbWFzay1p bWFnZTogdXJsKEltYWdlcy9wYXVzZU9uRXhjZXB0aW9uQnV0dG9uR2x5cGgucG5nKTsKIH0KIApA QCAtMjIwOSw3ICsyMjA5LDcgQEAgYnV0dG9uLmVuYWJsZS10b2dnbGUtc3RhdHVzLWJhci1pdGVt LnRvZ2dsZWQtb24gLmdseXBoIHsKICAgICBvdmVyZmxvdzogYXV0bzsKIH0KIAotI3Jlc291cmNl cy1sYXJnZXItcmVzb3VyY2VzLXN0YXR1cy1iYXItaXRlbSAuZ2x5cGggeworLnJlc291cmNlcy1s YXJnZXItcmVzb3VyY2VzLXN0YXR1cy1iYXItaXRlbSAuZ2x5cGggewogICAgIC13ZWJraXQtbWFz ay1pbWFnZTogdXJsKEltYWdlcy9sYXJnZXJSZXNvdXJjZXNCdXR0b25HbHlwaC5wbmcpOwogfQog CkBAIC0zMDkzLDE2ICszMDkzLDE2IEBAIGJvZHkuaW5hY3RpdmUgLnNpZGViYXItdHJlZS1pdGVt LnNlbGVjdGVkIC5idWJibGUuc2VhcmNoLW1hdGNoZXMgewogYnV0dG9uLmVuYWJsZS10b2dnbGUt c3RhdHVzLWJhci1pdGVtIC5nbHlwaCB7CiB9CiAKLSNyZWNvcmQtcHJvZmlsZS1zdGF0dXMtYmFy LWl0ZW0gLmdseXBoIHsKKy5yZWNvcmQtcHJvZmlsZS1zdGF0dXMtYmFyLWl0ZW0gLmdseXBoIHsK ICAgICAtd2Via2l0LW1hc2staW1hZ2U6IHVybChJbWFnZXMvcmVjb3JkQnV0dG9uR2x5cGgucG5n KTsKIH0KIAotI3JlY29yZC1wcm9maWxlLXN0YXR1cy1iYXItaXRlbS50b2dnbGVkLW9uIC5nbHlw aCB7CisucmVjb3JkLXByb2ZpbGUtc3RhdHVzLWJhci1pdGVtLnRvZ2dsZWQtb24gLmdseXBoIHsK ICAgICAtd2Via2l0LW1hc2staW1hZ2U6IHVybChJbWFnZXMvcmVjb3JkVG9nZ2xlZEJ1dHRvbkds eXBoLnBuZyk7Ci0gICAgYmFja2dyb3VuZC1jb2xvcjogcmdiKDIxNiwgMCwgMCk7CisgICAgYmFj a2dyb3VuZC1jb2xvcjogcmdiKDIxNiwgMCwgMCkgIWltcG9ydGFudDsKIH0KIAotI25vZGUtc2Vh cmNoLXN0YXR1cy1iYXItaXRlbSAuZ2x5cGggeworLm5vZGUtc2VhcmNoLXN0YXR1cy1iYXItaXRl bSAuZ2x5cGggewogICAgIC13ZWJraXQtbWFzay1pbWFnZTogdXJsKEltYWdlcy9ub2RlU2VhcmNo QnV0dG9uR2x5cGgucG5nKTsKIH0KIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL2luc3BlY3Rvci5odG1sIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3Bl Y3Rvci5odG1sCmluZGV4IGEzZGM0MDcuLjVhNDQ0M2MgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuaHRtbAorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvaW5zcGVjdG9yLmh0bWwKQEAgLTY2LDYgKzY2LDcgQEAgVEhJUyBTT0ZUV0FSRSwg RVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICAgICA8 c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIgc3JjPSJTdHlsZXNTaWRlYmFyUGFuZS5qcyI+ PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iUGFuZWwu anMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBzcmM9IlBh bmVsRW5hYmxlclZpZXcuanMiPjwvc2NyaXB0PgorICAgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZh c2NyaXB0IiBzcmM9IlN0YXR1c0JhckJ1dHRvbi5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCB0 eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iRWxlbWVudHNQYW5lbC5qcyI+PC9zY3JpcHQ+CiAg ICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iUmVzb3VyY2VzUGFuZWwuanMi Pjwvc2NyaXB0PgogICAgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBzcmM9IlNjcmlw dHNQYW5lbC5qcyI+PC9zY3JpcHQ+Cg== 34723 2009-08-13 02:13:05 -0700 2009-08-13 02:21:05 -0700 Storage view also converted to use StatusBarButton, fixed Reload button css to support glyph. fix-profiler-buttons-patch text/plain 34591 mnaganov ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NThlZjMzZC4uOGUyMDc2MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSw2NiBAQAorMjAwOS0wOC0xMyAgTWlraGFpbCBOYWdh bm92ICA8bW5hZ2Fub3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEludHJvZHVjZWQgU3RhdHVzQmFyQnV0dG9uIGNsYXNzIHRo YXQgZW5jYXBzdWxhdGVzIGdseXBocyBzdXBwb3J0LgorICAgICAgICBWaWV3cyB1cGRhdGVkIGFj Y29yZGluZ2x5LgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yODE3NAorCisgICAgICAgICogV2ViQ29yZS5neXBpOgorICAgICAgICAqIFdlYkNvcmUu dmNwcm9qL1dlYkNvcmUudmNwcm9qOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQ29v a2llSXRlbXNWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvb2tpZUl0ZW1zVmlldyk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29va2llSXRlbXNWaWV3LnByb3RvdHlwZS5nZXQgc3Rh dHVzQmFySXRlbXMpOiBVcGRhdGVkIHRvIHJldHJpZXZlIERPTSBlbGVtZW50IGZyb20gU3RhdHVz QmFyQnV0dG9uIGluc3RhbmNlIChoZXJlIGFuZCBpbiBzaW1pbGFyIGdldHRlcnMgYmVsb3cuKQor ICAgICAgICAoV2ViSW5zcGVjdG9yLkNvb2tpZUl0ZW1zVmlldy5wcm90b3R5cGUuaGlkZSk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuQ29va2llSXRlbXNWaWV3LnByb3RvdHlwZS51cGRhdGUpOgor ICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRE9NU3RvcmFnZUl0ZW1zVmlldy5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5ET01TdG9yYWdlSXRlbXNWaWV3KToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5ET01TdG9yYWdlSXRlbXNWaWV3LnByb3RvdHlwZS5nZXQgc3RhdHVzQmFySXRlbXMp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTVN0b3JhZ2VJdGVtc1ZpZXcucHJvdG90eXBlLmhp ZGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTVN0b3JhZ2VJdGVtc1ZpZXcucHJvdG90eXBl LnVwZGF0ZSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1BhbmVsLmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkVsZW1lbnRzUGFuZWwpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkVsZW1lbnRzUGFuZWwucHJvdG90eXBlLmdldCBzdGF0dXNCYXJJdGVtcyk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuRWxlbWVudHNQYW5lbC5wcm90b3R5cGUuaGlkZSk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuRWxlbWVudHNQYW5lbC5wcm90b3R5cGUuX25vZGVTZWFyY2hCdXR0b25D bGlja2VkKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1BhbmVsLmpzOgorICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZVZpZXcuanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuUHJvZmlsZVZpZXcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlByb2ZpbGVWaWV3LnBy b3RvdHlwZS5nZXQgc3RhdHVzQmFySXRlbXMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlByb2Zp bGVWaWV3LnByb3RvdHlwZS5fdXBkYXRlUGVyY2VudEJ1dHRvbik6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuUHJvZmlsZVZpZXcucHJvdG90eXBlLl9mb2N1c0NsaWNrZWQpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlByb2ZpbGVWaWV3LnByb3RvdHlwZS5fZXhjbHVkZUNsaWNrZWQpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlByb2ZpbGVWaWV3LnByb3RvdHlwZS5fcmVzZXRDbGlja2VkKToKKyAg ICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVzUGFuZWwuanM6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuUHJvZmlsZXNQYW5lbCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUHJvZmls ZXNQYW5lbC5wcm90b3R5cGUuZ2V0IHN0YXR1c0Jhckl0ZW1zKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5Qcm9maWxlc1BhbmVsLnByb3RvdHlwZS5zZXRSZWNvcmRpbmdQcm9maWxlKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5Qcm9maWxlc1BhbmVsLnByb3RvdHlwZS5fdXBkYXRlSW50ZXJmYWNl KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsLnByb3RvdHlwZS5nZXQgc3RhdHVzQmFy SXRlbXMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsLnByb3RvdHlwZS5y ZXNldCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlLl90 b2dnbGVMYXJnZXJSZXNvdXJjZXMpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU2Ny aXB0c1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbCk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5nZXQgc3RhdHVzQmFySXRl bXMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuX3VwZGF0 ZVBhdXNlT25FeGNlcHRpb25zQnV0dG9uKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRz UGFuZWwucHJvdG90eXBlLl91cGRhdGVEZWJ1Z2dlckJ1dHRvbnMpOgorICAgICAgICAqIGluc3Bl Y3Rvci9mcm9udC1lbmQvU3RhdHVzQmFyQnV0dG9uLmpzOiBBZGRlZC4KKyAgICAgICAgKFdlYklu c3BlY3Rvci5TdGF0dXNCYXJCdXR0b24pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0YXR1c0Jh ckJ1dHRvbi5wcm90b3R5cGUuX2NsaWNrZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0YXR1 c0JhckJ1dHRvbi5wcm90b3R5cGUuZ2V0IGRpc2FibGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5TdGF0dXNCYXJCdXR0b24ucHJvdG90eXBlLnNldCBkaXNhYmxlZCk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuU3RhdHVzQmFyQnV0dG9uLnByb3RvdHlwZS5nZXQgdGl0bGUpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlN0YXR1c0JhckJ1dHRvbi5wcm90b3R5cGUuc2V0IHRpdGxlKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5TdGF0dXNCYXJCdXR0b24ucHJvdG90eXBlLmdldCB0b2dnbGVkKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5TdGF0dXNCYXJCdXR0b24ucHJvdG90eXBlLnNldCB0b2dn bGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdGF0dXNCYXJCdXR0b24ucHJvdG90eXBlLmdl dCB2aXNpYmxlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdGF0dXNCYXJCdXR0b24ucHJvdG90 eXBlLnNldCB2aXNpYmxlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1dlYktpdC5x cmM6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuY3NzOiBGb3IgdW5p Zm9ybWl0eSwgY2xhc3MgbmFtZXMgYXJlIGFsd2F5cyB1c2VkIHRvIGlkZW50aWZ5IHN0YXR1cyBi YXIgYnV0dG9ucy4gQWxzbywgZml4ZWQgIlJlbG9hZCIgYnV0dG9uIHN0eWxlIHRvIHVzZSBnbHlw aHMuCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuaHRtbDoKKwogMjAw OS0wOC0xMiAgSm9zZXBoIFBlY29yYXJvICA8am9lcGVjazAyQGdtYWlsLmNvbT4KIAogICAgICAg ICBSZXZpZXdlZCBieSBUaW1vdGh5IEhhdGNoZXIuCmRpZmYgLS1naXQgYS9XZWJDb3JlL1dlYkNv cmUuZ3lwaSBiL1dlYkNvcmUvV2ViQ29yZS5neXBpCmluZGV4IDVlNTBiMDIuLmFkNjYxZjcgMTAw NjQ0Ci0tLSBhL1dlYkNvcmUvV2ViQ29yZS5neXBpCisrKyBiL1dlYkNvcmUvV2ViQ29yZS5neXBp CkBAIC0zNDY4LDYgKzM0NjgsNyBAQAogICAgICAgICAgICAgJ2luc3BlY3Rvci9mcm9udC1lbmQv U2lkZWJhclRyZWVFbGVtZW50LmpzJywKICAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5k L1NvdXJjZUZyYW1lLmpzJywKICAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJj ZVZpZXcuanMnLAorICAgICAgICAgICAgJ2luc3BlY3Rvci9mcm9udC1lbmQvU3RhdHVzQmFyQnV0 dG9uLmpzJywKICAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQ YW5lLmpzJywKICAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRQcm9tcHQuanMn LAogICAgICAgICAgICAgJ2luc3BlY3Rvci9mcm9udC1lbmQvVG9wRG93blByb2ZpbGVEYXRhR3Jp ZFRyZWUuanMnLApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9XZWJDb3JlLnZjcHJvai9XZWJDb3JlLnZj cHJvaiBiL1dlYkNvcmUvV2ViQ29yZS52Y3Byb2ovV2ViQ29yZS52Y3Byb2oKaW5kZXggN2ViOTYy Zi4uNzRlMTZjMiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9XZWJDb3JlLnZjcHJvai9XZWJDb3JlLnZj cHJvagorKysgYi9XZWJDb3JlL1dlYkNvcmUudmNwcm9qL1dlYkNvcmUudmNwcm9qCkBAIC0zMTIz MSw2ICszMTIzMSwxMCBAQAogCQkJCQk+DQogCQkJCTwvRmlsZT4NCiAJCQkJPEZpbGUNCisJCQkJ CVJlbGF0aXZlUGF0aD0iLi5caW5zcGVjdG9yXGZyb250LWVuZFxTdGF0dXNCYXJCdXR0b24uanMi DQorCQkJCQk+DQorCQkJCTwvRmlsZT4NCisJCQkJPEZpbGUNCiAJCQkJCVJlbGF0aXZlUGF0aD0i Li5caW5zcGVjdG9yXGZyb250LWVuZFxTdHlsZXNTaWRlYmFyUGFuZS5qcyINCiAJCQkJCT4NCiAJ CQkJPC9GaWxlPg0KZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db29r aWVJdGVtc1ZpZXcuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29va2llSXRlbXNW aWV3LmpzCmluZGV4IDQyZDIzNTEuLjYzMTBhNWEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9Db29raWVJdGVtc1ZpZXcuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0Nvb2tpZUl0ZW1zVmlldy5qcwpAQCAtMzQsMjEgKzM0LDE4IEBAIFdlYkluc3Bl Y3Rvci5Db29raWVJdGVtc1ZpZXcgPSBmdW5jdGlvbigpCiAgICAgdGhpcy5lbGVtZW50LmFkZFN0 eWxlQ2xhc3MoInN0b3JhZ2UtdmlldyIpOwogICAgIHRoaXMuZWxlbWVudC5hZGRTdHlsZUNsYXNz KCJ0YWJsZSIpOwogCi0gICAgdGhpcy5kZWxldGVCdXR0b24gPSBkb2N1bWVudC5jcmVhdGVFbGVt ZW50KCJidXR0b24iKTsKLSAgICB0aGlzLmRlbGV0ZUJ1dHRvbi50aXRsZSA9IFdlYkluc3BlY3Rv ci5VSVN0cmluZygiRGVsZXRlIik7Ci0gICAgdGhpcy5kZWxldGVCdXR0b24uY2xhc3NOYW1lID0g ImRlbGV0ZS1zdG9yYWdlLXN0YXR1cy1iYXItaXRlbSBzdGF0dXMtYmFyLWl0ZW0gaGlkZGVuIjsK KyAgICB0aGlzLmRlbGV0ZUJ1dHRvbiA9IG5ldyBXZWJJbnNwZWN0b3IuU3RhdHVzQmFyQnV0dG9u KFdlYkluc3BlY3Rvci5VSVN0cmluZygiRGVsZXRlIiksICJkZWxldGUtc3RvcmFnZS1zdGF0dXMt YmFyLWl0ZW0iKTsKKyAgICB0aGlzLmRlbGV0ZUJ1dHRvbi52aXNpYmxlID0gZmFsc2U7CiAgICAg dGhpcy5kZWxldGVCdXR0b24uYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0aGlzLl9kZWxldGVC dXR0b25DbGlja2VkLmJpbmQodGhpcyksIGZhbHNlKTsKIAotICAgIHRoaXMucmVmcmVzaEJ1dHRv biA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImJ1dHRvbiIpOwotICAgIHRoaXMucmVmcmVzaEJ1 dHRvbi50aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiUmVmcmVzaCIpOwotICAgIHRoaXMu cmVmcmVzaEJ1dHRvbi5jbGFzc05hbWUgPSAicmVmcmVzaC1zdG9yYWdlLXN0YXR1cy1iYXItaXRl bSBzdGF0dXMtYmFyLWl0ZW0iOworICAgIHRoaXMucmVmcmVzaEJ1dHRvbiA9IG5ldyBXZWJJbnNw ZWN0b3IuU3RhdHVzQmFyQnV0dG9uKFdlYkluc3BlY3Rvci5VSVN0cmluZygiUmVmcmVzaCIpLCAi cmVmcmVzaC1zdG9yYWdlLXN0YXR1cy1iYXItaXRlbSIpOwogICAgIHRoaXMucmVmcmVzaEJ1dHRv bi5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuX3JlZnJlc2hCdXR0b25DbGlja2VkLmJp bmQodGhpcyksIGZhbHNlKTsKIH0KIAogV2ViSW5zcGVjdG9yLkNvb2tpZUl0ZW1zVmlldy5wcm90 b3R5cGUgPSB7CiAgICAgZ2V0IHN0YXR1c0Jhckl0ZW1zKCkKICAgICB7Ci0gICAgICAgIHJldHVy biBbdGhpcy5yZWZyZXNoQnV0dG9uLCB0aGlzLmRlbGV0ZUJ1dHRvbl07CisgICAgICAgIHJldHVy biBbdGhpcy5yZWZyZXNoQnV0dG9uLmVsZW1lbnQsIHRoaXMuZGVsZXRlQnV0dG9uLmVsZW1lbnRd OwogICAgIH0sCiAKICAgICBzaG93OiBmdW5jdGlvbihwYXJlbnRFbGVtZW50KQpAQCAtNjAsNyAr NTcsNyBAQCBXZWJJbnNwZWN0b3IuQ29va2llSXRlbXNWaWV3LnByb3RvdHlwZSA9IHsKICAgICBo aWRlOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICBXZWJJbnNwZWN0b3IuVmlldy5wcm90b3R5 cGUuaGlkZS5jYWxsKHRoaXMpOwotICAgICAgICB0aGlzLmRlbGV0ZUJ1dHRvbi5hZGRTdHlsZUNs YXNzKCJoaWRkZW4iKTsKKyAgICAgICAgdGhpcy5kZWxldGVCdXR0b24udmlzaWJsZSA9IGZhbHNl OwogICAgIH0sCiAKICAgICB1cGRhdGU6IGZ1bmN0aW9uKCkKQEAgLTcwLDE0ICs2NywxNCBAQCBX ZWJJbnNwZWN0b3IuQ29va2llSXRlbXNWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKGRh dGFHcmlkKSB7CiAgICAgICAgICAgICB0aGlzLl9kYXRhR3JpZCA9IGRhdGFHcmlkOwogICAgICAg ICAgICAgdGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKGRhdGFHcmlkLmVsZW1lbnQpOwotICAgICAg ICAgICAgdGhpcy5kZWxldGVCdXR0b24ucmVtb3ZlU3R5bGVDbGFzcygiaGlkZGVuIik7CisgICAg ICAgICAgICB0aGlzLmRlbGV0ZUJ1dHRvbi52aXNpYmxlID0gZmFsc2U7CiAgICAgICAgIH0gZWxz ZSB7CiAgICAgICAgICAgICB2YXIgZW1wdHlNc2dFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxl bWVudCgiZGl2Iik7CiAgICAgICAgICAgICBlbXB0eU1zZ0VsZW1lbnQuY2xhc3NOYW1lID0gInN0 b3JhZ2UtdGFibGUtZW1wdHkiOwogICAgICAgICAgICAgZW1wdHlNc2dFbGVtZW50LnRleHRDb250 ZW50ID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJUaGlzIHNpdGUgaGFzIG5vIGNvb2tpZXMuIik7 CiAgICAgICAgICAgICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQoZW1wdHlNc2dFbGVtZW50KTsK ICAgICAgICAgICAgIHRoaXMuX2RhdGFHcmlkID0gbnVsbDsKLSAgICAgICAgICAgIHRoaXMuZGVs ZXRlQnV0dG9uLmFkZFN0eWxlQ2xhc3MoImhpZGRlbiIpOworICAgICAgICAgICAgdGhpcy5kZWxl dGVCdXR0b24udmlzaWJsZSA9IGZhbHNlOwogICAgICAgICB9CiAgICAgfSwKIApkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RPTVN0b3JhZ2VJdGVtc1ZpZXcuanMgYi9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRE9NU3RvcmFnZUl0ZW1zVmlldy5qcwppbmRleCBm YWQ2ZTNjLi41MTQ4ODNmIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv RE9NU3RvcmFnZUl0ZW1zVmlldy5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv RE9NU3RvcmFnZUl0ZW1zVmlldy5qcwpAQCAtMzIsMjEgKzMyLDE4IEBAIFdlYkluc3BlY3Rvci5E T01TdG9yYWdlSXRlbXNWaWV3ID0gZnVuY3Rpb24oZG9tU3RvcmFnZSkKICAgICB0aGlzLmVsZW1l bnQuYWRkU3R5bGVDbGFzcygic3RvcmFnZS12aWV3Iik7CiAgICAgdGhpcy5lbGVtZW50LmFkZFN0 eWxlQ2xhc3MoInRhYmxlIik7CiAKLSAgICB0aGlzLmRlbGV0ZUJ1dHRvbiA9IGRvY3VtZW50LmNy ZWF0ZUVsZW1lbnQoImJ1dHRvbiIpOwotICAgIHRoaXMuZGVsZXRlQnV0dG9uLnRpdGxlID0gV2Vi SW5zcGVjdG9yLlVJU3RyaW5nKCJEZWxldGUiKTsKLSAgICB0aGlzLmRlbGV0ZUJ1dHRvbi5jbGFz c05hbWUgPSAiZGVsZXRlLXN0b3JhZ2Utc3RhdHVzLWJhci1pdGVtIHN0YXR1cy1iYXItaXRlbSBo aWRkZW4iOworICAgIHRoaXMuZGVsZXRlQnV0dG9uID0gbmV3IFdlYkluc3BlY3Rvci5TdGF0dXNC YXJCdXR0b24oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJEZWxldGUiKSwgImRlbGV0ZS1zdG9yYWdl LXN0YXR1cy1iYXItaXRlbSIpOworICAgIHRoaXMuZGVsZXRlQnV0dG9uLnZpc2libGUgPSBmYWxz ZTsKICAgICB0aGlzLmRlbGV0ZUJ1dHRvbi5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMu X2RlbGV0ZUJ1dHRvbkNsaWNrZWQuYmluZCh0aGlzKSwgZmFsc2UpOwogCi0gICAgdGhpcy5yZWZy ZXNoQnV0dG9uID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiYnV0dG9uIik7Ci0gICAgdGhpcy5y ZWZyZXNoQnV0dG9uLnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJSZWZyZXNoIik7Ci0g ICAgdGhpcy5yZWZyZXNoQnV0dG9uLmNsYXNzTmFtZSA9ICJyZWZyZXNoLXN0b3JhZ2Utc3RhdHVz LWJhci1pdGVtIHN0YXR1cy1iYXItaXRlbSI7CisgICAgdGhpcy5yZWZyZXNoQnV0dG9uID0gbmV3 IFdlYkluc3BlY3Rvci5TdGF0dXNCYXJCdXR0b24oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJSZWZy ZXNoIiksICJyZWZyZXNoLXN0b3JhZ2Utc3RhdHVzLWJhci1pdGVtIik7CiAgICAgdGhpcy5yZWZy ZXNoQnV0dG9uLmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5fcmVmcmVzaEJ1dHRvbkNs aWNrZWQuYmluZCh0aGlzKSwgZmFsc2UpOwogfQogCiBXZWJJbnNwZWN0b3IuRE9NU3RvcmFnZUl0 ZW1zVmlldy5wcm90b3R5cGUgPSB7CiAgICAgZ2V0IHN0YXR1c0Jhckl0ZW1zKCkKICAgICB7Ci0g ICAgICAgIHJldHVybiBbdGhpcy5yZWZyZXNoQnV0dG9uLCB0aGlzLmRlbGV0ZUJ1dHRvbl07Cisg ICAgICAgIHJldHVybiBbdGhpcy5yZWZyZXNoQnV0dG9uLmVsZW1lbnQsIHRoaXMuZGVsZXRlQnV0 dG9uLmVsZW1lbnRdOwogICAgIH0sCiAKICAgICBzaG93OiBmdW5jdGlvbihwYXJlbnRFbGVtZW50 KQpAQCAtNTgsNyArNTUsNyBAQCBXZWJJbnNwZWN0b3IuRE9NU3RvcmFnZUl0ZW1zVmlldy5wcm90 b3R5cGUgPSB7CiAgICAgaGlkZTogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgV2ViSW5zcGVj dG9yLlZpZXcucHJvdG90eXBlLmhpZGUuY2FsbCh0aGlzKTsKLSAgICAgICAgdGhpcy5kZWxldGVC dXR0b24uYWRkU3R5bGVDbGFzcygiaGlkZGVuIik7CisgICAgICAgIHRoaXMuZGVsZXRlQnV0dG9u LnZpc2libGUgPSBmYWxzZTsKICAgICB9LAogCiAgICAgdXBkYXRlOiBmdW5jdGlvbigpCkBAIC03 Niw3ICs3Myw3IEBAIFdlYkluc3BlY3Rvci5ET01TdG9yYWdlSXRlbXNWaWV3LnByb3RvdHlwZSA9 IHsKICAgICAgICAgICAgICAgICB0aGlzLl9kYXRhR3JpZCA9IGRhdGFHcmlkOwogICAgICAgICAg ICAgICAgIHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZChkYXRhR3JpZC5lbGVtZW50KTsKICAgICAg ICAgICAgICAgICB0aGlzLl9kYXRhR3JpZC51cGRhdGVXaWR0aHMoKTsKLSAgICAgICAgICAgICAg ICB0aGlzLmRlbGV0ZUJ1dHRvbi5yZW1vdmVTdHlsZUNsYXNzKCJoaWRkZW4iKTsKKyAgICAgICAg ICAgICAgICB0aGlzLmRlbGV0ZUJ1dHRvbi52aXNpYmxlID0gdHJ1ZTsKICAgICAgICAgICAgIH0K ICAgICAgICAgfQogCkBAIC04Nyw3ICs4NCw3IEBAIFdlYkluc3BlY3Rvci5ET01TdG9yYWdlSXRl bXNWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIGVtcHR5TXNnRWxlbWVudC50ZXh0Q29u dGVudCA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiVGhpcyBzdG9yYWdlIGlzIGVtcHR5LiIpOwog ICAgICAgICAgICAgdGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKGVtcHR5TXNnRWxlbWVudCk7CiAg ICAgICAgICAgICB0aGlzLl9kYXRhR3JpZCA9IG51bGw7Ci0gICAgICAgICAgICB0aGlzLmRlbGV0 ZUJ1dHRvbi5hZGRTdHlsZUNsYXNzKCJoaWRkZW4iKTsKKyAgICAgICAgICAgIHRoaXMuZGVsZXRl QnV0dG9uLnZpc2libGUgPSBmYWxzZTsKICAgICAgICAgfQogICAgIH0sCiAgICAgCmRpZmYgLS1n aXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNQYW5lbC5qcyBiL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1BhbmVsLmpzCmluZGV4IGZmYTAwMDAuLjk5 ZjYwN2YgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1Bh bmVsLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1BhbmVsLmpz CkBAIC05NywxMCArOTcsNyBAQCBXZWJJbnNwZWN0b3IuRWxlbWVudHNQYW5lbCA9IGZ1bmN0aW9u KCkKICAgICB0aGlzLnNpZGViYXJSZXNpemVFbGVtZW50LmNsYXNzTmFtZSA9ICJzaWRlYmFyLXJl c2l6ZXItdmVydGljYWwiOwogICAgIHRoaXMuc2lkZWJhclJlc2l6ZUVsZW1lbnQuYWRkRXZlbnRM aXN0ZW5lcigibW91c2Vkb3duIiwgdGhpcy5yaWdodFNpZGViYXJSZXNpemVyRHJhZ1N0YXJ0LmJp bmQodGhpcyksIGZhbHNlKTsKIAotICAgIHRoaXMubm9kZVNlYXJjaEJ1dHRvbiA9IHRoaXMuY3Jl YXRlU3RhdHVzQmFyQnV0dG9uKCk7Ci0gICAgdGhpcy5ub2RlU2VhcmNoQnV0dG9uLnRpdGxlID0g V2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTZWxlY3QgYW4gZWxlbWVudCBpbiB0aGUgcGFnZSB0byBp bnNwZWN0IGl0LiIpOwotICAgIHRoaXMubm9kZVNlYXJjaEJ1dHRvbi5pZCA9ICJub2RlLXNlYXJj aC1zdGF0dXMtYmFyLWl0ZW0iOwotICAgIHRoaXMubm9kZVNlYXJjaEJ1dHRvbi5jbGFzc05hbWUg PSAic3RhdHVzLWJhci1pdGVtIjsKKyAgICB0aGlzLm5vZGVTZWFyY2hCdXR0b24gPSBuZXcgV2Vi SW5zcGVjdG9yLlN0YXR1c0JhckJ1dHRvbihXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNlbGVjdCBh biBlbGVtZW50IGluIHRoZSBwYWdlIHRvIGluc3BlY3QgaXQuIiksICJub2RlLXNlYXJjaC1zdGF0 dXMtYmFyLWl0ZW0iKTsKICAgICB0aGlzLm5vZGVTZWFyY2hCdXR0b24uYWRkRXZlbnRMaXN0ZW5l cigiY2xpY2siLCB0aGlzLl9ub2RlU2VhcmNoQnV0dG9uQ2xpY2tlZC5iaW5kKHRoaXMpLCBmYWxz ZSk7CiAKICAgICB0aGlzLnNlYXJjaGluZ0Zvck5vZGUgPSBmYWxzZTsKQEAgLTEzMCw3ICsxMjcs NyBAQCBXZWJJbnNwZWN0b3IuRWxlbWVudHNQYW5lbC5wcm90b3R5cGUgPSB7CiAKICAgICBnZXQg c3RhdHVzQmFySXRlbXMoKQogICAgIHsKLSAgICAgICAgcmV0dXJuIFt0aGlzLm5vZGVTZWFyY2hC dXR0b24sIHRoaXMuY3J1bWJzRWxlbWVudF07CisgICAgICAgIHJldHVybiBbdGhpcy5ub2RlU2Vh cmNoQnV0dG9uLmVsZW1lbnQsIHRoaXMuY3J1bWJzRWxlbWVudF07CiAgICAgfSwKIAogICAgIHVw ZGF0ZVN0YXR1c0Jhckl0ZW1zOiBmdW5jdGlvbigpCkBAIC0xNTYsNyArMTUzLDcgQEAgV2ViSW5z cGVjdG9yLkVsZW1lbnRzUGFuZWwucHJvdG90eXBlID0gewogCiAgICAgICAgIGlmIChJbnNwZWN0 b3JDb250cm9sbGVyLnNlYXJjaGluZ0Zvck5vZGUoKSkgewogICAgICAgICAgICAgSW5zcGVjdG9y Q29udHJvbGxlci50b2dnbGVOb2RlU2VhcmNoKCk7Ci0gICAgICAgICAgICB0aGlzLm5vZGVTZWFy Y2hCdXR0b24ucmVtb3ZlU3R5bGVDbGFzcygidG9nZ2xlZC1vbiIpOworICAgICAgICAgICAgdGhp cy5ub2RlU2VhcmNoQnV0dG9uLnRvZ2dsZWQgPSBmYWxzZTsKICAgICAgICAgfQogICAgIH0sCiAK QEAgLTE3NSw3ICsxNzIsNyBAQCBXZWJJbnNwZWN0b3IuRWxlbWVudHNQYW5lbC5wcm90b3R5cGUg PSB7CiAKICAgICAgICAgaWYgKEluc3BlY3RvckNvbnRyb2xsZXIuc2VhcmNoaW5nRm9yTm9kZSgp KSB7CiAgICAgICAgICAgICBJbnNwZWN0b3JDb250cm9sbGVyLnRvZ2dsZU5vZGVTZWFyY2goKTsK LSAgICAgICAgICAgIHRoaXMubm9kZVNlYXJjaEJ1dHRvbi5yZW1vdmVTdHlsZUNsYXNzKCJ0b2dn bGVkLW9uIik7CisgICAgICAgICAgICB0aGlzLm5vZGVTZWFyY2hCdXR0b24udG9nZ2xlZCA9IGZh bHNlOwogICAgICAgICB9CiAKICAgICAgICAgdGhpcy5yZWNlbnRseU1vZGlmaWVkTm9kZXMgPSBb XTsKQEAgLTEzMTYsMTAgKzEzMTMsNyBAQCBXZWJJbnNwZWN0b3IuRWxlbWVudHNQYW5lbC5wcm90 b3R5cGUgPSB7CiAgICAgewogICAgICAgICBJbnNwZWN0b3JDb250cm9sbGVyLnRvZ2dsZU5vZGVT ZWFyY2goKTsKIAotICAgICAgICBpZiAoSW5zcGVjdG9yQ29udHJvbGxlci5zZWFyY2hpbmdGb3JO b2RlKCkpCi0gICAgICAgICAgICB0aGlzLm5vZGVTZWFyY2hCdXR0b24uYWRkU3R5bGVDbGFzcygi dG9nZ2xlZC1vbiIpOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICB0aGlzLm5vZGVTZWFyY2hC dXR0b24ucmVtb3ZlU3R5bGVDbGFzcygidG9nZ2xlZC1vbiIpOworICAgICAgICB0aGlzLm5vZGVT ZWFyY2hCdXR0b24udG9nZ2xlZCA9IEluc3BlY3RvckNvbnRyb2xsZXIuc2VhcmNoaW5nRm9yTm9k ZSgpOwogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1BhbmVsLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1BhbmVsLmpzCmluZGV4IDNl MjIxMmMuLjUwNDZmNmIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Q YW5lbC5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUGFuZWwuanMKQEAgLTY2 LDE4ICs2Niw2IEBAIFdlYkluc3BlY3Rvci5QYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJl dHVybiB0aGlzLl90b29sYmFySXRlbTsKICAgICB9LAogCi0gICAgY3JlYXRlU3RhdHVzQmFyQnV0 dG9uOiBmdW5jdGlvbigpCi0gICAgewotICAgICAgICB2YXIgYnV0dG9uID0gZG9jdW1lbnQuY3Jl YXRlRWxlbWVudCgiYnV0dG9uIik7Ci0gICAgICAgIHZhciBnbHlwaCA9IGRvY3VtZW50LmNyZWF0 ZUVsZW1lbnQoImRpdiIpOwotICAgICAgICBnbHlwaC5jbGFzc05hbWUgPSAiZ2x5cGgiOwotICAg ICAgICBidXR0b24uYXBwZW5kQ2hpbGQoZ2x5cGgpOwotICAgICAgICB2YXIgZ2x5cGhTaGFkb3cg PSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKLSAgICAgICAgZ2x5cGhTaGFkb3cuY2xh c3NOYW1lID0gImdseXBoIHNoYWRvdyI7Ci0gICAgICAgIGJ1dHRvbi5hcHBlbmRDaGlsZChnbHlw aFNoYWRvdyk7Ci0gICAgICAgIHJldHVybiBidXR0b247Ci0gICAgfSwKLQogICAgIHNob3c6IGZ1 bmN0aW9uKCkKICAgICB7CiAgICAgICAgIFdlYkluc3BlY3Rvci5WaWV3LnByb3RvdHlwZS5zaG93 LmNhbGwodGhpcyk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUHJv ZmlsZVZpZXcuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZVZpZXcuanMK aW5kZXggMjUxN2JkMi4uNWM5ZmNkYSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1Byb2ZpbGVWaWV3LmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Q cm9maWxlVmlldy5qcwpAQCAtNTYsMjUgKzU2LDE5IEBAIFdlYkluc3BlY3Rvci5Qcm9maWxlVmll dyA9IGZ1bmN0aW9uKHByb2ZpbGUpCiAgICAgdGhpcy52aWV3U2VsZWN0RWxlbWVudC5hcHBlbmRD aGlsZChoZWF2eVZpZXdPcHRpb24pOwogICAgIHRoaXMudmlld1NlbGVjdEVsZW1lbnQuYXBwZW5k Q2hpbGQodHJlZVZpZXdPcHRpb24pOwogCi0gICAgdGhpcy5wZXJjZW50QnV0dG9uID0gZG9jdW1l bnQuY3JlYXRlRWxlbWVudCgiYnV0dG9uIik7Ci0gICAgdGhpcy5wZXJjZW50QnV0dG9uLmNsYXNz TmFtZSA9ICJwZXJjZW50LXRpbWUtc3RhdHVzLWJhci1pdGVtIHN0YXR1cy1iYXItaXRlbSI7Cisg ICAgdGhpcy5wZXJjZW50QnV0dG9uID0gbmV3IFdlYkluc3BlY3Rvci5TdGF0dXNCYXJCdXR0b24o IiIsICJwZXJjZW50LXRpbWUtc3RhdHVzLWJhci1pdGVtIik7CiAgICAgdGhpcy5wZXJjZW50QnV0 dG9uLmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5fcGVyY2VudENsaWNrZWQuYmluZCh0 aGlzKSwgZmFsc2UpOwogCi0gICAgdGhpcy5mb2N1c0J1dHRvbiA9IGRvY3VtZW50LmNyZWF0ZUVs ZW1lbnQoImJ1dHRvbiIpOwotICAgIHRoaXMuZm9jdXNCdXR0b24udGl0bGUgPSBXZWJJbnNwZWN0 b3IuVUlTdHJpbmcoIkZvY3VzIHNlbGVjdGVkIGZ1bmN0aW9uLiIpOwotICAgIHRoaXMuZm9jdXNC dXR0b24uY2xhc3NOYW1lID0gImZvY3VzLXByb2ZpbGUtbm9kZS1zdGF0dXMtYmFyLWl0ZW0gc3Rh dHVzLWJhci1pdGVtIjsKKyAgICB0aGlzLmZvY3VzQnV0dG9uID0gbmV3IFdlYkluc3BlY3Rvci5T dGF0dXNCYXJCdXR0b24oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJGb2N1cyBzZWxlY3RlZCBmdW5j dGlvbi4iKSwgImZvY3VzLXByb2ZpbGUtbm9kZS1zdGF0dXMtYmFyLWl0ZW0iKTsKICAgICB0aGlz LmZvY3VzQnV0dG9uLmRpc2FibGVkID0gdHJ1ZTsKICAgICB0aGlzLmZvY3VzQnV0dG9uLmFkZEV2 ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5fZm9jdXNDbGlja2VkLmJpbmQodGhpcyksIGZhbHNl KTsKIAotICAgIHRoaXMuZXhjbHVkZUJ1dHRvbiA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImJ1 dHRvbiIpOwotICAgIHRoaXMuZXhjbHVkZUJ1dHRvbi50aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0 cmluZygiRXhjbHVkZSBzZWxlY3RlZCBmdW5jdGlvbi4iKTsKLSAgICB0aGlzLmV4Y2x1ZGVCdXR0 b24uY2xhc3NOYW1lID0gImV4Y2x1ZGUtcHJvZmlsZS1ub2RlLXN0YXR1cy1iYXItaXRlbSBzdGF0 dXMtYmFyLWl0ZW0iOworICAgIHRoaXMuZXhjbHVkZUJ1dHRvbiA9IG5ldyBXZWJJbnNwZWN0b3Iu U3RhdHVzQmFyQnV0dG9uKFdlYkluc3BlY3Rvci5VSVN0cmluZygiRXhjbHVkZSBzZWxlY3RlZCBm dW5jdGlvbi4iKSwgImV4Y2x1ZGUtcHJvZmlsZS1ub2RlLXN0YXR1cy1iYXItaXRlbSIpOwogICAg IHRoaXMuZXhjbHVkZUJ1dHRvbi5kaXNhYmxlZCA9IHRydWU7CiAgICAgdGhpcy5leGNsdWRlQnV0 dG9uLmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5fZXhjbHVkZUNsaWNrZWQuYmluZCh0 aGlzKSwgZmFsc2UpOwogCi0gICAgdGhpcy5yZXNldEJ1dHRvbiA9IGRvY3VtZW50LmNyZWF0ZUVs ZW1lbnQoImJ1dHRvbiIpOwotICAgIHRoaXMucmVzZXRCdXR0b24udGl0bGUgPSBXZWJJbnNwZWN0 b3IuVUlTdHJpbmcoIlJlc3RvcmUgYWxsIGZ1bmN0aW9ucy4iKTsKLSAgICB0aGlzLnJlc2V0QnV0 dG9uLmNsYXNzTmFtZSA9ICJyZXNldC1wcm9maWxlLXN0YXR1cy1iYXItaXRlbSBzdGF0dXMtYmFy LWl0ZW0gaGlkZGVuIjsKKyAgICB0aGlzLnJlc2V0QnV0dG9uID0gbmV3IFdlYkluc3BlY3Rvci5T dGF0dXNCYXJCdXR0b24oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJSZXN0b3JlIGFsbCBmdW5jdGlv bnMuIiksICJyZXNldC1wcm9maWxlLXN0YXR1cy1iYXItaXRlbSIpOworICAgIHRoaXMucmVzZXRC dXR0b24udmlzaWJsZSA9IGZhbHNlOwogICAgIHRoaXMucmVzZXRCdXR0b24uYWRkRXZlbnRMaXN0 ZW5lcigiY2xpY2siLCB0aGlzLl9yZXNldENsaWNrZWQuYmluZCh0aGlzKSwgZmFsc2UpOwogCiAg ICAgdGhpcy5wcm9maWxlID0gcHJvZmlsZTsKQEAgLTkwLDcgKzg0LDcgQEAgV2ViSW5zcGVjdG9y LlByb2ZpbGVWaWV3ID0gZnVuY3Rpb24ocHJvZmlsZSkKIFdlYkluc3BlY3Rvci5Qcm9maWxlVmll dy5wcm90b3R5cGUgPSB7CiAgICAgZ2V0IHN0YXR1c0Jhckl0ZW1zKCkKICAgICB7Ci0gICAgICAg IHJldHVybiBbdGhpcy52aWV3U2VsZWN0RWxlbWVudCwgdGhpcy5wZXJjZW50QnV0dG9uLCB0aGlz LmZvY3VzQnV0dG9uLCB0aGlzLmV4Y2x1ZGVCdXR0b24sIHRoaXMucmVzZXRCdXR0b25dOworICAg ICAgICByZXR1cm4gW3RoaXMudmlld1NlbGVjdEVsZW1lbnQsIHRoaXMucGVyY2VudEJ1dHRvbi5l bGVtZW50LCB0aGlzLmZvY3VzQnV0dG9uLmVsZW1lbnQsIHRoaXMuZXhjbHVkZUJ1dHRvbi5lbGVt ZW50LCB0aGlzLnJlc2V0QnV0dG9uLmVsZW1lbnRdOwogICAgIH0sCiAKICAgICBnZXQgcHJvZmls ZSgpCkBAIC00MzksMTAgKzQzMywxMCBAQCBXZWJJbnNwZWN0b3IuUHJvZmlsZVZpZXcucHJvdG90 eXBlID0gewogICAgIHsKICAgICAgICAgaWYgKHRoaXMuc2hvd1NlbGZUaW1lQXNQZXJjZW50ICYm IHRoaXMuc2hvd1RvdGFsVGltZUFzUGVyY2VudCAmJiB0aGlzLnNob3dBdmVyYWdlVGltZUFzUGVy Y2VudCkgewogICAgICAgICAgICAgdGhpcy5wZXJjZW50QnV0dG9uLnRpdGxlID0gV2ViSW5zcGVj dG9yLlVJU3RyaW5nKCJTaG93IGFic29sdXRlIHRvdGFsIGFuZCBzZWxmIHRpbWVzLiIpOwotICAg ICAgICAgICAgdGhpcy5wZXJjZW50QnV0dG9uLmFkZFN0eWxlQ2xhc3MoInRvZ2dsZWQtb24iKTsK KyAgICAgICAgICAgIHRoaXMucGVyY2VudEJ1dHRvbi50b2dnbGVkID0gdHJ1ZTsKICAgICAgICAg fSBlbHNlIHsKICAgICAgICAgICAgIHRoaXMucGVyY2VudEJ1dHRvbi50aXRsZSA9IFdlYkluc3Bl Y3Rvci5VSVN0cmluZygiU2hvdyB0b3RhbCBhbmQgc2VsZiB0aW1lcyBhcyBwZXJjZW50YWdlcy4i KTsKLSAgICAgICAgICAgIHRoaXMucGVyY2VudEJ1dHRvbi5yZW1vdmVTdHlsZUNsYXNzKCJ0b2dn bGVkLW9uIik7CisgICAgICAgICAgICB0aGlzLnBlcmNlbnRCdXR0b24udG9nZ2xlZCA9IGZhbHNl OwogICAgICAgICB9CiAgICAgfSwKIApAQCAtNDUxLDcgKzQ0NSw3IEBAIFdlYkluc3BlY3Rvci5Q cm9maWxlVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgIGlmICghdGhpcy5kYXRhR3JpZC5zZWxl Y3RlZE5vZGUpCiAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgdGhpcy5yZXNldEJ1dHRv bi5yZW1vdmVTdHlsZUNsYXNzKCJoaWRkZW4iKTsKKyAgICAgICAgdGhpcy5yZXNldEJ1dHRvbi52 aXNpYmxlID0gdHJ1ZTsKICAgICAgICAgdGhpcy5wcm9maWxlRGF0YUdyaWRUcmVlLmZvY3VzKHRo aXMuZGF0YUdyaWQuc2VsZWN0ZWROb2RlKTsKICAgICAgICAgdGhpcy5yZWZyZXNoKCk7CiAgICAg ICAgIHRoaXMucmVmcmVzaFZpc2libGVEYXRhKCk7CkBAIC00NjYsNyArNDYwLDcgQEAgV2ViSW5z cGVjdG9yLlByb2ZpbGVWaWV3LnByb3RvdHlwZSA9IHsKIAogICAgICAgICBzZWxlY3RlZE5vZGUu ZGVzZWxlY3QoKTsKIAotICAgICAgICB0aGlzLnJlc2V0QnV0dG9uLnJlbW92ZVN0eWxlQ2xhc3Mo ImhpZGRlbiIpOworICAgICAgICB0aGlzLnJlc2V0QnV0dG9uLnZpc2libGUgPSB0cnVlOwogICAg ICAgICB0aGlzLnByb2ZpbGVEYXRhR3JpZFRyZWUuZXhjbHVkZShzZWxlY3RlZE5vZGUpOwogICAg ICAgICB0aGlzLnJlZnJlc2goKTsKICAgICAgICAgdGhpcy5yZWZyZXNoVmlzaWJsZURhdGEoKTsK QEAgLTQ3NCw3ICs0NjgsNyBAQCBXZWJJbnNwZWN0b3IuUHJvZmlsZVZpZXcucHJvdG90eXBlID0g ewogCiAgICAgX3Jlc2V0Q2xpY2tlZDogZnVuY3Rpb24oZXZlbnQpCiAgICAgewotICAgICAgICB0 aGlzLnJlc2V0QnV0dG9uLmFkZFN0eWxlQ2xhc3MoImhpZGRlbiIpOworICAgICAgICB0aGlzLnJl c2V0QnV0dG9uLnZpc2libGUgPSBmYWxzZTsKICAgICAgICAgdGhpcy5wcm9maWxlRGF0YUdyaWRU cmVlLnJlc3RvcmUoKTsKICAgICAgICAgdGhpcy5yZWZyZXNoKCk7CiAgICAgICAgIHRoaXMucmVm cmVzaFZpc2libGVEYXRhKCk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvUHJvZmlsZXNQYW5lbC5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxl c1BhbmVsLmpzCmluZGV4IGM4Yjk0OGEuLmU3ZWUwNjQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlc1BhbmVsLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9Qcm9maWxlc1BhbmVsLmpzCkBAIC01OSwxNCArNTksMTAgQEAgV2ViSW5zcGVj dG9yLlByb2ZpbGVzUGFuZWwgPSBmdW5jdGlvbigpCiAgICAgdGhpcy5wcm9maWxlVmlld3MuaWQg PSAicHJvZmlsZS12aWV3cyI7CiAgICAgdGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKHRoaXMucHJv ZmlsZVZpZXdzKTsKIAotICAgIHRoaXMuZW5hYmxlVG9nZ2xlQnV0dG9uID0gdGhpcy5jcmVhdGVT dGF0dXNCYXJCdXR0b24oKTsKLSAgICB0aGlzLmVuYWJsZVRvZ2dsZUJ1dHRvbi5jbGFzc05hbWUg PSAiZW5hYmxlLXRvZ2dsZS1zdGF0dXMtYmFyLWl0ZW0gc3RhdHVzLWJhci1pdGVtIjsKKyAgICB0 aGlzLmVuYWJsZVRvZ2dsZUJ1dHRvbiA9IG5ldyBXZWJJbnNwZWN0b3IuU3RhdHVzQmFyQnV0dG9u KCIiLCAiZW5hYmxlLXRvZ2dsZS1zdGF0dXMtYmFyLWl0ZW0iKTsKICAgICB0aGlzLmVuYWJsZVRv Z2dsZUJ1dHRvbi5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuX3RvZ2dsZVByb2ZpbGlu Zy5iaW5kKHRoaXMpLCBmYWxzZSk7CiAKLSAgICB0aGlzLnJlY29yZEJ1dHRvbiA9IHRoaXMuY3Jl YXRlU3RhdHVzQmFyQnV0dG9uKCk7Ci0gICAgdGhpcy5yZWNvcmRCdXR0b24udGl0bGUgPSBXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoIlN0YXJ0IHByb2ZpbGluZy4iKTsKLSAgICB0aGlzLnJlY29yZEJ1 dHRvbi5pZCA9ICJyZWNvcmQtcHJvZmlsZS1zdGF0dXMtYmFyLWl0ZW0iOwotICAgIHRoaXMucmVj b3JkQnV0dG9uLmNsYXNzTmFtZSA9ICJzdGF0dXMtYmFyLWl0ZW0iOworICAgIHRoaXMucmVjb3Jk QnV0dG9uID0gbmV3IFdlYkluc3BlY3Rvci5TdGF0dXNCYXJCdXR0b24oV2ViSW5zcGVjdG9yLlVJ U3RyaW5nKCJTdGFydCBwcm9maWxpbmcuIiksICJyZWNvcmQtcHJvZmlsZS1zdGF0dXMtYmFyLWl0 ZW0iKTsKICAgICB0aGlzLnJlY29yZEJ1dHRvbi5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRo aXMuX3JlY29yZENsaWNrZWQuYmluZCh0aGlzKSwgZmFsc2UpOwogCiAgICAgdGhpcy5yZWNvcmRp bmcgPSBmYWxzZTsKQEAgLTg3LDcgKzgzLDcgQEAgV2ViSW5zcGVjdG9yLlByb2ZpbGVzUGFuZWwu cHJvdG90eXBlID0gewogCiAgICAgZ2V0IHN0YXR1c0Jhckl0ZW1zKCkKICAgICB7Ci0gICAgICAg IHJldHVybiBbdGhpcy5lbmFibGVUb2dnbGVCdXR0b24sIHRoaXMucmVjb3JkQnV0dG9uLCB0aGlz LnByb2ZpbGVWaWV3U3RhdHVzQmFySXRlbXNDb250YWluZXJdOworICAgICAgICByZXR1cm4gW3Ro aXMuZW5hYmxlVG9nZ2xlQnV0dG9uLmVsZW1lbnQsIHRoaXMucmVjb3JkQnV0dG9uLmVsZW1lbnQs IHRoaXMucHJvZmlsZVZpZXdTdGF0dXNCYXJJdGVtc0NvbnRhaW5lcl07CiAgICAgfSwKIAogICAg IHNob3c6IGZ1bmN0aW9uKCkKQEAgLTMxNywxMCArMzEzLDEwIEBAIFdlYkluc3BlY3Rvci5Qcm9m aWxlc1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5yZWNvcmRpbmcgPSBpc1Byb2Zp bGluZzsKIAogICAgICAgICBpZiAoaXNQcm9maWxpbmcpIHsKLSAgICAgICAgICAgIHRoaXMucmVj b3JkQnV0dG9uLmFkZFN0eWxlQ2xhc3MoInRvZ2dsZWQtb24iKTsKKyAgICAgICAgICAgIHRoaXMu cmVjb3JkQnV0dG9uLnRvZ2dsZWQgPSB0cnVlOwogICAgICAgICAgICAgdGhpcy5yZWNvcmRCdXR0 b24udGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlN0b3AgcHJvZmlsaW5nLiIpOwogICAg ICAgICB9IGVsc2UgewotICAgICAgICAgICAgdGhpcy5yZWNvcmRCdXR0b24ucmVtb3ZlU3R5bGVD bGFzcygidG9nZ2xlZC1vbiIpOworICAgICAgICAgICAgdGhpcy5yZWNvcmRCdXR0b24udG9nZ2xl ZCA9IGZhbHNlOwogICAgICAgICAgICAgdGhpcy5yZWNvcmRCdXR0b24udGl0bGUgPSBXZWJJbnNw ZWN0b3IuVUlTdHJpbmcoIlN0YXJ0IHByb2ZpbGluZy4iKTsKICAgICAgICAgfQogICAgIH0sCkBA IC0zMzYsMTQgKzMzMiwxNCBAQCBXZWJJbnNwZWN0b3IuUHJvZmlsZXNQYW5lbC5wcm90b3R5cGUg PSB7CiAgICAgewogICAgICAgICBpZiAoSW5zcGVjdG9yQ29udHJvbGxlci5wcm9maWxlckVuYWJs ZWQoKSkgewogICAgICAgICAgICAgdGhpcy5lbmFibGVUb2dnbGVCdXR0b24udGl0bGUgPSBXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoIlByb2ZpbGluZyBlbmFibGVkLiBDbGljayB0byBkaXNhYmxlLiIp OwotICAgICAgICAgICAgdGhpcy5lbmFibGVUb2dnbGVCdXR0b24uYWRkU3R5bGVDbGFzcygidG9n Z2xlZC1vbiIpOwotICAgICAgICAgICAgdGhpcy5yZWNvcmRCdXR0b24ucmVtb3ZlU3R5bGVDbGFz cygiaGlkZGVuIik7CisgICAgICAgICAgICB0aGlzLmVuYWJsZVRvZ2dsZUJ1dHRvbi50b2dnbGVk ID0gdHJ1ZTsKKyAgICAgICAgICAgIHRoaXMucmVjb3JkQnV0dG9uLnZpc2libGUgPSB0cnVlOwog ICAgICAgICAgICAgdGhpcy5wcm9maWxlVmlld1N0YXR1c0Jhckl0ZW1zQ29udGFpbmVyLnJlbW92 ZVN0eWxlQ2xhc3MoImhpZGRlbiIpOwogICAgICAgICAgICAgdGhpcy5wYW5lbEVuYWJsZXJWaWV3 LnZpc2libGUgPSBmYWxzZTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIHRoaXMuZW5h YmxlVG9nZ2xlQnV0dG9uLnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJQcm9maWxpbmcg ZGlzYWJsZWQuIENsaWNrIHRvIGVuYWJsZS4iKTsKLSAgICAgICAgICAgIHRoaXMuZW5hYmxlVG9n Z2xlQnV0dG9uLnJlbW92ZVN0eWxlQ2xhc3MoInRvZ2dsZWQtb24iKTsKLSAgICAgICAgICAgIHRo aXMucmVjb3JkQnV0dG9uLmFkZFN0eWxlQ2xhc3MoImhpZGRlbiIpOworICAgICAgICAgICAgdGhp cy5lbmFibGVUb2dnbGVCdXR0b24udG9nZ2xlZCA9IGZhbHNlOworICAgICAgICAgICAgdGhpcy5y ZWNvcmRCdXR0b24udmlzaWJsZSA9IGZhbHNlOwogICAgICAgICAgICAgdGhpcy5wcm9maWxlVmll d1N0YXR1c0Jhckl0ZW1zQ29udGFpbmVyLmFkZFN0eWxlQ2xhc3MoImhpZGRlbiIpOwogICAgICAg ICAgICAgdGhpcy5wYW5lbEVuYWJsZXJWaWV3LnZpc2libGUgPSB0cnVlOwogICAgICAgICB9CmRp ZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMg Yi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMKaW5kZXggZmI0 MzU1MS4uYWUzNjliMiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jl c291cmNlc1BhbmVsLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJj ZXNQYW5lbC5qcwpAQCAtMTM5LDE0ICsxMzksMTEgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlc1Bh bmVsID0gZnVuY3Rpb24oKQogCiAgICAgdGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKHRoaXMucGFu ZWxFbmFibGVyVmlldy5lbGVtZW50KTsKIAotICAgIHRoaXMuZW5hYmxlVG9nZ2xlQnV0dG9uID0g dGhpcy5jcmVhdGVTdGF0dXNCYXJCdXR0b24oKTsKLSAgICB0aGlzLmVuYWJsZVRvZ2dsZUJ1dHRv bi5jbGFzc05hbWUgPSAiZW5hYmxlLXRvZ2dsZS1zdGF0dXMtYmFyLWl0ZW0gc3RhdHVzLWJhci1p dGVtIjsKKyAgICB0aGlzLmVuYWJsZVRvZ2dsZUJ1dHRvbiA9IG5ldyBXZWJJbnNwZWN0b3IuU3Rh dHVzQmFyQnV0dG9uKCIiLCAiZW5hYmxlLXRvZ2dsZS1zdGF0dXMtYmFyLWl0ZW0iKTsKICAgICB0 aGlzLmVuYWJsZVRvZ2dsZUJ1dHRvbi5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuX3Rv Z2dsZVJlc291cmNlVHJhY2tpbmcuYmluZCh0aGlzKSwgZmFsc2UpOwogCi0gICAgdGhpcy5sYXJn ZXJSZXNvdXJjZXNCdXR0b24gPSB0aGlzLmNyZWF0ZVN0YXR1c0JhckJ1dHRvbigpOwotICAgIHRo aXMubGFyZ2VyUmVzb3VyY2VzQnV0dG9uLmlkID0gInJlc291cmNlcy1sYXJnZXItcmVzb3VyY2Vz LXN0YXR1cy1iYXItaXRlbSI7Ci0gICAgdGhpcy5sYXJnZXJSZXNvdXJjZXNCdXR0b24uY2xhc3NO YW1lID0gInN0YXR1cy1iYXItaXRlbSB0b2dnbGVkLW9uIjsKLSAgICB0aGlzLmxhcmdlclJlc291 cmNlc0J1dHRvbi50aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiVXNlIHNtYWxsIHJlc291 cmNlIHJvd3MuIik7CisgICAgdGhpcy5sYXJnZXJSZXNvdXJjZXNCdXR0b24gPSBuZXcgV2ViSW5z cGVjdG9yLlN0YXR1c0JhckJ1dHRvbihXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlVzZSBzbWFsbCBy ZXNvdXJjZSByb3dzLiIpLCAicmVzb3VyY2VzLWxhcmdlci1yZXNvdXJjZXMtc3RhdHVzLWJhci1p dGVtIik7CisgICAgdGhpcy5sYXJnZXJSZXNvdXJjZXNCdXR0b24udG9nZ2xlZCA9IHRydWU7CiAg ICAgdGhpcy5sYXJnZXJSZXNvdXJjZXNCdXR0b24uYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0 aGlzLl90b2dnbGVMYXJnZXJSZXNvdXJjZXMuYmluZCh0aGlzKSwgZmFsc2UpOwogCiAgICAgdGhp cy5zb3J0aW5nU2VsZWN0RWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInNlbGVjdCIp OwpAQCAtMjExLDcgKzIwOCw3IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5 cGUgPSB7CiAKICAgICBnZXQgc3RhdHVzQmFySXRlbXMoKQogICAgIHsKLSAgICAgICAgcmV0dXJu IFt0aGlzLmVuYWJsZVRvZ2dsZUJ1dHRvbiwgdGhpcy5sYXJnZXJSZXNvdXJjZXNCdXR0b24sIHRo aXMuc29ydGluZ1NlbGVjdEVsZW1lbnRdOworICAgICAgICByZXR1cm4gW3RoaXMuZW5hYmxlVG9n Z2xlQnV0dG9uLmVsZW1lbnQsIHRoaXMubGFyZ2VyUmVzb3VyY2VzQnV0dG9uLmVsZW1lbnQsIHRo aXMuc29ydGluZ1NlbGVjdEVsZW1lbnRdOwogICAgIH0sCiAKICAgICBzaG93OiBmdW5jdGlvbigp CkBAIC00NjcsMTQgKzQ2NCwxNCBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90 eXBlID0gewogCiAgICAgICAgIGlmIChJbnNwZWN0b3JDb250cm9sbGVyLnJlc291cmNlVHJhY2tp bmdFbmFibGVkKCkpIHsKICAgICAgICAgICAgIHRoaXMuZW5hYmxlVG9nZ2xlQnV0dG9uLnRpdGxl ID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJSZXNvdXJjZSB0cmFja2luZyBlbmFibGVkLiBDbGlj ayB0byBkaXNhYmxlLiIpOwotICAgICAgICAgICAgdGhpcy5lbmFibGVUb2dnbGVCdXR0b24uYWRk U3R5bGVDbGFzcygidG9nZ2xlZC1vbiIpOwotICAgICAgICAgICAgdGhpcy5sYXJnZXJSZXNvdXJj ZXNCdXR0b24ucmVtb3ZlU3R5bGVDbGFzcygiaGlkZGVuIik7CisgICAgICAgICAgICB0aGlzLmVu YWJsZVRvZ2dsZUJ1dHRvbi50b2dnbGVkID0gdHJ1ZTsKKyAgICAgICAgICAgIHRoaXMubGFyZ2Vy UmVzb3VyY2VzQnV0dG9uLnZpc2libGUgPSB0cnVlOwogICAgICAgICAgICAgdGhpcy5zb3J0aW5n U2VsZWN0RWxlbWVudC5yZW1vdmVTdHlsZUNsYXNzKCJoaWRkZW4iKTsKICAgICAgICAgICAgIHRo aXMucGFuZWxFbmFibGVyVmlldy52aXNpYmxlID0gZmFsc2U7CiAgICAgICAgIH0gZWxzZSB7CiAg ICAgICAgICAgICB0aGlzLmVuYWJsZVRvZ2dsZUJ1dHRvbi50aXRsZSA9IFdlYkluc3BlY3Rvci5V SVN0cmluZygiUmVzb3VyY2UgdHJhY2tpbmcgZGlzYWJsZWQuIENsaWNrIHRvIGVuYWJsZS4iKTsK LSAgICAgICAgICAgIHRoaXMuZW5hYmxlVG9nZ2xlQnV0dG9uLnJlbW92ZVN0eWxlQ2xhc3MoInRv Z2dsZWQtb24iKTsKLSAgICAgICAgICAgIHRoaXMubGFyZ2VyUmVzb3VyY2VzQnV0dG9uLmFkZFN0 eWxlQ2xhc3MoImhpZGRlbiIpOworICAgICAgICAgICAgdGhpcy5lbmFibGVUb2dnbGVCdXR0b24u dG9nZ2xlZCA9IGZhbHNlOworICAgICAgICAgICAgdGhpcy5sYXJnZXJSZXNvdXJjZXNCdXR0b24u dmlzaWJsZSA9IGZhbHNlOwogICAgICAgICAgICAgdGhpcy5zb3J0aW5nU2VsZWN0RWxlbWVudC5h ZGRTdHlsZUNsYXNzKCJoaWRkZW4iKTsKICAgICAgICAgICAgIHRoaXMucGFuZWxFbmFibGVyVmll dy52aXNpYmxlID0gdHJ1ZTsKICAgICAgICAgfQpAQCAtMTA3NiwxMiArMTA3MywxMiBAQCBXZWJJ bnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICBpZiAodGhpcy5y ZXNvdXJjZXNUcmVlRWxlbWVudC5zbWFsbENoaWxkcmVuKSB7CiAgICAgICAgICAgICB0aGlzLnJl c291cmNlc0dyYXBoc0VsZW1lbnQuYWRkU3R5bGVDbGFzcygic21hbGwiKTsKICAgICAgICAgICAg IHRoaXMubGFyZ2VyUmVzb3VyY2VzQnV0dG9uLnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5n KCJVc2UgbGFyZ2UgcmVzb3VyY2Ugcm93cy4iKTsKLSAgICAgICAgICAgIHRoaXMubGFyZ2VyUmVz b3VyY2VzQnV0dG9uLnJlbW92ZVN0eWxlQ2xhc3MoInRvZ2dsZWQtb24iKTsKKyAgICAgICAgICAg IHRoaXMubGFyZ2VyUmVzb3VyY2VzQnV0dG9uLnRvZ2dsZWQgPSBmYWxzZTsKICAgICAgICAgICAg IHRoaXMuX2FkanVzdFNjcm9sbFBvc2l0aW9uKCk7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAg ICAgICB0aGlzLnJlc291cmNlc0dyYXBoc0VsZW1lbnQucmVtb3ZlU3R5bGVDbGFzcygic21hbGwi KTsKICAgICAgICAgICAgIHRoaXMubGFyZ2VyUmVzb3VyY2VzQnV0dG9uLnRpdGxlID0gV2ViSW5z cGVjdG9yLlVJU3RyaW5nKCJVc2Ugc21hbGwgcmVzb3VyY2Ugcm93cy4iKTsKLSAgICAgICAgICAg IHRoaXMubGFyZ2VyUmVzb3VyY2VzQnV0dG9uLmFkZFN0eWxlQ2xhc3MoInRvZ2dsZWQtb24iKTsK KyAgICAgICAgICAgIHRoaXMubGFyZ2VyUmVzb3VyY2VzQnV0dG9uLnRvZ2dsZWQgPSB0cnVlOwog ICAgICAgICB9CiAgICAgfSwKIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1NjcmlwdHNQYW5lbC5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRz UGFuZWwuanMKaW5kZXggMDA1ODM3NC4uNjliMjFmMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCkBAIC0xNTEsMTMgKzE1MSwxMCBAQCBXZWJJbnNwZWN0 b3IuU2NyaXB0c1BhbmVsID0gZnVuY3Rpb24oKQogICAgIHRoaXMuZWxlbWVudC5hcHBlbmRDaGls ZCh0aGlzLnNpZGViYXJFbGVtZW50KTsKICAgICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQodGhp cy5zaWRlYmFyUmVzaXplRWxlbWVudCk7CiAKLSAgICB0aGlzLmVuYWJsZVRvZ2dsZUJ1dHRvbiA9 IHRoaXMuY3JlYXRlU3RhdHVzQmFyQnV0dG9uKCk7Ci0gICAgdGhpcy5lbmFibGVUb2dnbGVCdXR0 b24uY2xhc3NOYW1lID0gImVuYWJsZS10b2dnbGUtc3RhdHVzLWJhci1pdGVtIHN0YXR1cy1iYXIt aXRlbSI7CisgICAgdGhpcy5lbmFibGVUb2dnbGVCdXR0b24gPSBuZXcgV2ViSW5zcGVjdG9yLlN0 YXR1c0JhckJ1dHRvbigiIiwgImVuYWJsZS10b2dnbGUtc3RhdHVzLWJhci1pdGVtIik7CiAgICAg dGhpcy5lbmFibGVUb2dnbGVCdXR0b24uYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0aGlzLl90 b2dnbGVEZWJ1Z2dpbmcuYmluZCh0aGlzKSwgZmFsc2UpOwogCi0gICAgdGhpcy5wYXVzZU9uRXhj ZXB0aW9uQnV0dG9uID0gdGhpcy5jcmVhdGVTdGF0dXNCYXJCdXR0b24oKTsKLSAgICB0aGlzLnBh dXNlT25FeGNlcHRpb25CdXR0b24uaWQgPSAic2NyaXB0cy1wYXVzZS1vbi1leGNlcHRpb25zLXN0 YXR1cy1iYXItaXRlbSI7Ci0gICAgdGhpcy5wYXVzZU9uRXhjZXB0aW9uQnV0dG9uLmNsYXNzTmFt ZSA9ICJzdGF0dXMtYmFyLWl0ZW0iOworICAgIHRoaXMucGF1c2VPbkV4Y2VwdGlvbkJ1dHRvbiA9 IG5ldyBXZWJJbnNwZWN0b3IuU3RhdHVzQmFyQnV0dG9uKCIiLCAic2NyaXB0cy1wYXVzZS1vbi1l eGNlcHRpb25zLXN0YXR1cy1iYXItaXRlbSIpOwogICAgIHRoaXMucGF1c2VPbkV4Y2VwdGlvbkJ1 dHRvbi5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuX3RvZ2dsZVBhdXNlT25FeGNlcHRp b25zLmJpbmQodGhpcyksIGZhbHNlKTsKIAogICAgIHRoaXMuX2JyZWFrcG9pbnRzVVJMTWFwID0g e307CkBAIC0yMDgsNyArMjA1LDcgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5 cGUgPSB7CiAKICAgICBnZXQgc3RhdHVzQmFySXRlbXMoKQogICAgIHsKLSAgICAgICAgcmV0dXJu IFt0aGlzLmVuYWJsZVRvZ2dsZUJ1dHRvbiwgdGhpcy5wYXVzZU9uRXhjZXB0aW9uQnV0dG9uXTsK KyAgICAgICAgcmV0dXJuIFt0aGlzLmVuYWJsZVRvZ2dsZUJ1dHRvbi5lbGVtZW50LCB0aGlzLnBh dXNlT25FeGNlcHRpb25CdXR0b24uZWxlbWVudF07CiAgICAgfSwKIAogICAgIGdldCBwYXVzZWQo KQpAQCAtNzY0LDEwICs3NjEsMTAgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5 cGUgPSB7CiAgICAgewogICAgICAgICBpZiAoSW5zcGVjdG9yQ29udHJvbGxlci5wYXVzZU9uRXhj ZXB0aW9ucygpKSB7CiAgICAgICAgICAgICB0aGlzLnBhdXNlT25FeGNlcHRpb25CdXR0b24udGl0 bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkRvbid0IHBhdXNlIG9uIGV4Y2VwdGlvbnMuIik7 Ci0gICAgICAgICAgICB0aGlzLnBhdXNlT25FeGNlcHRpb25CdXR0b24uYWRkU3R5bGVDbGFzcygi dG9nZ2xlZC1vbiIpOworICAgICAgICAgICAgdGhpcy5wYXVzZU9uRXhjZXB0aW9uQnV0dG9uLnRv Z2dsZWQgPSB0cnVlOwogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgdGhpcy5wYXVzZU9u RXhjZXB0aW9uQnV0dG9uLnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJQYXVzZSBvbiBl eGNlcHRpb25zLiIpOwotICAgICAgICAgICAgdGhpcy5wYXVzZU9uRXhjZXB0aW9uQnV0dG9uLnJl bW92ZVN0eWxlQ2xhc3MoInRvZ2dsZWQtb24iKTsKKyAgICAgICAgICAgIHRoaXMucGF1c2VPbkV4 Y2VwdGlvbkJ1dHRvbi50b2dnbGVkID0gZmFsc2U7CiAgICAgICAgIH0KICAgICB9LAogCkBAIC03 NzUsMTMgKzc3MiwxMyBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsK ICAgICB7CiAgICAgICAgIGlmIChJbnNwZWN0b3JDb250cm9sbGVyLmRlYnVnZ2VyRW5hYmxlZCgp KSB7CiAgICAgICAgICAgICB0aGlzLmVuYWJsZVRvZ2dsZUJ1dHRvbi50aXRsZSA9IFdlYkluc3Bl Y3Rvci5VSVN0cmluZygiRGVidWdnaW5nIGVuYWJsZWQuIENsaWNrIHRvIGRpc2FibGUuIik7Ci0g ICAgICAgICAgICB0aGlzLmVuYWJsZVRvZ2dsZUJ1dHRvbi5hZGRTdHlsZUNsYXNzKCJ0b2dnbGVk LW9uIik7Ci0gICAgICAgICAgICB0aGlzLnBhdXNlT25FeGNlcHRpb25CdXR0b24ucmVtb3ZlU3R5 bGVDbGFzcygiaGlkZGVuIik7CisgICAgICAgICAgICB0aGlzLmVuYWJsZVRvZ2dsZUJ1dHRvbi50 b2dnbGVkID0gdHJ1ZTsKKyAgICAgICAgICAgIHRoaXMucGF1c2VPbkV4Y2VwdGlvbkJ1dHRvbi52 aXNpYmxlID0gdHJ1ZTsKICAgICAgICAgICAgIHRoaXMucGFuZWxFbmFibGVyVmlldy52aXNpYmxl ID0gZmFsc2U7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICB0aGlzLmVuYWJsZVRvZ2ds ZUJ1dHRvbi50aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiRGVidWdnaW5nIGRpc2FibGVk LiBDbGljayB0byBlbmFibGUuIik7Ci0gICAgICAgICAgICB0aGlzLmVuYWJsZVRvZ2dsZUJ1dHRv bi5yZW1vdmVTdHlsZUNsYXNzKCJ0b2dnbGVkLW9uIik7Ci0gICAgICAgICAgICB0aGlzLnBhdXNl T25FeGNlcHRpb25CdXR0b24uYWRkU3R5bGVDbGFzcygiaGlkZGVuIik7CisgICAgICAgICAgICB0 aGlzLmVuYWJsZVRvZ2dsZUJ1dHRvbi50b2dnbGVkID0gZmFsc2U7CisgICAgICAgICAgICB0aGlz LnBhdXNlT25FeGNlcHRpb25CdXR0b24udmlzaWJsZSA9IGZhbHNlOwogICAgICAgICAgICAgdGhp cy5wYW5lbEVuYWJsZXJWaWV3LnZpc2libGUgPSB0cnVlOwogICAgICAgICB9CiAKZGlmZiAtLWdp dCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdGF0dXNCYXJCdXR0b24uanMgYi9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3RhdHVzQmFyQnV0dG9uLmpzCm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAuLjVjNjllZDUKLS0tIC9kZXYvbnVsbAorKysgYi9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvU3RhdHVzQmFyQnV0dG9uLmpzCkBAIC0wLDAgKzEsMTE4IEBA CisvKgorICogQ29weXJpZ2h0IChDKSAyMDA5IEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2 ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBm b3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJv dmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMgYXJlCisgKiBtZXQ6CisgKgorICog ICAgICogUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92 ZSBjb3B5cmlnaHQKKyAqIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBm b2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqICAgICAqIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkg Zm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUKKyAqIGNvcHlyaWdodCBub3RpY2UsIHRoaXMg bGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIKKyAqIGluIHRo ZSBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUK KyAqIGRpc3RyaWJ1dGlvbi4KKyAqICAgICAqIE5laXRoZXIgdGhlIG5hbWUgb2YgR29vZ2xlIElu Yy4gbm9yIHRoZSBuYW1lcyBvZiBpdHMKKyAqIGNvbnRyaWJ1dG9ycyBtYXkgYmUgdXNlZCB0byBl bmRvcnNlIG9yIHByb21vdGUgcHJvZHVjdHMgZGVyaXZlZCBmcm9tCisgKiB0aGlzIHNvZnR3YXJl IHdpdGhvdXQgc3BlY2lmaWMgcHJpb3Igd3JpdHRlbiBwZXJtaXNzaW9uLgorICoKKyAqIFRISVMg U09GVFdBUkUgSVMgUFJPVklERUQgQlkgVEhFIENPUFlSSUdIVCBIT0xERVJTIEFORCBDT05UUklC VVRPUlMKKyAqICJBUyBJUyIgQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywg SU5DTFVESU5HLCBCVVQgTk9UCisgKiBMSU1JVEVEIFRPLCBUSEUgSU1QTElFRCBXQVJSQU5USUVT IE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IKKyAqIEEgUEFSVElDVUxBUiBQVVJQ T1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBUSEUgQ09QWVJJR0hUCisgKiBP V05FUiBPUiBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwg SU5DSURFTlRBTCwKKyAqIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1B R0VTIChJTkNMVURJTkcsIEJVVCBOT1QKKyAqIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GIFNV QlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLAorICogREFUQSwgT1IgUFJP RklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5Z CisgKiBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElB QklMSVRZLCBPUiBUT1JUCisgKiAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBB UklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKKyAqIE9GIFRISVMgU09GVFdBUkUsIEVW RU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKwor V2ViSW5zcGVjdG9yLlN0YXR1c0JhckJ1dHRvbiA9IGZ1bmN0aW9uKHRpdGxlLCBjbGFzc05hbWUp Cit7CisgICAgdGhpcy5lbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiYnV0dG9uIik7 CisgICAgdGhpcy5lbGVtZW50LmNsYXNzTmFtZSA9IGNsYXNzTmFtZSArICIgc3RhdHVzLWJhci1p dGVtIjsKKyAgICB0aGlzLmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0aGlzLl9j bGlja2VkLmJpbmQodGhpcyksIGZhbHNlKTsKKworICAgIHRoaXMuZ2x5cGggPSBkb2N1bWVudC5j cmVhdGVFbGVtZW50KCJkaXYiKTsKKyAgICB0aGlzLmdseXBoLmNsYXNzTmFtZSA9ICJnbHlwaCI7 CisgICAgdGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuZ2x5cGgpOworCisgICAgdGhpcy5n bHlwaFNoYWRvdyA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOworICAgIHRoaXMuZ2x5 cGhTaGFkb3cuY2xhc3NOYW1lID0gImdseXBoIHNoYWRvdyI7CisgICAgdGhpcy5lbGVtZW50LmFw cGVuZENoaWxkKHRoaXMuZ2x5cGhTaGFkb3cpOworCisgICAgdGhpcy50aXRsZSA9IHRpdGxlOwor ICAgIHRoaXMuZGlzYWJsZWQgPSBmYWxzZTsKKyAgICB0aGlzLl90b2dnbGVkID0gZmFsc2U7Cisg ICAgdGhpcy5fdmlzaWJsZSA9IHRydWU7Cit9CisKK1dlYkluc3BlY3Rvci5TdGF0dXNCYXJCdXR0 b24ucHJvdG90eXBlID0geworICAgIF9jbGlja2VkOiBmdW5jdGlvbigpCisgICAgeworICAgICAg ICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycygiY2xpY2siKTsKKyAgICB9LAorCisgICAg Z2V0IGRpc2FibGVkKCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl9kaXNhYmxlZDsKKyAg ICB9LAorCisgICAgc2V0IGRpc2FibGVkKHgpCisgICAgeworICAgICAgICBpZiAodGhpcy5fZGlz YWJsZWQgPT09IHgpCisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIHRoaXMuX2Rpc2FibGVk ID0geDsKKyAgICAgICAgdGhpcy5lbGVtZW50LmRpc2FibGVkID0geDsKKyAgICB9LAorCisgICAg Z2V0IHRpdGxlKCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl90aXRsZTsKKyAgICB9LAor CisgICAgc2V0IHRpdGxlKHgpCisgICAgeworICAgICAgICBpZiAodGhpcy5fdGl0bGUgPT09IHgp CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIHRoaXMuX3RpdGxlID0geDsKKyAgICAgICAg dGhpcy5lbGVtZW50LnRpdGxlID0geDsKKyAgICB9LAorCisgICAgZ2V0IHRvZ2dsZWQoKQorICAg IHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3RvZ2dsZWQ7CisgICAgfSwKKworICAgIHNldCB0b2dn bGVkKHgpCisgICAgeworICAgICAgICBpZiAodGhpcy5fdG9nZ2xlZCA9PT0geCkKKyAgICAgICAg ICAgIHJldHVybjsKKworICAgICAgICBpZiAoeCkKKyAgICAgICAgICAgIHRoaXMuZWxlbWVudC5h ZGRTdHlsZUNsYXNzKCJ0b2dnbGVkLW9uIik7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIHRo aXMuZWxlbWVudC5yZW1vdmVTdHlsZUNsYXNzKCJ0b2dnbGVkLW9uIik7CisgICAgICAgIHRoaXMu X3RvZ2dsZWQgPSB4OworICAgIH0sCisKKyAgICBnZXQgdmlzaWJsZSgpCisgICAgeworICAgICAg ICByZXR1cm4gdGhpcy5fdmlzaWJsZTsKKyAgICB9LAorCisgICAgc2V0IHZpc2libGUoeCkKKyAg ICB7CisgICAgICAgIGlmICh0aGlzLl92aXNpYmxlID09PSB4KQorICAgICAgICAgICAgcmV0dXJu OworCisgICAgICAgIGlmICh4KQorICAgICAgICAgICAgdGhpcy5lbGVtZW50LnJlbW92ZVN0eWxl Q2xhc3MoImhpZGRlbiIpOworICAgICAgICBlbHNlCisgICAgICAgICAgICB0aGlzLmVsZW1lbnQu YWRkU3R5bGVDbGFzcygiaGlkZGVuIik7CisgICAgICAgIHRoaXMuX3Zpc2libGUgPSB4OworICAg IH0KK30KKworV2ViSW5zcGVjdG9yLlN0YXR1c0JhckJ1dHRvbi5wcm90b3R5cGUuX19wcm90b19f ID0gV2ViSW5zcGVjdG9yLk9iamVjdC5wcm90b3R5cGU7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvV2ViS2l0LnFyYyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9XZWJLaXQucXJjCmluZGV4IDdmZjFmNDEuLmFiZjlhYTQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9XZWJLaXQucXJjCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9XZWJLaXQucXJjCkBAIC01Miw2ICs1Miw3IEBACiAgICAgPGZpbGU+U2lkZWJhclRy ZWVFbGVtZW50LmpzPC9maWxlPgogICAgIDxmaWxlPlNvdXJjZUZyYW1lLmpzPC9maWxlPgogICAg IDxmaWxlPlNvdXJjZVZpZXcuanM8L2ZpbGU+CisgICAgPGZpbGU+U3RhdHVzQmFyQnV0dG9uLmpz PC9maWxlPgogICAgIDxmaWxlPlN0eWxlc1NpZGViYXJQYW5lLmpzPC9maWxlPgogICAgIDxmaWxl PlRleHRQcm9tcHQuanM8L2ZpbGU+CiAgICAgPGZpbGU+VG9wRG93blByb2ZpbGVEYXRhR3JpZFRy ZWUuanM8L2ZpbGU+CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5z cGVjdG9yLmNzcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuY3NzCmlu ZGV4IDExYzE2NmQuLmMwODk4YzEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9pbnNwZWN0b3IuY3NzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNw ZWN0b3IuY3NzCkBAIC0yMDk1LDcgKzIwOTUsNyBAQCBidXR0b24uZW5hYmxlLXRvZ2dsZS1zdGF0 dXMtYmFyLWl0ZW0udG9nZ2xlZC1vbiAuZ2x5cGggewogICAgIC13ZWJraXQtbWFzay1pbWFnZTog dXJsKEltYWdlcy9lbmFibGVTb2xpZEJ1dHRvbkdseXBoLnBuZyk7CiB9CiAKLSNzY3JpcHRzLXBh dXNlLW9uLWV4Y2VwdGlvbnMtc3RhdHVzLWJhci1pdGVtIC5nbHlwaCB7Cisuc2NyaXB0cy1wYXVz ZS1vbi1leGNlcHRpb25zLXN0YXR1cy1iYXItaXRlbSAuZ2x5cGggewogICAgIC13ZWJraXQtbWFz ay1pbWFnZTogdXJsKEltYWdlcy9wYXVzZU9uRXhjZXB0aW9uQnV0dG9uR2x5cGgucG5nKTsKIH0K IApAQCAtMjIxMyw3ICsyMjEzLDcgQEAgYnV0dG9uLmVuYWJsZS10b2dnbGUtc3RhdHVzLWJhci1p dGVtLnRvZ2dsZWQtb24gLmdseXBoIHsKICAgICBvdmVyZmxvdzogYXV0bzsKIH0KIAotI3Jlc291 cmNlcy1sYXJnZXItcmVzb3VyY2VzLXN0YXR1cy1iYXItaXRlbSAuZ2x5cGggeworLnJlc291cmNl cy1sYXJnZXItcmVzb3VyY2VzLXN0YXR1cy1iYXItaXRlbSAuZ2x5cGggewogICAgIC13ZWJraXQt bWFzay1pbWFnZTogdXJsKEltYWdlcy9sYXJnZXJSZXNvdXJjZXNCdXR0b25HbHlwaC5wbmcpOwog fQogCkBAIC0zMDk3LDE2ICszMDk3LDE2IEBAIGJvZHkuaW5hY3RpdmUgLnNpZGViYXItdHJlZS1p dGVtLnNlbGVjdGVkIC5idWJibGUuc2VhcmNoLW1hdGNoZXMgewogYnV0dG9uLmVuYWJsZS10b2dn bGUtc3RhdHVzLWJhci1pdGVtIC5nbHlwaCB7CiB9CiAKLSNyZWNvcmQtcHJvZmlsZS1zdGF0dXMt YmFyLWl0ZW0gLmdseXBoIHsKKy5yZWNvcmQtcHJvZmlsZS1zdGF0dXMtYmFyLWl0ZW0gLmdseXBo IHsKICAgICAtd2Via2l0LW1hc2staW1hZ2U6IHVybChJbWFnZXMvcmVjb3JkQnV0dG9uR2x5cGgu cG5nKTsKIH0KIAotI3JlY29yZC1wcm9maWxlLXN0YXR1cy1iYXItaXRlbS50b2dnbGVkLW9uIC5n bHlwaCB7CisucmVjb3JkLXByb2ZpbGUtc3RhdHVzLWJhci1pdGVtLnRvZ2dsZWQtb24gLmdseXBo IHsKICAgICAtd2Via2l0LW1hc2staW1hZ2U6IHVybChJbWFnZXMvcmVjb3JkVG9nZ2xlZEJ1dHRv bkdseXBoLnBuZyk7Ci0gICAgYmFja2dyb3VuZC1jb2xvcjogcmdiKDIxNiwgMCwgMCk7CisgICAg YmFja2dyb3VuZC1jb2xvcjogcmdiKDIxNiwgMCwgMCkgIWltcG9ydGFudDsKIH0KIAotI25vZGUt c2VhcmNoLXN0YXR1cy1iYXItaXRlbSAuZ2x5cGggeworLm5vZGUtc2VhcmNoLXN0YXR1cy1iYXIt aXRlbSAuZ2x5cGggewogICAgIC13ZWJraXQtbWFzay1pbWFnZTogdXJsKEltYWdlcy9ub2RlU2Vh cmNoQnV0dG9uR2x5cGgucG5nKTsKIH0KIApAQCAtMzE0MCwxMiArMzE0MCw4IEBAIGJ1dHRvbi5l bmFibGUtdG9nZ2xlLXN0YXR1cy1iYXItaXRlbSAuZ2x5cGggewogICAgIG1hcmdpbi1sZWZ0OiAt MXB4OwogfQogCi0ucmVmcmVzaC1zdG9yYWdlLXN0YXR1cy1iYXItaXRlbSB7Ci0gICAgYmFja2dy b3VuZC1pbWFnZTogdXJsKEltYWdlcy9yZWxvYWRCdXR0b25zLnBuZykgIWltcG9ydGFudDsKLX0K LQotLnJlZnJlc2gtc3RvcmFnZS1zdGF0dXMtYmFyLWl0ZW06YWN0aXZlIHsKLSAgICBiYWNrZ3Jv dW5kLXBvc2l0aW9uOiAzMnB4IDA7CisucmVmcmVzaC1zdG9yYWdlLXN0YXR1cy1iYXItaXRlbSAu Z2x5cGggeworICAgIC13ZWJraXQtbWFzay1pbWFnZTogdXJsKEltYWdlcy9yZWxvYWRCdXR0b25H bHlwaC5wbmcpOwogfQogCiAjc3RvcmFnZS12aWV3LXN0YXR1cy1iYXItaXRlbXMgewpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5odG1sIGIvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5odG1sCmluZGV4IDQ1YzI3ZGQuLmQyYTc3 ZmYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuaHRt bAorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmh0bWwKQEAgLTY4 LDYgKzY4LDcgQEAgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJ TElUWSBPRiBTVUNIIERBTUFHRS4KICAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIg c3JjPSJTdHlsZXNTaWRlYmFyUGFuZS5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCB0eXBlPSJ0 ZXh0L2phdmFzY3JpcHQiIHNyYz0iUGFuZWwuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgdHlw ZT0idGV4dC9qYXZhc2NyaXB0IiBzcmM9IlBhbmVsRW5hYmxlclZpZXcuanMiPjwvc2NyaXB0Pgor ICAgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBzcmM9IlN0YXR1c0JhckJ1dHRvbi5q cyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iRWxl bWVudHNQYW5lbC5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3Jp cHQiIHNyYz0iUmVzb3VyY2VzUGFuZWwuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgdHlwZT0i dGV4dC9qYXZhc2NyaXB0IiBzcmM9IlNjcmlwdHNQYW5lbC5qcyI+PC9zY3JpcHQ+Cg== 34724 2009-08-13 02:21:05 -0700 2009-08-13 04:52:53 -0700 noticed that I've accidentally made "Delete" button in Cookies view hidden---fixed fix-profiler-buttons-patch text/plain 34590 mnaganov ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NThlZjMzZC4uOGUyMDc2MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSw2NiBAQAorMjAwOS0wOC0xMyAgTWlraGFpbCBOYWdh bm92ICA8bW5hZ2Fub3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEludHJvZHVjZWQgU3RhdHVzQmFyQnV0dG9uIGNsYXNzIHRo YXQgZW5jYXBzdWxhdGVzIGdseXBocyBzdXBwb3J0LgorICAgICAgICBWaWV3cyB1cGRhdGVkIGFj Y29yZGluZ2x5LgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yODE3NAorCisgICAgICAgICogV2ViQ29yZS5neXBpOgorICAgICAgICAqIFdlYkNvcmUu dmNwcm9qL1dlYkNvcmUudmNwcm9qOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQ29v a2llSXRlbXNWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvb2tpZUl0ZW1zVmlldyk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29va2llSXRlbXNWaWV3LnByb3RvdHlwZS5nZXQgc3Rh dHVzQmFySXRlbXMpOiBVcGRhdGVkIHRvIHJldHJpZXZlIERPTSBlbGVtZW50IGZyb20gU3RhdHVz QmFyQnV0dG9uIGluc3RhbmNlIChoZXJlIGFuZCBpbiBzaW1pbGFyIGdldHRlcnMgYmVsb3cuKQor ICAgICAgICAoV2ViSW5zcGVjdG9yLkNvb2tpZUl0ZW1zVmlldy5wcm90b3R5cGUuaGlkZSk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuQ29va2llSXRlbXNWaWV3LnByb3RvdHlwZS51cGRhdGUpOgor ICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRE9NU3RvcmFnZUl0ZW1zVmlldy5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5ET01TdG9yYWdlSXRlbXNWaWV3KToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5ET01TdG9yYWdlSXRlbXNWaWV3LnByb3RvdHlwZS5nZXQgc3RhdHVzQmFySXRlbXMp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTVN0b3JhZ2VJdGVtc1ZpZXcucHJvdG90eXBlLmhp ZGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTVN0b3JhZ2VJdGVtc1ZpZXcucHJvdG90eXBl LnVwZGF0ZSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1BhbmVsLmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkVsZW1lbnRzUGFuZWwpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkVsZW1lbnRzUGFuZWwucHJvdG90eXBlLmdldCBzdGF0dXNCYXJJdGVtcyk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuRWxlbWVudHNQYW5lbC5wcm90b3R5cGUuaGlkZSk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuRWxlbWVudHNQYW5lbC5wcm90b3R5cGUuX25vZGVTZWFyY2hCdXR0b25D bGlja2VkKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1BhbmVsLmpzOgorICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZVZpZXcuanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuUHJvZmlsZVZpZXcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlByb2ZpbGVWaWV3LnBy b3RvdHlwZS5nZXQgc3RhdHVzQmFySXRlbXMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlByb2Zp bGVWaWV3LnByb3RvdHlwZS5fdXBkYXRlUGVyY2VudEJ1dHRvbik6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuUHJvZmlsZVZpZXcucHJvdG90eXBlLl9mb2N1c0NsaWNrZWQpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlByb2ZpbGVWaWV3LnByb3RvdHlwZS5fZXhjbHVkZUNsaWNrZWQpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlByb2ZpbGVWaWV3LnByb3RvdHlwZS5fcmVzZXRDbGlja2VkKToKKyAg ICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVzUGFuZWwuanM6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuUHJvZmlsZXNQYW5lbCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUHJvZmls ZXNQYW5lbC5wcm90b3R5cGUuZ2V0IHN0YXR1c0Jhckl0ZW1zKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5Qcm9maWxlc1BhbmVsLnByb3RvdHlwZS5zZXRSZWNvcmRpbmdQcm9maWxlKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5Qcm9maWxlc1BhbmVsLnByb3RvdHlwZS5fdXBkYXRlSW50ZXJmYWNl KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsLnByb3RvdHlwZS5nZXQgc3RhdHVzQmFy SXRlbXMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsLnByb3RvdHlwZS5y ZXNldCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlLl90 b2dnbGVMYXJnZXJSZXNvdXJjZXMpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU2Ny aXB0c1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbCk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5nZXQgc3RhdHVzQmFySXRl bXMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuX3VwZGF0 ZVBhdXNlT25FeGNlcHRpb25zQnV0dG9uKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRz UGFuZWwucHJvdG90eXBlLl91cGRhdGVEZWJ1Z2dlckJ1dHRvbnMpOgorICAgICAgICAqIGluc3Bl Y3Rvci9mcm9udC1lbmQvU3RhdHVzQmFyQnV0dG9uLmpzOiBBZGRlZC4KKyAgICAgICAgKFdlYklu c3BlY3Rvci5TdGF0dXNCYXJCdXR0b24pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0YXR1c0Jh ckJ1dHRvbi5wcm90b3R5cGUuX2NsaWNrZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0YXR1 c0JhckJ1dHRvbi5wcm90b3R5cGUuZ2V0IGRpc2FibGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5TdGF0dXNCYXJCdXR0b24ucHJvdG90eXBlLnNldCBkaXNhYmxlZCk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuU3RhdHVzQmFyQnV0dG9uLnByb3RvdHlwZS5nZXQgdGl0bGUpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlN0YXR1c0JhckJ1dHRvbi5wcm90b3R5cGUuc2V0IHRpdGxlKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5TdGF0dXNCYXJCdXR0b24ucHJvdG90eXBlLmdldCB0b2dnbGVkKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5TdGF0dXNCYXJCdXR0b24ucHJvdG90eXBlLnNldCB0b2dn bGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdGF0dXNCYXJCdXR0b24ucHJvdG90eXBlLmdl dCB2aXNpYmxlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdGF0dXNCYXJCdXR0b24ucHJvdG90 eXBlLnNldCB2aXNpYmxlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1dlYktpdC5x cmM6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuY3NzOiBGb3IgdW5p Zm9ybWl0eSwgY2xhc3MgbmFtZXMgYXJlIGFsd2F5cyB1c2VkIHRvIGlkZW50aWZ5IHN0YXR1cyBi YXIgYnV0dG9ucy4gQWxzbywgZml4ZWQgIlJlbG9hZCIgYnV0dG9uIHN0eWxlIHRvIHVzZSBnbHlw aHMuCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuaHRtbDoKKwogMjAw OS0wOC0xMiAgSm9zZXBoIFBlY29yYXJvICA8am9lcGVjazAyQGdtYWlsLmNvbT4KIAogICAgICAg ICBSZXZpZXdlZCBieSBUaW1vdGh5IEhhdGNoZXIuCmRpZmYgLS1naXQgYS9XZWJDb3JlL1dlYkNv cmUuZ3lwaSBiL1dlYkNvcmUvV2ViQ29yZS5neXBpCmluZGV4IDVlNTBiMDIuLmFkNjYxZjcgMTAw NjQ0Ci0tLSBhL1dlYkNvcmUvV2ViQ29yZS5neXBpCisrKyBiL1dlYkNvcmUvV2ViQ29yZS5neXBp CkBAIC0zNDY4LDYgKzM0NjgsNyBAQAogICAgICAgICAgICAgJ2luc3BlY3Rvci9mcm9udC1lbmQv U2lkZWJhclRyZWVFbGVtZW50LmpzJywKICAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5k L1NvdXJjZUZyYW1lLmpzJywKICAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJj ZVZpZXcuanMnLAorICAgICAgICAgICAgJ2luc3BlY3Rvci9mcm9udC1lbmQvU3RhdHVzQmFyQnV0 dG9uLmpzJywKICAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQ YW5lLmpzJywKICAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRQcm9tcHQuanMn LAogICAgICAgICAgICAgJ2luc3BlY3Rvci9mcm9udC1lbmQvVG9wRG93blByb2ZpbGVEYXRhR3Jp ZFRyZWUuanMnLApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9XZWJDb3JlLnZjcHJvai9XZWJDb3JlLnZj cHJvaiBiL1dlYkNvcmUvV2ViQ29yZS52Y3Byb2ovV2ViQ29yZS52Y3Byb2oKaW5kZXggN2ViOTYy Zi4uNzRlMTZjMiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9XZWJDb3JlLnZjcHJvai9XZWJDb3JlLnZj cHJvagorKysgYi9XZWJDb3JlL1dlYkNvcmUudmNwcm9qL1dlYkNvcmUudmNwcm9qCkBAIC0zMTIz MSw2ICszMTIzMSwxMCBAQAogCQkJCQk+DQogCQkJCTwvRmlsZT4NCiAJCQkJPEZpbGUNCisJCQkJ CVJlbGF0aXZlUGF0aD0iLi5caW5zcGVjdG9yXGZyb250LWVuZFxTdGF0dXNCYXJCdXR0b24uanMi DQorCQkJCQk+DQorCQkJCTwvRmlsZT4NCisJCQkJPEZpbGUNCiAJCQkJCVJlbGF0aXZlUGF0aD0i Li5caW5zcGVjdG9yXGZyb250LWVuZFxTdHlsZXNTaWRlYmFyUGFuZS5qcyINCiAJCQkJCT4NCiAJ CQkJPC9GaWxlPg0KZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db29r aWVJdGVtc1ZpZXcuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29va2llSXRlbXNW aWV3LmpzCmluZGV4IDQyZDIzNTEuLmI0ZDA1OWEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9Db29raWVJdGVtc1ZpZXcuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0Nvb2tpZUl0ZW1zVmlldy5qcwpAQCAtMzQsMjEgKzM0LDE4IEBAIFdlYkluc3Bl Y3Rvci5Db29raWVJdGVtc1ZpZXcgPSBmdW5jdGlvbigpCiAgICAgdGhpcy5lbGVtZW50LmFkZFN0 eWxlQ2xhc3MoInN0b3JhZ2UtdmlldyIpOwogICAgIHRoaXMuZWxlbWVudC5hZGRTdHlsZUNsYXNz KCJ0YWJsZSIpOwogCi0gICAgdGhpcy5kZWxldGVCdXR0b24gPSBkb2N1bWVudC5jcmVhdGVFbGVt ZW50KCJidXR0b24iKTsKLSAgICB0aGlzLmRlbGV0ZUJ1dHRvbi50aXRsZSA9IFdlYkluc3BlY3Rv ci5VSVN0cmluZygiRGVsZXRlIik7Ci0gICAgdGhpcy5kZWxldGVCdXR0b24uY2xhc3NOYW1lID0g ImRlbGV0ZS1zdG9yYWdlLXN0YXR1cy1iYXItaXRlbSBzdGF0dXMtYmFyLWl0ZW0gaGlkZGVuIjsK KyAgICB0aGlzLmRlbGV0ZUJ1dHRvbiA9IG5ldyBXZWJJbnNwZWN0b3IuU3RhdHVzQmFyQnV0dG9u KFdlYkluc3BlY3Rvci5VSVN0cmluZygiRGVsZXRlIiksICJkZWxldGUtc3RvcmFnZS1zdGF0dXMt YmFyLWl0ZW0iKTsKKyAgICB0aGlzLmRlbGV0ZUJ1dHRvbi52aXNpYmxlID0gZmFsc2U7CiAgICAg dGhpcy5kZWxldGVCdXR0b24uYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0aGlzLl9kZWxldGVC dXR0b25DbGlja2VkLmJpbmQodGhpcyksIGZhbHNlKTsKIAotICAgIHRoaXMucmVmcmVzaEJ1dHRv biA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImJ1dHRvbiIpOwotICAgIHRoaXMucmVmcmVzaEJ1 dHRvbi50aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiUmVmcmVzaCIpOwotICAgIHRoaXMu cmVmcmVzaEJ1dHRvbi5jbGFzc05hbWUgPSAicmVmcmVzaC1zdG9yYWdlLXN0YXR1cy1iYXItaXRl bSBzdGF0dXMtYmFyLWl0ZW0iOworICAgIHRoaXMucmVmcmVzaEJ1dHRvbiA9IG5ldyBXZWJJbnNw ZWN0b3IuU3RhdHVzQmFyQnV0dG9uKFdlYkluc3BlY3Rvci5VSVN0cmluZygiUmVmcmVzaCIpLCAi cmVmcmVzaC1zdG9yYWdlLXN0YXR1cy1iYXItaXRlbSIpOwogICAgIHRoaXMucmVmcmVzaEJ1dHRv bi5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuX3JlZnJlc2hCdXR0b25DbGlja2VkLmJp bmQodGhpcyksIGZhbHNlKTsKIH0KIAogV2ViSW5zcGVjdG9yLkNvb2tpZUl0ZW1zVmlldy5wcm90 b3R5cGUgPSB7CiAgICAgZ2V0IHN0YXR1c0Jhckl0ZW1zKCkKICAgICB7Ci0gICAgICAgIHJldHVy biBbdGhpcy5yZWZyZXNoQnV0dG9uLCB0aGlzLmRlbGV0ZUJ1dHRvbl07CisgICAgICAgIHJldHVy biBbdGhpcy5yZWZyZXNoQnV0dG9uLmVsZW1lbnQsIHRoaXMuZGVsZXRlQnV0dG9uLmVsZW1lbnRd OwogICAgIH0sCiAKICAgICBzaG93OiBmdW5jdGlvbihwYXJlbnRFbGVtZW50KQpAQCAtNjAsNyAr NTcsNyBAQCBXZWJJbnNwZWN0b3IuQ29va2llSXRlbXNWaWV3LnByb3RvdHlwZSA9IHsKICAgICBo aWRlOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICBXZWJJbnNwZWN0b3IuVmlldy5wcm90b3R5 cGUuaGlkZS5jYWxsKHRoaXMpOwotICAgICAgICB0aGlzLmRlbGV0ZUJ1dHRvbi5hZGRTdHlsZUNs YXNzKCJoaWRkZW4iKTsKKyAgICAgICAgdGhpcy5kZWxldGVCdXR0b24udmlzaWJsZSA9IGZhbHNl OwogICAgIH0sCiAKICAgICB1cGRhdGU6IGZ1bmN0aW9uKCkKQEAgLTcwLDE0ICs2NywxNCBAQCBX ZWJJbnNwZWN0b3IuQ29va2llSXRlbXNWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKGRh dGFHcmlkKSB7CiAgICAgICAgICAgICB0aGlzLl9kYXRhR3JpZCA9IGRhdGFHcmlkOwogICAgICAg ICAgICAgdGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKGRhdGFHcmlkLmVsZW1lbnQpOwotICAgICAg ICAgICAgdGhpcy5kZWxldGVCdXR0b24ucmVtb3ZlU3R5bGVDbGFzcygiaGlkZGVuIik7CisgICAg ICAgICAgICB0aGlzLmRlbGV0ZUJ1dHRvbi52aXNpYmxlID0gdHJ1ZTsKICAgICAgICAgfSBlbHNl IHsKICAgICAgICAgICAgIHZhciBlbXB0eU1zZ0VsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVt ZW50KCJkaXYiKTsKICAgICAgICAgICAgIGVtcHR5TXNnRWxlbWVudC5jbGFzc05hbWUgPSAic3Rv cmFnZS10YWJsZS1lbXB0eSI7CiAgICAgICAgICAgICBlbXB0eU1zZ0VsZW1lbnQudGV4dENvbnRl bnQgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlRoaXMgc2l0ZSBoYXMgbm8gY29va2llcy4iKTsK ICAgICAgICAgICAgIHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZChlbXB0eU1zZ0VsZW1lbnQpOwog ICAgICAgICAgICAgdGhpcy5fZGF0YUdyaWQgPSBudWxsOwotICAgICAgICAgICAgdGhpcy5kZWxl dGVCdXR0b24uYWRkU3R5bGVDbGFzcygiaGlkZGVuIik7CisgICAgICAgICAgICB0aGlzLmRlbGV0 ZUJ1dHRvbi52aXNpYmxlID0gZmFsc2U7CiAgICAgICAgIH0KICAgICB9LAogCmRpZmYgLS1naXQg YS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRE9NU3RvcmFnZUl0ZW1zVmlldy5qcyBiL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9ET01TdG9yYWdlSXRlbXNWaWV3LmpzCmluZGV4IGZh ZDZlM2MuLjUxNDg4M2YgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9E T01TdG9yYWdlSXRlbXNWaWV3LmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9E T01TdG9yYWdlSXRlbXNWaWV3LmpzCkBAIC0zMiwyMSArMzIsMTggQEAgV2ViSW5zcGVjdG9yLkRP TVN0b3JhZ2VJdGVtc1ZpZXcgPSBmdW5jdGlvbihkb21TdG9yYWdlKQogICAgIHRoaXMuZWxlbWVu dC5hZGRTdHlsZUNsYXNzKCJzdG9yYWdlLXZpZXciKTsKICAgICB0aGlzLmVsZW1lbnQuYWRkU3R5 bGVDbGFzcygidGFibGUiKTsKIAotICAgIHRoaXMuZGVsZXRlQnV0dG9uID0gZG9jdW1lbnQuY3Jl YXRlRWxlbWVudCgiYnV0dG9uIik7Ci0gICAgdGhpcy5kZWxldGVCdXR0b24udGl0bGUgPSBXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoIkRlbGV0ZSIpOwotICAgIHRoaXMuZGVsZXRlQnV0dG9uLmNsYXNz TmFtZSA9ICJkZWxldGUtc3RvcmFnZS1zdGF0dXMtYmFyLWl0ZW0gc3RhdHVzLWJhci1pdGVtIGhp ZGRlbiI7CisgICAgdGhpcy5kZWxldGVCdXR0b24gPSBuZXcgV2ViSW5zcGVjdG9yLlN0YXR1c0Jh ckJ1dHRvbihXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkRlbGV0ZSIpLCAiZGVsZXRlLXN0b3JhZ2Ut c3RhdHVzLWJhci1pdGVtIik7CisgICAgdGhpcy5kZWxldGVCdXR0b24udmlzaWJsZSA9IGZhbHNl OwogICAgIHRoaXMuZGVsZXRlQnV0dG9uLmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5f ZGVsZXRlQnV0dG9uQ2xpY2tlZC5iaW5kKHRoaXMpLCBmYWxzZSk7CiAKLSAgICB0aGlzLnJlZnJl c2hCdXR0b24gPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJidXR0b24iKTsKLSAgICB0aGlzLnJl ZnJlc2hCdXR0b24udGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlJlZnJlc2giKTsKLSAg ICB0aGlzLnJlZnJlc2hCdXR0b24uY2xhc3NOYW1lID0gInJlZnJlc2gtc3RvcmFnZS1zdGF0dXMt YmFyLWl0ZW0gc3RhdHVzLWJhci1pdGVtIjsKKyAgICB0aGlzLnJlZnJlc2hCdXR0b24gPSBuZXcg V2ViSW5zcGVjdG9yLlN0YXR1c0JhckJ1dHRvbihXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlJlZnJl c2giKSwgInJlZnJlc2gtc3RvcmFnZS1zdGF0dXMtYmFyLWl0ZW0iKTsKICAgICB0aGlzLnJlZnJl c2hCdXR0b24uYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0aGlzLl9yZWZyZXNoQnV0dG9uQ2xp Y2tlZC5iaW5kKHRoaXMpLCBmYWxzZSk7CiB9CiAKIFdlYkluc3BlY3Rvci5ET01TdG9yYWdlSXRl bXNWaWV3LnByb3RvdHlwZSA9IHsKICAgICBnZXQgc3RhdHVzQmFySXRlbXMoKQogICAgIHsKLSAg ICAgICAgcmV0dXJuIFt0aGlzLnJlZnJlc2hCdXR0b24sIHRoaXMuZGVsZXRlQnV0dG9uXTsKKyAg ICAgICAgcmV0dXJuIFt0aGlzLnJlZnJlc2hCdXR0b24uZWxlbWVudCwgdGhpcy5kZWxldGVCdXR0 b24uZWxlbWVudF07CiAgICAgfSwKIAogICAgIHNob3c6IGZ1bmN0aW9uKHBhcmVudEVsZW1lbnQp CkBAIC01OCw3ICs1NSw3IEBAIFdlYkluc3BlY3Rvci5ET01TdG9yYWdlSXRlbXNWaWV3LnByb3Rv dHlwZSA9IHsKICAgICBoaWRlOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICBXZWJJbnNwZWN0 b3IuVmlldy5wcm90b3R5cGUuaGlkZS5jYWxsKHRoaXMpOwotICAgICAgICB0aGlzLmRlbGV0ZUJ1 dHRvbi5hZGRTdHlsZUNsYXNzKCJoaWRkZW4iKTsKKyAgICAgICAgdGhpcy5kZWxldGVCdXR0b24u dmlzaWJsZSA9IGZhbHNlOwogICAgIH0sCiAKICAgICB1cGRhdGU6IGZ1bmN0aW9uKCkKQEAgLTc2 LDcgKzczLDcgQEAgV2ViSW5zcGVjdG9yLkRPTVN0b3JhZ2VJdGVtc1ZpZXcucHJvdG90eXBlID0g ewogICAgICAgICAgICAgICAgIHRoaXMuX2RhdGFHcmlkID0gZGF0YUdyaWQ7CiAgICAgICAgICAg ICAgICAgdGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKGRhdGFHcmlkLmVsZW1lbnQpOwogICAgICAg ICAgICAgICAgIHRoaXMuX2RhdGFHcmlkLnVwZGF0ZVdpZHRocygpOwotICAgICAgICAgICAgICAg IHRoaXMuZGVsZXRlQnV0dG9uLnJlbW92ZVN0eWxlQ2xhc3MoImhpZGRlbiIpOworICAgICAgICAg ICAgICAgIHRoaXMuZGVsZXRlQnV0dG9uLnZpc2libGUgPSB0cnVlOwogICAgICAgICAgICAgfQog ICAgICAgICB9CiAKQEAgLTg3LDcgKzg0LDcgQEAgV2ViSW5zcGVjdG9yLkRPTVN0b3JhZ2VJdGVt c1ZpZXcucHJvdG90eXBlID0gewogICAgICAgICAgICAgZW1wdHlNc2dFbGVtZW50LnRleHRDb250 ZW50ID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJUaGlzIHN0b3JhZ2UgaXMgZW1wdHkuIik7CiAg ICAgICAgICAgICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQoZW1wdHlNc2dFbGVtZW50KTsKICAg ICAgICAgICAgIHRoaXMuX2RhdGFHcmlkID0gbnVsbDsKLSAgICAgICAgICAgIHRoaXMuZGVsZXRl QnV0dG9uLmFkZFN0eWxlQ2xhc3MoImhpZGRlbiIpOworICAgICAgICAgICAgdGhpcy5kZWxldGVC dXR0b24udmlzaWJsZSA9IGZhbHNlOwogICAgICAgICB9CiAgICAgfSwKICAgICAKZGlmZiAtLWdp dCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1BhbmVsLmpzIGIvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzUGFuZWwuanMKaW5kZXggZmZhMDAwMC4uOTlm NjA3ZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzUGFu ZWwuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzUGFuZWwuanMK QEAgLTk3LDEwICs5Nyw3IEBAIFdlYkluc3BlY3Rvci5FbGVtZW50c1BhbmVsID0gZnVuY3Rpb24o KQogICAgIHRoaXMuc2lkZWJhclJlc2l6ZUVsZW1lbnQuY2xhc3NOYW1lID0gInNpZGViYXItcmVz aXplci12ZXJ0aWNhbCI7CiAgICAgdGhpcy5zaWRlYmFyUmVzaXplRWxlbWVudC5hZGRFdmVudExp c3RlbmVyKCJtb3VzZWRvd24iLCB0aGlzLnJpZ2h0U2lkZWJhclJlc2l6ZXJEcmFnU3RhcnQuYmlu ZCh0aGlzKSwgZmFsc2UpOwogCi0gICAgdGhpcy5ub2RlU2VhcmNoQnV0dG9uID0gdGhpcy5jcmVh dGVTdGF0dXNCYXJCdXR0b24oKTsKLSAgICB0aGlzLm5vZGVTZWFyY2hCdXR0b24udGl0bGUgPSBX ZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNlbGVjdCBhbiBlbGVtZW50IGluIHRoZSBwYWdlIHRvIGlu c3BlY3QgaXQuIik7Ci0gICAgdGhpcy5ub2RlU2VhcmNoQnV0dG9uLmlkID0gIm5vZGUtc2VhcmNo LXN0YXR1cy1iYXItaXRlbSI7Ci0gICAgdGhpcy5ub2RlU2VhcmNoQnV0dG9uLmNsYXNzTmFtZSA9 ICJzdGF0dXMtYmFyLWl0ZW0iOworICAgIHRoaXMubm9kZVNlYXJjaEJ1dHRvbiA9IG5ldyBXZWJJ bnNwZWN0b3IuU3RhdHVzQmFyQnV0dG9uKFdlYkluc3BlY3Rvci5VSVN0cmluZygiU2VsZWN0IGFu IGVsZW1lbnQgaW4gdGhlIHBhZ2UgdG8gaW5zcGVjdCBpdC4iKSwgIm5vZGUtc2VhcmNoLXN0YXR1 cy1iYXItaXRlbSIpOwogICAgIHRoaXMubm9kZVNlYXJjaEJ1dHRvbi5hZGRFdmVudExpc3RlbmVy KCJjbGljayIsIHRoaXMuX25vZGVTZWFyY2hCdXR0b25DbGlja2VkLmJpbmQodGhpcyksIGZhbHNl KTsKIAogICAgIHRoaXMuc2VhcmNoaW5nRm9yTm9kZSA9IGZhbHNlOwpAQCAtMTMwLDcgKzEyNyw3 IEBAIFdlYkluc3BlY3Rvci5FbGVtZW50c1BhbmVsLnByb3RvdHlwZSA9IHsKIAogICAgIGdldCBz dGF0dXNCYXJJdGVtcygpCiAgICAgewotICAgICAgICByZXR1cm4gW3RoaXMubm9kZVNlYXJjaEJ1 dHRvbiwgdGhpcy5jcnVtYnNFbGVtZW50XTsKKyAgICAgICAgcmV0dXJuIFt0aGlzLm5vZGVTZWFy Y2hCdXR0b24uZWxlbWVudCwgdGhpcy5jcnVtYnNFbGVtZW50XTsKICAgICB9LAogCiAgICAgdXBk YXRlU3RhdHVzQmFySXRlbXM6IGZ1bmN0aW9uKCkKQEAgLTE1Niw3ICsxNTMsNyBAQCBXZWJJbnNw ZWN0b3IuRWxlbWVudHNQYW5lbC5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgaWYgKEluc3BlY3Rv ckNvbnRyb2xsZXIuc2VhcmNoaW5nRm9yTm9kZSgpKSB7CiAgICAgICAgICAgICBJbnNwZWN0b3JD b250cm9sbGVyLnRvZ2dsZU5vZGVTZWFyY2goKTsKLSAgICAgICAgICAgIHRoaXMubm9kZVNlYXJj aEJ1dHRvbi5yZW1vdmVTdHlsZUNsYXNzKCJ0b2dnbGVkLW9uIik7CisgICAgICAgICAgICB0aGlz Lm5vZGVTZWFyY2hCdXR0b24udG9nZ2xlZCA9IGZhbHNlOwogICAgICAgICB9CiAgICAgfSwKIApA QCAtMTc1LDcgKzE3Miw3IEBAIFdlYkluc3BlY3Rvci5FbGVtZW50c1BhbmVsLnByb3RvdHlwZSA9 IHsKIAogICAgICAgICBpZiAoSW5zcGVjdG9yQ29udHJvbGxlci5zZWFyY2hpbmdGb3JOb2RlKCkp IHsKICAgICAgICAgICAgIEluc3BlY3RvckNvbnRyb2xsZXIudG9nZ2xlTm9kZVNlYXJjaCgpOwot ICAgICAgICAgICAgdGhpcy5ub2RlU2VhcmNoQnV0dG9uLnJlbW92ZVN0eWxlQ2xhc3MoInRvZ2ds ZWQtb24iKTsKKyAgICAgICAgICAgIHRoaXMubm9kZVNlYXJjaEJ1dHRvbi50b2dnbGVkID0gZmFs c2U7CiAgICAgICAgIH0KIAogICAgICAgICB0aGlzLnJlY2VudGx5TW9kaWZpZWROb2RlcyA9IFtd OwpAQCAtMTMxNiwxMCArMTMxMyw3IEBAIFdlYkluc3BlY3Rvci5FbGVtZW50c1BhbmVsLnByb3Rv dHlwZSA9IHsKICAgICB7CiAgICAgICAgIEluc3BlY3RvckNvbnRyb2xsZXIudG9nZ2xlTm9kZVNl YXJjaCgpOwogCi0gICAgICAgIGlmIChJbnNwZWN0b3JDb250cm9sbGVyLnNlYXJjaGluZ0Zvck5v ZGUoKSkKLSAgICAgICAgICAgIHRoaXMubm9kZVNlYXJjaEJ1dHRvbi5hZGRTdHlsZUNsYXNzKCJ0 b2dnbGVkLW9uIik7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIHRoaXMubm9kZVNlYXJjaEJ1 dHRvbi5yZW1vdmVTdHlsZUNsYXNzKCJ0b2dnbGVkLW9uIik7CisgICAgICAgIHRoaXMubm9kZVNl YXJjaEJ1dHRvbi50b2dnbGVkID0gSW5zcGVjdG9yQ29udHJvbGxlci5zZWFyY2hpbmdGb3JOb2Rl KCk7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv UGFuZWwuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUGFuZWwuanMKaW5kZXggM2Uy MjEyYy4uNTA0NmY2YiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Bh bmVsLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9QYW5lbC5qcwpAQCAtNjYs MTggKzY2LDYgQEAgV2ViSW5zcGVjdG9yLlBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0 dXJuIHRoaXMuX3Rvb2xiYXJJdGVtOwogICAgIH0sCiAKLSAgICBjcmVhdGVTdGF0dXNCYXJCdXR0 b246IGZ1bmN0aW9uKCkKLSAgICB7Ci0gICAgICAgIHZhciBidXR0b24gPSBkb2N1bWVudC5jcmVh dGVFbGVtZW50KCJidXR0b24iKTsKLSAgICAgICAgdmFyIGdseXBoID0gZG9jdW1lbnQuY3JlYXRl RWxlbWVudCgiZGl2Iik7Ci0gICAgICAgIGdseXBoLmNsYXNzTmFtZSA9ICJnbHlwaCI7Ci0gICAg ICAgIGJ1dHRvbi5hcHBlbmRDaGlsZChnbHlwaCk7Ci0gICAgICAgIHZhciBnbHlwaFNoYWRvdyA9 IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwotICAgICAgICBnbHlwaFNoYWRvdy5jbGFz c05hbWUgPSAiZ2x5cGggc2hhZG93IjsKLSAgICAgICAgYnV0dG9uLmFwcGVuZENoaWxkKGdseXBo U2hhZG93KTsKLSAgICAgICAgcmV0dXJuIGJ1dHRvbjsKLSAgICB9LAotCiAgICAgc2hvdzogZnVu Y3Rpb24oKQogICAgIHsKICAgICAgICAgV2ViSW5zcGVjdG9yLlZpZXcucHJvdG90eXBlLnNob3cu Y2FsbCh0aGlzKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9m aWxlVmlldy5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlVmlldy5qcwpp bmRleCAyNTE3YmQyLi41YzlmY2RhIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvUHJvZmlsZVZpZXcuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1By b2ZpbGVWaWV3LmpzCkBAIC01NiwyNSArNTYsMTkgQEAgV2ViSW5zcGVjdG9yLlByb2ZpbGVWaWV3 ID0gZnVuY3Rpb24ocHJvZmlsZSkKICAgICB0aGlzLnZpZXdTZWxlY3RFbGVtZW50LmFwcGVuZENo aWxkKGhlYXZ5Vmlld09wdGlvbik7CiAgICAgdGhpcy52aWV3U2VsZWN0RWxlbWVudC5hcHBlbmRD aGlsZCh0cmVlVmlld09wdGlvbik7CiAKLSAgICB0aGlzLnBlcmNlbnRCdXR0b24gPSBkb2N1bWVu dC5jcmVhdGVFbGVtZW50KCJidXR0b24iKTsKLSAgICB0aGlzLnBlcmNlbnRCdXR0b24uY2xhc3NO YW1lID0gInBlcmNlbnQtdGltZS1zdGF0dXMtYmFyLWl0ZW0gc3RhdHVzLWJhci1pdGVtIjsKKyAg ICB0aGlzLnBlcmNlbnRCdXR0b24gPSBuZXcgV2ViSW5zcGVjdG9yLlN0YXR1c0JhckJ1dHRvbigi IiwgInBlcmNlbnQtdGltZS1zdGF0dXMtYmFyLWl0ZW0iKTsKICAgICB0aGlzLnBlcmNlbnRCdXR0 b24uYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0aGlzLl9wZXJjZW50Q2xpY2tlZC5iaW5kKHRo aXMpLCBmYWxzZSk7CiAKLSAgICB0aGlzLmZvY3VzQnV0dG9uID0gZG9jdW1lbnQuY3JlYXRlRWxl bWVudCgiYnV0dG9uIik7Ci0gICAgdGhpcy5mb2N1c0J1dHRvbi50aXRsZSA9IFdlYkluc3BlY3Rv ci5VSVN0cmluZygiRm9jdXMgc2VsZWN0ZWQgZnVuY3Rpb24uIik7Ci0gICAgdGhpcy5mb2N1c0J1 dHRvbi5jbGFzc05hbWUgPSAiZm9jdXMtcHJvZmlsZS1ub2RlLXN0YXR1cy1iYXItaXRlbSBzdGF0 dXMtYmFyLWl0ZW0iOworICAgIHRoaXMuZm9jdXNCdXR0b24gPSBuZXcgV2ViSW5zcGVjdG9yLlN0 YXR1c0JhckJ1dHRvbihXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkZvY3VzIHNlbGVjdGVkIGZ1bmN0 aW9uLiIpLCAiZm9jdXMtcHJvZmlsZS1ub2RlLXN0YXR1cy1iYXItaXRlbSIpOwogICAgIHRoaXMu Zm9jdXNCdXR0b24uZGlzYWJsZWQgPSB0cnVlOwogICAgIHRoaXMuZm9jdXNCdXR0b24uYWRkRXZl bnRMaXN0ZW5lcigiY2xpY2siLCB0aGlzLl9mb2N1c0NsaWNrZWQuYmluZCh0aGlzKSwgZmFsc2Up OwogCi0gICAgdGhpcy5leGNsdWRlQnV0dG9uID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiYnV0 dG9uIik7Ci0gICAgdGhpcy5leGNsdWRlQnV0dG9uLnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3Ry aW5nKCJFeGNsdWRlIHNlbGVjdGVkIGZ1bmN0aW9uLiIpOwotICAgIHRoaXMuZXhjbHVkZUJ1dHRv bi5jbGFzc05hbWUgPSAiZXhjbHVkZS1wcm9maWxlLW5vZGUtc3RhdHVzLWJhci1pdGVtIHN0YXR1 cy1iYXItaXRlbSI7CisgICAgdGhpcy5leGNsdWRlQnV0dG9uID0gbmV3IFdlYkluc3BlY3Rvci5T dGF0dXNCYXJCdXR0b24oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJFeGNsdWRlIHNlbGVjdGVkIGZ1 bmN0aW9uLiIpLCAiZXhjbHVkZS1wcm9maWxlLW5vZGUtc3RhdHVzLWJhci1pdGVtIik7CiAgICAg dGhpcy5leGNsdWRlQnV0dG9uLmRpc2FibGVkID0gdHJ1ZTsKICAgICB0aGlzLmV4Y2x1ZGVCdXR0 b24uYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0aGlzLl9leGNsdWRlQ2xpY2tlZC5iaW5kKHRo aXMpLCBmYWxzZSk7CiAKLSAgICB0aGlzLnJlc2V0QnV0dG9uID0gZG9jdW1lbnQuY3JlYXRlRWxl bWVudCgiYnV0dG9uIik7Ci0gICAgdGhpcy5yZXNldEJ1dHRvbi50aXRsZSA9IFdlYkluc3BlY3Rv ci5VSVN0cmluZygiUmVzdG9yZSBhbGwgZnVuY3Rpb25zLiIpOwotICAgIHRoaXMucmVzZXRCdXR0 b24uY2xhc3NOYW1lID0gInJlc2V0LXByb2ZpbGUtc3RhdHVzLWJhci1pdGVtIHN0YXR1cy1iYXIt aXRlbSBoaWRkZW4iOworICAgIHRoaXMucmVzZXRCdXR0b24gPSBuZXcgV2ViSW5zcGVjdG9yLlN0 YXR1c0JhckJ1dHRvbihXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlJlc3RvcmUgYWxsIGZ1bmN0aW9u cy4iKSwgInJlc2V0LXByb2ZpbGUtc3RhdHVzLWJhci1pdGVtIik7CisgICAgdGhpcy5yZXNldEJ1 dHRvbi52aXNpYmxlID0gZmFsc2U7CiAgICAgdGhpcy5yZXNldEJ1dHRvbi5hZGRFdmVudExpc3Rl bmVyKCJjbGljayIsIHRoaXMuX3Jlc2V0Q2xpY2tlZC5iaW5kKHRoaXMpLCBmYWxzZSk7CiAKICAg ICB0aGlzLnByb2ZpbGUgPSBwcm9maWxlOwpAQCAtOTAsNyArODQsNyBAQCBXZWJJbnNwZWN0b3Iu UHJvZmlsZVZpZXcgPSBmdW5jdGlvbihwcm9maWxlKQogV2ViSW5zcGVjdG9yLlByb2ZpbGVWaWV3 LnByb3RvdHlwZSA9IHsKICAgICBnZXQgc3RhdHVzQmFySXRlbXMoKQogICAgIHsKLSAgICAgICAg cmV0dXJuIFt0aGlzLnZpZXdTZWxlY3RFbGVtZW50LCB0aGlzLnBlcmNlbnRCdXR0b24sIHRoaXMu Zm9jdXNCdXR0b24sIHRoaXMuZXhjbHVkZUJ1dHRvbiwgdGhpcy5yZXNldEJ1dHRvbl07CisgICAg ICAgIHJldHVybiBbdGhpcy52aWV3U2VsZWN0RWxlbWVudCwgdGhpcy5wZXJjZW50QnV0dG9uLmVs ZW1lbnQsIHRoaXMuZm9jdXNCdXR0b24uZWxlbWVudCwgdGhpcy5leGNsdWRlQnV0dG9uLmVsZW1l bnQsIHRoaXMucmVzZXRCdXR0b24uZWxlbWVudF07CiAgICAgfSwKIAogICAgIGdldCBwcm9maWxl KCkKQEAgLTQzOSwxMCArNDMzLDEwIEBAIFdlYkluc3BlY3Rvci5Qcm9maWxlVmlldy5wcm90b3R5 cGUgPSB7CiAgICAgewogICAgICAgICBpZiAodGhpcy5zaG93U2VsZlRpbWVBc1BlcmNlbnQgJiYg dGhpcy5zaG93VG90YWxUaW1lQXNQZXJjZW50ICYmIHRoaXMuc2hvd0F2ZXJhZ2VUaW1lQXNQZXJj ZW50KSB7CiAgICAgICAgICAgICB0aGlzLnBlcmNlbnRCdXR0b24udGl0bGUgPSBXZWJJbnNwZWN0 b3IuVUlTdHJpbmcoIlNob3cgYWJzb2x1dGUgdG90YWwgYW5kIHNlbGYgdGltZXMuIik7Ci0gICAg ICAgICAgICB0aGlzLnBlcmNlbnRCdXR0b24uYWRkU3R5bGVDbGFzcygidG9nZ2xlZC1vbiIpOwor ICAgICAgICAgICAgdGhpcy5wZXJjZW50QnV0dG9uLnRvZ2dsZWQgPSB0cnVlOwogICAgICAgICB9 IGVsc2UgewogICAgICAgICAgICAgdGhpcy5wZXJjZW50QnV0dG9uLnRpdGxlID0gV2ViSW5zcGVj dG9yLlVJU3RyaW5nKCJTaG93IHRvdGFsIGFuZCBzZWxmIHRpbWVzIGFzIHBlcmNlbnRhZ2VzLiIp OwotICAgICAgICAgICAgdGhpcy5wZXJjZW50QnV0dG9uLnJlbW92ZVN0eWxlQ2xhc3MoInRvZ2ds ZWQtb24iKTsKKyAgICAgICAgICAgIHRoaXMucGVyY2VudEJ1dHRvbi50b2dnbGVkID0gZmFsc2U7 CiAgICAgICAgIH0KICAgICB9LAogCkBAIC00NTEsNyArNDQ1LDcgQEAgV2ViSW5zcGVjdG9yLlBy b2ZpbGVWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKCF0aGlzLmRhdGFHcmlkLnNlbGVj dGVkTm9kZSkKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICB0aGlzLnJlc2V0QnV0dG9u LnJlbW92ZVN0eWxlQ2xhc3MoImhpZGRlbiIpOworICAgICAgICB0aGlzLnJlc2V0QnV0dG9uLnZp c2libGUgPSB0cnVlOwogICAgICAgICB0aGlzLnByb2ZpbGVEYXRhR3JpZFRyZWUuZm9jdXModGhp cy5kYXRhR3JpZC5zZWxlY3RlZE5vZGUpOwogICAgICAgICB0aGlzLnJlZnJlc2goKTsKICAgICAg ICAgdGhpcy5yZWZyZXNoVmlzaWJsZURhdGEoKTsKQEAgLTQ2Niw3ICs0NjAsNyBAQCBXZWJJbnNw ZWN0b3IuUHJvZmlsZVZpZXcucHJvdG90eXBlID0gewogCiAgICAgICAgIHNlbGVjdGVkTm9kZS5k ZXNlbGVjdCgpOwogCi0gICAgICAgIHRoaXMucmVzZXRCdXR0b24ucmVtb3ZlU3R5bGVDbGFzcygi aGlkZGVuIik7CisgICAgICAgIHRoaXMucmVzZXRCdXR0b24udmlzaWJsZSA9IHRydWU7CiAgICAg ICAgIHRoaXMucHJvZmlsZURhdGFHcmlkVHJlZS5leGNsdWRlKHNlbGVjdGVkTm9kZSk7CiAgICAg ICAgIHRoaXMucmVmcmVzaCgpOwogICAgICAgICB0aGlzLnJlZnJlc2hWaXNpYmxlRGF0YSgpOwpA QCAtNDc0LDcgKzQ2OCw3IEBAIFdlYkluc3BlY3Rvci5Qcm9maWxlVmlldy5wcm90b3R5cGUgPSB7 CiAKICAgICBfcmVzZXRDbGlja2VkOiBmdW5jdGlvbihldmVudCkKICAgICB7Ci0gICAgICAgIHRo aXMucmVzZXRCdXR0b24uYWRkU3R5bGVDbGFzcygiaGlkZGVuIik7CisgICAgICAgIHRoaXMucmVz ZXRCdXR0b24udmlzaWJsZSA9IGZhbHNlOwogICAgICAgICB0aGlzLnByb2ZpbGVEYXRhR3JpZFRy ZWUucmVzdG9yZSgpOwogICAgICAgICB0aGlzLnJlZnJlc2goKTsKICAgICAgICAgdGhpcy5yZWZy ZXNoVmlzaWJsZURhdGEoKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9Qcm9maWxlc1BhbmVsLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVz UGFuZWwuanMKaW5kZXggYzhiOTQ4YS4uZTdlZTA2NCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVzUGFuZWwuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1Byb2ZpbGVzUGFuZWwuanMKQEAgLTU5LDE0ICs1OSwxMCBAQCBXZWJJbnNwZWN0 b3IuUHJvZmlsZXNQYW5lbCA9IGZ1bmN0aW9uKCkKICAgICB0aGlzLnByb2ZpbGVWaWV3cy5pZCA9 ICJwcm9maWxlLXZpZXdzIjsKICAgICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5wcm9m aWxlVmlld3MpOwogCi0gICAgdGhpcy5lbmFibGVUb2dnbGVCdXR0b24gPSB0aGlzLmNyZWF0ZVN0 YXR1c0JhckJ1dHRvbigpOwotICAgIHRoaXMuZW5hYmxlVG9nZ2xlQnV0dG9uLmNsYXNzTmFtZSA9 ICJlbmFibGUtdG9nZ2xlLXN0YXR1cy1iYXItaXRlbSBzdGF0dXMtYmFyLWl0ZW0iOworICAgIHRo aXMuZW5hYmxlVG9nZ2xlQnV0dG9uID0gbmV3IFdlYkluc3BlY3Rvci5TdGF0dXNCYXJCdXR0b24o IiIsICJlbmFibGUtdG9nZ2xlLXN0YXR1cy1iYXItaXRlbSIpOwogICAgIHRoaXMuZW5hYmxlVG9n Z2xlQnV0dG9uLmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5fdG9nZ2xlUHJvZmlsaW5n LmJpbmQodGhpcyksIGZhbHNlKTsKIAotICAgIHRoaXMucmVjb3JkQnV0dG9uID0gdGhpcy5jcmVh dGVTdGF0dXNCYXJCdXR0b24oKTsKLSAgICB0aGlzLnJlY29yZEJ1dHRvbi50aXRsZSA9IFdlYklu c3BlY3Rvci5VSVN0cmluZygiU3RhcnQgcHJvZmlsaW5nLiIpOwotICAgIHRoaXMucmVjb3JkQnV0 dG9uLmlkID0gInJlY29yZC1wcm9maWxlLXN0YXR1cy1iYXItaXRlbSI7Ci0gICAgdGhpcy5yZWNv cmRCdXR0b24uY2xhc3NOYW1lID0gInN0YXR1cy1iYXItaXRlbSI7CisgICAgdGhpcy5yZWNvcmRC dXR0b24gPSBuZXcgV2ViSW5zcGVjdG9yLlN0YXR1c0JhckJ1dHRvbihXZWJJbnNwZWN0b3IuVUlT dHJpbmcoIlN0YXJ0IHByb2ZpbGluZy4iKSwgInJlY29yZC1wcm9maWxlLXN0YXR1cy1iYXItaXRl bSIpOwogICAgIHRoaXMucmVjb3JkQnV0dG9uLmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhp cy5fcmVjb3JkQ2xpY2tlZC5iaW5kKHRoaXMpLCBmYWxzZSk7CiAKICAgICB0aGlzLnJlY29yZGlu ZyA9IGZhbHNlOwpAQCAtODcsNyArODMsNyBAQCBXZWJJbnNwZWN0b3IuUHJvZmlsZXNQYW5lbC5w cm90b3R5cGUgPSB7CiAKICAgICBnZXQgc3RhdHVzQmFySXRlbXMoKQogICAgIHsKLSAgICAgICAg cmV0dXJuIFt0aGlzLmVuYWJsZVRvZ2dsZUJ1dHRvbiwgdGhpcy5yZWNvcmRCdXR0b24sIHRoaXMu cHJvZmlsZVZpZXdTdGF0dXNCYXJJdGVtc0NvbnRhaW5lcl07CisgICAgICAgIHJldHVybiBbdGhp cy5lbmFibGVUb2dnbGVCdXR0b24uZWxlbWVudCwgdGhpcy5yZWNvcmRCdXR0b24uZWxlbWVudCwg dGhpcy5wcm9maWxlVmlld1N0YXR1c0Jhckl0ZW1zQ29udGFpbmVyXTsKICAgICB9LAogCiAgICAg c2hvdzogZnVuY3Rpb24oKQpAQCAtMzE3LDEwICszMTMsMTAgQEAgV2ViSW5zcGVjdG9yLlByb2Zp bGVzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLnJlY29yZGluZyA9IGlzUHJvZmls aW5nOwogCiAgICAgICAgIGlmIChpc1Byb2ZpbGluZykgewotICAgICAgICAgICAgdGhpcy5yZWNv cmRCdXR0b24uYWRkU3R5bGVDbGFzcygidG9nZ2xlZC1vbiIpOworICAgICAgICAgICAgdGhpcy5y ZWNvcmRCdXR0b24udG9nZ2xlZCA9IHRydWU7CiAgICAgICAgICAgICB0aGlzLnJlY29yZEJ1dHRv bi50aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiU3RvcCBwcm9maWxpbmcuIik7CiAgICAg ICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICB0aGlzLnJlY29yZEJ1dHRvbi5yZW1vdmVTdHlsZUNs YXNzKCJ0b2dnbGVkLW9uIik7CisgICAgICAgICAgICB0aGlzLnJlY29yZEJ1dHRvbi50b2dnbGVk ID0gZmFsc2U7CiAgICAgICAgICAgICB0aGlzLnJlY29yZEJ1dHRvbi50aXRsZSA9IFdlYkluc3Bl Y3Rvci5VSVN0cmluZygiU3RhcnQgcHJvZmlsaW5nLiIpOwogICAgICAgICB9CiAgICAgfSwKQEAg LTMzNiwxNCArMzMyLDE0IEBAIFdlYkluc3BlY3Rvci5Qcm9maWxlc1BhbmVsLnByb3RvdHlwZSA9 IHsKICAgICB7CiAgICAgICAgIGlmIChJbnNwZWN0b3JDb250cm9sbGVyLnByb2ZpbGVyRW5hYmxl ZCgpKSB7CiAgICAgICAgICAgICB0aGlzLmVuYWJsZVRvZ2dsZUJ1dHRvbi50aXRsZSA9IFdlYklu c3BlY3Rvci5VSVN0cmluZygiUHJvZmlsaW5nIGVuYWJsZWQuIENsaWNrIHRvIGRpc2FibGUuIik7 Ci0gICAgICAgICAgICB0aGlzLmVuYWJsZVRvZ2dsZUJ1dHRvbi5hZGRTdHlsZUNsYXNzKCJ0b2dn bGVkLW9uIik7Ci0gICAgICAgICAgICB0aGlzLnJlY29yZEJ1dHRvbi5yZW1vdmVTdHlsZUNsYXNz KCJoaWRkZW4iKTsKKyAgICAgICAgICAgIHRoaXMuZW5hYmxlVG9nZ2xlQnV0dG9uLnRvZ2dsZWQg PSB0cnVlOworICAgICAgICAgICAgdGhpcy5yZWNvcmRCdXR0b24udmlzaWJsZSA9IHRydWU7CiAg ICAgICAgICAgICB0aGlzLnByb2ZpbGVWaWV3U3RhdHVzQmFySXRlbXNDb250YWluZXIucmVtb3Zl U3R5bGVDbGFzcygiaGlkZGVuIik7CiAgICAgICAgICAgICB0aGlzLnBhbmVsRW5hYmxlclZpZXcu dmlzaWJsZSA9IGZhbHNlOwogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgdGhpcy5lbmFi bGVUb2dnbGVCdXR0b24udGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlByb2ZpbGluZyBk aXNhYmxlZC4gQ2xpY2sgdG8gZW5hYmxlLiIpOwotICAgICAgICAgICAgdGhpcy5lbmFibGVUb2dn bGVCdXR0b24ucmVtb3ZlU3R5bGVDbGFzcygidG9nZ2xlZC1vbiIpOwotICAgICAgICAgICAgdGhp cy5yZWNvcmRCdXR0b24uYWRkU3R5bGVDbGFzcygiaGlkZGVuIik7CisgICAgICAgICAgICB0aGlz LmVuYWJsZVRvZ2dsZUJ1dHRvbi50b2dnbGVkID0gZmFsc2U7CisgICAgICAgICAgICB0aGlzLnJl Y29yZEJ1dHRvbi52aXNpYmxlID0gZmFsc2U7CiAgICAgICAgICAgICB0aGlzLnByb2ZpbGVWaWV3 U3RhdHVzQmFySXRlbXNDb250YWluZXIuYWRkU3R5bGVDbGFzcygiaGlkZGVuIik7CiAgICAgICAg ICAgICB0aGlzLnBhbmVsRW5hYmxlclZpZXcudmlzaWJsZSA9IHRydWU7CiAgICAgICAgIH0KZGlm ZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcyBi L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcwppbmRleCBmYjQz NTUxLi5hZTM2OWIyIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVz b3VyY2VzUGFuZWwuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNl c1BhbmVsLmpzCkBAIC0xMzksMTQgKzEzOSwxMSBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFu ZWwgPSBmdW5jdGlvbigpCiAKICAgICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5wYW5l bEVuYWJsZXJWaWV3LmVsZW1lbnQpOwogCi0gICAgdGhpcy5lbmFibGVUb2dnbGVCdXR0b24gPSB0 aGlzLmNyZWF0ZVN0YXR1c0JhckJ1dHRvbigpOwotICAgIHRoaXMuZW5hYmxlVG9nZ2xlQnV0dG9u LmNsYXNzTmFtZSA9ICJlbmFibGUtdG9nZ2xlLXN0YXR1cy1iYXItaXRlbSBzdGF0dXMtYmFyLWl0 ZW0iOworICAgIHRoaXMuZW5hYmxlVG9nZ2xlQnV0dG9uID0gbmV3IFdlYkluc3BlY3Rvci5TdGF0 dXNCYXJCdXR0b24oIiIsICJlbmFibGUtdG9nZ2xlLXN0YXR1cy1iYXItaXRlbSIpOwogICAgIHRo aXMuZW5hYmxlVG9nZ2xlQnV0dG9uLmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5fdG9n Z2xlUmVzb3VyY2VUcmFja2luZy5iaW5kKHRoaXMpLCBmYWxzZSk7CiAKLSAgICB0aGlzLmxhcmdl clJlc291cmNlc0J1dHRvbiA9IHRoaXMuY3JlYXRlU3RhdHVzQmFyQnV0dG9uKCk7Ci0gICAgdGhp cy5sYXJnZXJSZXNvdXJjZXNCdXR0b24uaWQgPSAicmVzb3VyY2VzLWxhcmdlci1yZXNvdXJjZXMt c3RhdHVzLWJhci1pdGVtIjsKLSAgICB0aGlzLmxhcmdlclJlc291cmNlc0J1dHRvbi5jbGFzc05h bWUgPSAic3RhdHVzLWJhci1pdGVtIHRvZ2dsZWQtb24iOwotICAgIHRoaXMubGFyZ2VyUmVzb3Vy Y2VzQnV0dG9uLnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJVc2Ugc21hbGwgcmVzb3Vy Y2Ugcm93cy4iKTsKKyAgICB0aGlzLmxhcmdlclJlc291cmNlc0J1dHRvbiA9IG5ldyBXZWJJbnNw ZWN0b3IuU3RhdHVzQmFyQnV0dG9uKFdlYkluc3BlY3Rvci5VSVN0cmluZygiVXNlIHNtYWxsIHJl c291cmNlIHJvd3MuIiksICJyZXNvdXJjZXMtbGFyZ2VyLXJlc291cmNlcy1zdGF0dXMtYmFyLWl0 ZW0iKTsKKyAgICB0aGlzLmxhcmdlclJlc291cmNlc0J1dHRvbi50b2dnbGVkID0gdHJ1ZTsKICAg ICB0aGlzLmxhcmdlclJlc291cmNlc0J1dHRvbi5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRo aXMuX3RvZ2dsZUxhcmdlclJlc291cmNlcy5iaW5kKHRoaXMpLCBmYWxzZSk7CiAKICAgICB0aGlz LnNvcnRpbmdTZWxlY3RFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgic2VsZWN0Iik7 CkBAIC0yMTEsNyArMjA4LDcgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsLnByb3RvdHlw ZSA9IHsKIAogICAgIGdldCBzdGF0dXNCYXJJdGVtcygpCiAgICAgewotICAgICAgICByZXR1cm4g W3RoaXMuZW5hYmxlVG9nZ2xlQnV0dG9uLCB0aGlzLmxhcmdlclJlc291cmNlc0J1dHRvbiwgdGhp cy5zb3J0aW5nU2VsZWN0RWxlbWVudF07CisgICAgICAgIHJldHVybiBbdGhpcy5lbmFibGVUb2dn bGVCdXR0b24uZWxlbWVudCwgdGhpcy5sYXJnZXJSZXNvdXJjZXNCdXR0b24uZWxlbWVudCwgdGhp cy5zb3J0aW5nU2VsZWN0RWxlbWVudF07CiAgICAgfSwKIAogICAgIHNob3c6IGZ1bmN0aW9uKCkK QEAgLTQ2NywxNCArNDY0LDE0IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5 cGUgPSB7CiAKICAgICAgICAgaWYgKEluc3BlY3RvckNvbnRyb2xsZXIucmVzb3VyY2VUcmFja2lu Z0VuYWJsZWQoKSkgewogICAgICAgICAgICAgdGhpcy5lbmFibGVUb2dnbGVCdXR0b24udGl0bGUg PSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlJlc291cmNlIHRyYWNraW5nIGVuYWJsZWQuIENsaWNr IHRvIGRpc2FibGUuIik7Ci0gICAgICAgICAgICB0aGlzLmVuYWJsZVRvZ2dsZUJ1dHRvbi5hZGRT dHlsZUNsYXNzKCJ0b2dnbGVkLW9uIik7Ci0gICAgICAgICAgICB0aGlzLmxhcmdlclJlc291cmNl c0J1dHRvbi5yZW1vdmVTdHlsZUNsYXNzKCJoaWRkZW4iKTsKKyAgICAgICAgICAgIHRoaXMuZW5h YmxlVG9nZ2xlQnV0dG9uLnRvZ2dsZWQgPSB0cnVlOworICAgICAgICAgICAgdGhpcy5sYXJnZXJS ZXNvdXJjZXNCdXR0b24udmlzaWJsZSA9IHRydWU7CiAgICAgICAgICAgICB0aGlzLnNvcnRpbmdT ZWxlY3RFbGVtZW50LnJlbW92ZVN0eWxlQ2xhc3MoImhpZGRlbiIpOwogICAgICAgICAgICAgdGhp cy5wYW5lbEVuYWJsZXJWaWV3LnZpc2libGUgPSBmYWxzZTsKICAgICAgICAgfSBlbHNlIHsKICAg ICAgICAgICAgIHRoaXMuZW5hYmxlVG9nZ2xlQnV0dG9uLnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJ U3RyaW5nKCJSZXNvdXJjZSB0cmFja2luZyBkaXNhYmxlZC4gQ2xpY2sgdG8gZW5hYmxlLiIpOwot ICAgICAgICAgICAgdGhpcy5lbmFibGVUb2dnbGVCdXR0b24ucmVtb3ZlU3R5bGVDbGFzcygidG9n Z2xlZC1vbiIpOwotICAgICAgICAgICAgdGhpcy5sYXJnZXJSZXNvdXJjZXNCdXR0b24uYWRkU3R5 bGVDbGFzcygiaGlkZGVuIik7CisgICAgICAgICAgICB0aGlzLmVuYWJsZVRvZ2dsZUJ1dHRvbi50 b2dnbGVkID0gZmFsc2U7CisgICAgICAgICAgICB0aGlzLmxhcmdlclJlc291cmNlc0J1dHRvbi52 aXNpYmxlID0gZmFsc2U7CiAgICAgICAgICAgICB0aGlzLnNvcnRpbmdTZWxlY3RFbGVtZW50LmFk ZFN0eWxlQ2xhc3MoImhpZGRlbiIpOwogICAgICAgICAgICAgdGhpcy5wYW5lbEVuYWJsZXJWaWV3 LnZpc2libGUgPSB0cnVlOwogICAgICAgICB9CkBAIC0xMDc2LDEyICsxMDczLDEyIEBAIFdlYklu c3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIGlmICh0aGlzLnJl c291cmNlc1RyZWVFbGVtZW50LnNtYWxsQ2hpbGRyZW4pIHsKICAgICAgICAgICAgIHRoaXMucmVz b3VyY2VzR3JhcGhzRWxlbWVudC5hZGRTdHlsZUNsYXNzKCJzbWFsbCIpOwogICAgICAgICAgICAg dGhpcy5sYXJnZXJSZXNvdXJjZXNCdXR0b24udGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmco IlVzZSBsYXJnZSByZXNvdXJjZSByb3dzLiIpOwotICAgICAgICAgICAgdGhpcy5sYXJnZXJSZXNv dXJjZXNCdXR0b24ucmVtb3ZlU3R5bGVDbGFzcygidG9nZ2xlZC1vbiIpOworICAgICAgICAgICAg dGhpcy5sYXJnZXJSZXNvdXJjZXNCdXR0b24udG9nZ2xlZCA9IGZhbHNlOwogICAgICAgICAgICAg dGhpcy5fYWRqdXN0U2Nyb2xsUG9zaXRpb24oKTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAg ICAgIHRoaXMucmVzb3VyY2VzR3JhcGhzRWxlbWVudC5yZW1vdmVTdHlsZUNsYXNzKCJzbWFsbCIp OwogICAgICAgICAgICAgdGhpcy5sYXJnZXJSZXNvdXJjZXNCdXR0b24udGl0bGUgPSBXZWJJbnNw ZWN0b3IuVUlTdHJpbmcoIlVzZSBzbWFsbCByZXNvdXJjZSByb3dzLiIpOwotICAgICAgICAgICAg dGhpcy5sYXJnZXJSZXNvdXJjZXNCdXR0b24uYWRkU3R5bGVDbGFzcygidG9nZ2xlZC1vbiIpOwor ICAgICAgICAgICAgdGhpcy5sYXJnZXJSZXNvdXJjZXNCdXR0b24udG9nZ2xlZCA9IHRydWU7CiAg ICAgICAgIH0KICAgICB9LAogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvU2NyaXB0c1BhbmVsLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQ YW5lbC5qcwppbmRleCAwMDU4Mzc0Li42OWIyMWYxIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9TY3JpcHRzUGFuZWwuanMKQEAgLTE1MSwxMyArMTUxLDEwIEBAIFdlYkluc3BlY3Rv ci5TY3JpcHRzUGFuZWwgPSBmdW5jdGlvbigpCiAgICAgdGhpcy5lbGVtZW50LmFwcGVuZENoaWxk KHRoaXMuc2lkZWJhckVsZW1lbnQpOwogICAgIHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlz LnNpZGViYXJSZXNpemVFbGVtZW50KTsKIAotICAgIHRoaXMuZW5hYmxlVG9nZ2xlQnV0dG9uID0g dGhpcy5jcmVhdGVTdGF0dXNCYXJCdXR0b24oKTsKLSAgICB0aGlzLmVuYWJsZVRvZ2dsZUJ1dHRv bi5jbGFzc05hbWUgPSAiZW5hYmxlLXRvZ2dsZS1zdGF0dXMtYmFyLWl0ZW0gc3RhdHVzLWJhci1p dGVtIjsKKyAgICB0aGlzLmVuYWJsZVRvZ2dsZUJ1dHRvbiA9IG5ldyBXZWJJbnNwZWN0b3IuU3Rh dHVzQmFyQnV0dG9uKCIiLCAiZW5hYmxlLXRvZ2dsZS1zdGF0dXMtYmFyLWl0ZW0iKTsKICAgICB0 aGlzLmVuYWJsZVRvZ2dsZUJ1dHRvbi5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuX3Rv Z2dsZURlYnVnZ2luZy5iaW5kKHRoaXMpLCBmYWxzZSk7CiAKLSAgICB0aGlzLnBhdXNlT25FeGNl cHRpb25CdXR0b24gPSB0aGlzLmNyZWF0ZVN0YXR1c0JhckJ1dHRvbigpOwotICAgIHRoaXMucGF1 c2VPbkV4Y2VwdGlvbkJ1dHRvbi5pZCA9ICJzY3JpcHRzLXBhdXNlLW9uLWV4Y2VwdGlvbnMtc3Rh dHVzLWJhci1pdGVtIjsKLSAgICB0aGlzLnBhdXNlT25FeGNlcHRpb25CdXR0b24uY2xhc3NOYW1l ID0gInN0YXR1cy1iYXItaXRlbSI7CisgICAgdGhpcy5wYXVzZU9uRXhjZXB0aW9uQnV0dG9uID0g bmV3IFdlYkluc3BlY3Rvci5TdGF0dXNCYXJCdXR0b24oIiIsICJzY3JpcHRzLXBhdXNlLW9uLWV4 Y2VwdGlvbnMtc3RhdHVzLWJhci1pdGVtIik7CiAgICAgdGhpcy5wYXVzZU9uRXhjZXB0aW9uQnV0 dG9uLmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5fdG9nZ2xlUGF1c2VPbkV4Y2VwdGlv bnMuYmluZCh0aGlzKSwgZmFsc2UpOwogCiAgICAgdGhpcy5fYnJlYWtwb2ludHNVUkxNYXAgPSB7 fTsKQEAgLTIwOCw3ICsyMDUsNyBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlw ZSA9IHsKIAogICAgIGdldCBzdGF0dXNCYXJJdGVtcygpCiAgICAgewotICAgICAgICByZXR1cm4g W3RoaXMuZW5hYmxlVG9nZ2xlQnV0dG9uLCB0aGlzLnBhdXNlT25FeGNlcHRpb25CdXR0b25dOwor ICAgICAgICByZXR1cm4gW3RoaXMuZW5hYmxlVG9nZ2xlQnV0dG9uLmVsZW1lbnQsIHRoaXMucGF1 c2VPbkV4Y2VwdGlvbkJ1dHRvbi5lbGVtZW50XTsKICAgICB9LAogCiAgICAgZ2V0IHBhdXNlZCgp CkBAIC03NjQsMTAgKzc2MSwxMCBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlw ZSA9IHsKICAgICB7CiAgICAgICAgIGlmIChJbnNwZWN0b3JDb250cm9sbGVyLnBhdXNlT25FeGNl cHRpb25zKCkpIHsKICAgICAgICAgICAgIHRoaXMucGF1c2VPbkV4Y2VwdGlvbkJ1dHRvbi50aXRs ZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiRG9uJ3QgcGF1c2Ugb24gZXhjZXB0aW9ucy4iKTsK LSAgICAgICAgICAgIHRoaXMucGF1c2VPbkV4Y2VwdGlvbkJ1dHRvbi5hZGRTdHlsZUNsYXNzKCJ0 b2dnbGVkLW9uIik7CisgICAgICAgICAgICB0aGlzLnBhdXNlT25FeGNlcHRpb25CdXR0b24udG9n Z2xlZCA9IHRydWU7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICB0aGlzLnBhdXNlT25F eGNlcHRpb25CdXR0b24udGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlBhdXNlIG9uIGV4 Y2VwdGlvbnMuIik7Ci0gICAgICAgICAgICB0aGlzLnBhdXNlT25FeGNlcHRpb25CdXR0b24ucmVt b3ZlU3R5bGVDbGFzcygidG9nZ2xlZC1vbiIpOworICAgICAgICAgICAgdGhpcy5wYXVzZU9uRXhj ZXB0aW9uQnV0dG9uLnRvZ2dsZWQgPSBmYWxzZTsKICAgICAgICAgfQogICAgIH0sCiAKQEAgLTc3 NSwxMyArNzcyLDEzIEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewog ICAgIHsKICAgICAgICAgaWYgKEluc3BlY3RvckNvbnRyb2xsZXIuZGVidWdnZXJFbmFibGVkKCkp IHsKICAgICAgICAgICAgIHRoaXMuZW5hYmxlVG9nZ2xlQnV0dG9uLnRpdGxlID0gV2ViSW5zcGVj dG9yLlVJU3RyaW5nKCJEZWJ1Z2dpbmcgZW5hYmxlZC4gQ2xpY2sgdG8gZGlzYWJsZS4iKTsKLSAg ICAgICAgICAgIHRoaXMuZW5hYmxlVG9nZ2xlQnV0dG9uLmFkZFN0eWxlQ2xhc3MoInRvZ2dsZWQt b24iKTsKLSAgICAgICAgICAgIHRoaXMucGF1c2VPbkV4Y2VwdGlvbkJ1dHRvbi5yZW1vdmVTdHls ZUNsYXNzKCJoaWRkZW4iKTsKKyAgICAgICAgICAgIHRoaXMuZW5hYmxlVG9nZ2xlQnV0dG9uLnRv Z2dsZWQgPSB0cnVlOworICAgICAgICAgICAgdGhpcy5wYXVzZU9uRXhjZXB0aW9uQnV0dG9uLnZp c2libGUgPSB0cnVlOwogICAgICAgICAgICAgdGhpcy5wYW5lbEVuYWJsZXJWaWV3LnZpc2libGUg PSBmYWxzZTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIHRoaXMuZW5hYmxlVG9nZ2xl QnV0dG9uLnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJEZWJ1Z2dpbmcgZGlzYWJsZWQu IENsaWNrIHRvIGVuYWJsZS4iKTsKLSAgICAgICAgICAgIHRoaXMuZW5hYmxlVG9nZ2xlQnV0dG9u LnJlbW92ZVN0eWxlQ2xhc3MoInRvZ2dsZWQtb24iKTsKLSAgICAgICAgICAgIHRoaXMucGF1c2VP bkV4Y2VwdGlvbkJ1dHRvbi5hZGRTdHlsZUNsYXNzKCJoaWRkZW4iKTsKKyAgICAgICAgICAgIHRo aXMuZW5hYmxlVG9nZ2xlQnV0dG9uLnRvZ2dsZWQgPSBmYWxzZTsKKyAgICAgICAgICAgIHRoaXMu cGF1c2VPbkV4Y2VwdGlvbkJ1dHRvbi52aXNpYmxlID0gZmFsc2U7CiAgICAgICAgICAgICB0aGlz LnBhbmVsRW5hYmxlclZpZXcudmlzaWJsZSA9IHRydWU7CiAgICAgICAgIH0KIApkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0YXR1c0JhckJ1dHRvbi5qcyBiL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdGF0dXNCYXJCdXR0b24uanMKbmV3IGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggMDAwMDAwMC4uNWM2OWVkNQotLS0gL2Rldi9udWxsCisrKyBiL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9TdGF0dXNCYXJCdXR0b24uanMKQEAgLTAsMCArMSwxMTggQEAK Ky8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMDkgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZl ZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZv cm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92 aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBhcmUKKyAqIG1ldDoKKyAqCisgKiAg ICAgKiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3Zl IGNvcHlyaWdodAorICogbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZv bGxvd2luZyBkaXNjbGFpbWVyLgorICogICAgICogUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBm b3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZQorICogY29weXJpZ2h0IG5vdGljZSwgdGhpcyBs aXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lcgorICogaW4gdGhl IGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZQor ICogZGlzdHJpYnV0aW9uLgorICogICAgICogTmVpdGhlciB0aGUgbmFtZSBvZiBHb29nbGUgSW5j LiBub3IgdGhlIG5hbWVzIG9mIGl0cworICogY29udHJpYnV0b3JzIG1heSBiZSB1c2VkIHRvIGVu ZG9yc2Ugb3IgcHJvbW90ZSBwcm9kdWN0cyBkZXJpdmVkIGZyb20KKyAqIHRoaXMgc29mdHdhcmUg d2l0aG91dCBzcGVjaWZpYyBwcmlvciB3cml0dGVuIHBlcm1pc3Npb24uCisgKgorICogVEhJUyBT T0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBUSEUgQ09QWVJJR0hUIEhPTERFUlMgQU5EIENPTlRSSUJV VE9SUworICogIkFTIElTIiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJ TkNMVURJTkcsIEJVVCBOT1QKKyAqIExJTUlURUQgVE8sIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMg T0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUgorICogQSBQQVJUSUNVTEFSIFBVUlBP U0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIFRIRSBDT1BZUklHSFQKKyAqIE9X TkVSIE9SIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJ TkNJREVOVEFMLAorICogU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFH RVMgKElOQ0xVRElORywgQlVUIE5PVAorICogTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VC U1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsCisgKiBEQVRBLCBPUiBQUk9G SVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkK KyAqIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFC SUxJVFksIE9SIFRPUlQKKyAqIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFS SVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQorICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZF TiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCitX ZWJJbnNwZWN0b3IuU3RhdHVzQmFyQnV0dG9uID0gZnVuY3Rpb24odGl0bGUsIGNsYXNzTmFtZSkK K3sKKyAgICB0aGlzLmVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJidXR0b24iKTsK KyAgICB0aGlzLmVsZW1lbnQuY2xhc3NOYW1lID0gY2xhc3NOYW1lICsgIiBzdGF0dXMtYmFyLWl0 ZW0iOworICAgIHRoaXMuZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuX2Ns aWNrZWQuYmluZCh0aGlzKSwgZmFsc2UpOworCisgICAgdGhpcy5nbHlwaCA9IGRvY3VtZW50LmNy ZWF0ZUVsZW1lbnQoImRpdiIpOworICAgIHRoaXMuZ2x5cGguY2xhc3NOYW1lID0gImdseXBoIjsK KyAgICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5nbHlwaCk7CisKKyAgICB0aGlzLmds eXBoU2hhZG93ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CisgICAgdGhpcy5nbHlw aFNoYWRvdy5jbGFzc05hbWUgPSAiZ2x5cGggc2hhZG93IjsKKyAgICB0aGlzLmVsZW1lbnQuYXBw ZW5kQ2hpbGQodGhpcy5nbHlwaFNoYWRvdyk7CisKKyAgICB0aGlzLnRpdGxlID0gdGl0bGU7Cisg ICAgdGhpcy5kaXNhYmxlZCA9IGZhbHNlOworICAgIHRoaXMuX3RvZ2dsZWQgPSBmYWxzZTsKKyAg ICB0aGlzLl92aXNpYmxlID0gdHJ1ZTsKK30KKworV2ViSW5zcGVjdG9yLlN0YXR1c0JhckJ1dHRv bi5wcm90b3R5cGUgPSB7CisgICAgX2NsaWNrZWQ6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAg IHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKCJjbGljayIpOworICAgIH0sCisKKyAgICBn ZXQgZGlzYWJsZWQoKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX2Rpc2FibGVkOworICAg IH0sCisKKyAgICBzZXQgZGlzYWJsZWQoeCkKKyAgICB7CisgICAgICAgIGlmICh0aGlzLl9kaXNh YmxlZCA9PT0geCkKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgdGhpcy5fZGlzYWJsZWQg PSB4OworICAgICAgICB0aGlzLmVsZW1lbnQuZGlzYWJsZWQgPSB4OworICAgIH0sCisKKyAgICBn ZXQgdGl0bGUoKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3RpdGxlOworICAgIH0sCisK KyAgICBzZXQgdGl0bGUoeCkKKyAgICB7CisgICAgICAgIGlmICh0aGlzLl90aXRsZSA9PT0geCkK KyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgdGhpcy5fdGl0bGUgPSB4OworICAgICAgICB0 aGlzLmVsZW1lbnQudGl0bGUgPSB4OworICAgIH0sCisKKyAgICBnZXQgdG9nZ2xlZCgpCisgICAg eworICAgICAgICByZXR1cm4gdGhpcy5fdG9nZ2xlZDsKKyAgICB9LAorCisgICAgc2V0IHRvZ2ds ZWQoeCkKKyAgICB7CisgICAgICAgIGlmICh0aGlzLl90b2dnbGVkID09PSB4KQorICAgICAgICAg ICAgcmV0dXJuOworCisgICAgICAgIGlmICh4KQorICAgICAgICAgICAgdGhpcy5lbGVtZW50LmFk ZFN0eWxlQ2xhc3MoInRvZ2dsZWQtb24iKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgdGhp cy5lbGVtZW50LnJlbW92ZVN0eWxlQ2xhc3MoInRvZ2dsZWQtb24iKTsKKyAgICAgICAgdGhpcy5f dG9nZ2xlZCA9IHg7CisgICAgfSwKKworICAgIGdldCB2aXNpYmxlKCkKKyAgICB7CisgICAgICAg IHJldHVybiB0aGlzLl92aXNpYmxlOworICAgIH0sCisKKyAgICBzZXQgdmlzaWJsZSh4KQorICAg IHsKKyAgICAgICAgaWYgKHRoaXMuX3Zpc2libGUgPT09IHgpCisgICAgICAgICAgICByZXR1cm47 CisKKyAgICAgICAgaWYgKHgpCisgICAgICAgICAgICB0aGlzLmVsZW1lbnQucmVtb3ZlU3R5bGVD bGFzcygiaGlkZGVuIik7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIHRoaXMuZWxlbWVudC5h ZGRTdHlsZUNsYXNzKCJoaWRkZW4iKTsKKyAgICAgICAgdGhpcy5fdmlzaWJsZSA9IHg7CisgICAg fQorfQorCitXZWJJbnNwZWN0b3IuU3RhdHVzQmFyQnV0dG9uLnByb3RvdHlwZS5fX3Byb3RvX18g PSBXZWJJbnNwZWN0b3IuT2JqZWN0LnByb3RvdHlwZTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9XZWJLaXQucXJjIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1dlYktpdC5xcmMKaW5kZXggN2ZmMWY0MS4uYWJmOWFhNCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1dlYktpdC5xcmMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1dlYktpdC5xcmMKQEAgLTUyLDYgKzUyLDcgQEAKICAgICA8ZmlsZT5TaWRlYmFyVHJl ZUVsZW1lbnQuanM8L2ZpbGU+CiAgICAgPGZpbGU+U291cmNlRnJhbWUuanM8L2ZpbGU+CiAgICAg PGZpbGU+U291cmNlVmlldy5qczwvZmlsZT4KKyAgICA8ZmlsZT5TdGF0dXNCYXJCdXR0b24uanM8 L2ZpbGU+CiAgICAgPGZpbGU+U3R5bGVzU2lkZWJhclBhbmUuanM8L2ZpbGU+CiAgICAgPGZpbGU+ VGV4dFByb21wdC5qczwvZmlsZT4KICAgICA8ZmlsZT5Ub3BEb3duUHJvZmlsZURhdGFHcmlkVHJl ZS5qczwvZmlsZT4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNw ZWN0b3IuY3NzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5jc3MKaW5k ZXggMTFjMTY2ZC4uYzA4OThjMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL2luc3BlY3Rvci5jc3MKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3Bl Y3Rvci5jc3MKQEAgLTIwOTUsNyArMjA5NSw3IEBAIGJ1dHRvbi5lbmFibGUtdG9nZ2xlLXN0YXR1 cy1iYXItaXRlbS50b2dnbGVkLW9uIC5nbHlwaCB7CiAgICAgLXdlYmtpdC1tYXNrLWltYWdlOiB1 cmwoSW1hZ2VzL2VuYWJsZVNvbGlkQnV0dG9uR2x5cGgucG5nKTsKIH0KIAotI3NjcmlwdHMtcGF1 c2Utb24tZXhjZXB0aW9ucy1zdGF0dXMtYmFyLWl0ZW0gLmdseXBoIHsKKy5zY3JpcHRzLXBhdXNl LW9uLWV4Y2VwdGlvbnMtc3RhdHVzLWJhci1pdGVtIC5nbHlwaCB7CiAgICAgLXdlYmtpdC1tYXNr LWltYWdlOiB1cmwoSW1hZ2VzL3BhdXNlT25FeGNlcHRpb25CdXR0b25HbHlwaC5wbmcpOwogfQog CkBAIC0yMjEzLDcgKzIyMTMsNyBAQCBidXR0b24uZW5hYmxlLXRvZ2dsZS1zdGF0dXMtYmFyLWl0 ZW0udG9nZ2xlZC1vbiAuZ2x5cGggewogICAgIG92ZXJmbG93OiBhdXRvOwogfQogCi0jcmVzb3Vy Y2VzLWxhcmdlci1yZXNvdXJjZXMtc3RhdHVzLWJhci1pdGVtIC5nbHlwaCB7CisucmVzb3VyY2Vz LWxhcmdlci1yZXNvdXJjZXMtc3RhdHVzLWJhci1pdGVtIC5nbHlwaCB7CiAgICAgLXdlYmtpdC1t YXNrLWltYWdlOiB1cmwoSW1hZ2VzL2xhcmdlclJlc291cmNlc0J1dHRvbkdseXBoLnBuZyk7CiB9 CiAKQEAgLTMwOTcsMTYgKzMwOTcsMTYgQEAgYm9keS5pbmFjdGl2ZSAuc2lkZWJhci10cmVlLWl0 ZW0uc2VsZWN0ZWQgLmJ1YmJsZS5zZWFyY2gtbWF0Y2hlcyB7CiBidXR0b24uZW5hYmxlLXRvZ2ds ZS1zdGF0dXMtYmFyLWl0ZW0gLmdseXBoIHsKIH0KIAotI3JlY29yZC1wcm9maWxlLXN0YXR1cy1i YXItaXRlbSAuZ2x5cGggeworLnJlY29yZC1wcm9maWxlLXN0YXR1cy1iYXItaXRlbSAuZ2x5cGgg ewogICAgIC13ZWJraXQtbWFzay1pbWFnZTogdXJsKEltYWdlcy9yZWNvcmRCdXR0b25HbHlwaC5w bmcpOwogfQogCi0jcmVjb3JkLXByb2ZpbGUtc3RhdHVzLWJhci1pdGVtLnRvZ2dsZWQtb24gLmds eXBoIHsKKy5yZWNvcmQtcHJvZmlsZS1zdGF0dXMtYmFyLWl0ZW0udG9nZ2xlZC1vbiAuZ2x5cGgg ewogICAgIC13ZWJraXQtbWFzay1pbWFnZTogdXJsKEltYWdlcy9yZWNvcmRUb2dnbGVkQnV0dG9u R2x5cGgucG5nKTsKLSAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2IoMjE2LCAwLCAwKTsKKyAgICBi YWNrZ3JvdW5kLWNvbG9yOiByZ2IoMjE2LCAwLCAwKSAhaW1wb3J0YW50OwogfQogCi0jbm9kZS1z ZWFyY2gtc3RhdHVzLWJhci1pdGVtIC5nbHlwaCB7Cisubm9kZS1zZWFyY2gtc3RhdHVzLWJhci1p dGVtIC5nbHlwaCB7CiAgICAgLXdlYmtpdC1tYXNrLWltYWdlOiB1cmwoSW1hZ2VzL25vZGVTZWFy Y2hCdXR0b25HbHlwaC5wbmcpOwogfQogCkBAIC0zMTQwLDEyICszMTQwLDggQEAgYnV0dG9uLmVu YWJsZS10b2dnbGUtc3RhdHVzLWJhci1pdGVtIC5nbHlwaCB7CiAgICAgbWFyZ2luLWxlZnQ6IC0x cHg7CiB9CiAKLS5yZWZyZXNoLXN0b3JhZ2Utc3RhdHVzLWJhci1pdGVtIHsKLSAgICBiYWNrZ3Jv dW5kLWltYWdlOiB1cmwoSW1hZ2VzL3JlbG9hZEJ1dHRvbnMucG5nKSAhaW1wb3J0YW50OwotfQot Ci0ucmVmcmVzaC1zdG9yYWdlLXN0YXR1cy1iYXItaXRlbTphY3RpdmUgewotICAgIGJhY2tncm91 bmQtcG9zaXRpb246IDMycHggMDsKKy5yZWZyZXNoLXN0b3JhZ2Utc3RhdHVzLWJhci1pdGVtIC5n bHlwaCB7CisgICAgLXdlYmtpdC1tYXNrLWltYWdlOiB1cmwoSW1hZ2VzL3JlbG9hZEJ1dHRvbkds eXBoLnBuZyk7CiB9CiAKICNzdG9yYWdlLXZpZXctc3RhdHVzLWJhci1pdGVtcyB7CmRpZmYgLS1n aXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmh0bWwgYi9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmh0bWwKaW5kZXggNDVjMjdkZC4uZDJhNzdm ZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5odG1s CisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuaHRtbApAQCAtNjgs NiArNjgsNyBAQCBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklM SVRZIE9GIFNVQ0ggREFNQUdFLgogICAgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBz cmM9IlN0eWxlc1NpZGViYXJQYW5lLmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHR5cGU9InRl eHQvamF2YXNjcmlwdCIgc3JjPSJQYW5lbC5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCB0eXBl PSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iUGFuZWxFbmFibGVyVmlldy5qcyI+PC9zY3JpcHQ+Cisg ICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iU3RhdHVzQmFyQnV0dG9uLmpz Ij48L3NjcmlwdD4KICAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIgc3JjPSJFbGVt ZW50c1BhbmVsLmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlw dCIgc3JjPSJSZXNvdXJjZXNQYW5lbC5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCB0eXBlPSJ0 ZXh0L2phdmFzY3JpcHQiIHNyYz0iU2NyaXB0c1BhbmVsLmpzIj48L3NjcmlwdD4K