63450 2011-06-27 06:37:13 -0700 Web Inspector: create status bar buttons programmatically. Add "Inspect" button to all panels. 2011-06-29 06:58:29 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 427894 0 pfeldman 2011-06-27 06:37:13 -0700 Buttons should be created in code, not in HTML. Also making Inspect Element action available on all panels (as an experiment). 427896 1 98715 pfeldman 2011-06-27 06:40:29 -0700 Created attachment 98715 Patch 427937 2 98726 pfeldman 2011-06-27 07:58:11 -0700 Created attachment 98726 Patch 428761 3 98726 yurys 2011-06-28 02:39:13 -0700 Comment on attachment 98726 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=98726&action=review > Source/WebCore/inspector/front-end/inspector.js:189 > + anchoredStatusBar.appendChild(this.panels.elements.nodeSearchButton.element); There is no Elements panel in worker inspector window, please add a check. > Source/WebCore/inspector/front-end/inspector.js:210 > + this._dockToggleButton.title = WebInspector.UIString("Undock into separate window."); Would be nice to have a toggle button that would automatically switch between two titles. 428908 4 98930 pfeldman 2011-06-28 08:40:44 -0700 Created attachment 98930 Patch 429572 5 98930 pfeldman 2011-06-29 06:58:19 -0700 Comment on attachment 98930 Patch Clearing flags on attachment: 98930 Committed r90014: <http://trac.webkit.org/changeset/90014> 429573 6 pfeldman 2011-06-29 06:58:29 -0700 All reviewed patches have been landed. Closing bug. 98715 2011-06-27 06:40:29 -0700 2011-06-27 07:58:04 -0700 Patch bug-63450-20110627174027.patch text/plain 11653 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogODk4MTUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBkNzc4NWJhYzAzYWE0YjU0 ZThiYjU1ZGM2MTVjNmNlMTRhODljMjI2Li5jN2RkYzlmY2IwZjFhZjhkMTcyN2I4ODA3NzY3ODI0 YjQzNzg4NDFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzMgQEAKIDIwMTEtMDYtMjcgIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGNyZWF0ZSBzdGF0dXMgYmFy IGJ1dHRvbnMgcHJvZ3JhbW1hdGljYWxseS4gQWRkICJJbnNwZWN0IiBidXR0b24gdG8gYWxsIHBh bmVscy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYz NDUwCisKKyAgICAgICAgQnV0dG9ucyBzaG91bGQgYmUgY3JlYXRlZCBpbiBjb2RlLCBub3QgaW4g SFRNTC4gQWxzbyBtYWtpbmcgSW5zcGVjdCBFbGVtZW50CisgICAgICAgIGFjdGlvbiBhdmFpbGFi bGUgb24gYWxsIHBhbmVscyAoYXMgYW4gZXhwZXJpbWVudCkuCisKKyAgICAgICAgKiBpbnNwZWN0 b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNv bGVWaWV3LnByb3RvdHlwZS5zaG93KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlVmll dy5wcm90b3R5cGUuaGlkZSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50 c1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkVsZW1lbnRzUGFuZWwpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLkVsZW1lbnRzUGFuZWwucHJvdG90eXBlLmdldCBzdGF0dXNCYXJJdGVt cyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRWxlbWVudHNQYW5lbC5wcm90b3R5cGUudXBkYXRl Rm9jdXNlZE5vZGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkVsZW1lbnRzUGFuZWwucHJvdG90 eXBlLl9zZXRTZWFyY2hpbmdGb3JOb2RlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5FbGVtZW50 c1BhbmVsLnByb3RvdHlwZS50b2dnbGVTZWFyY2hpbmdGb3JOb2RlKToKKyAgICAgICAgKiBpbnNw ZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5jc3M6CisgICAgICAgIChidXR0b24uZG9jay1zdGF0 dXMtYmFyLWl0ZW0uc3RhdHVzLWJhci1pdGVtIC5nbHlwaCk6CisgICAgICAgIChidXR0b24uZG9j ay1zdGF0dXMtYmFyLWl0ZW0uc3RhdHVzLWJhci1pdGVtLnRvZ2dsZWQtb24gLmdseXBoKToKKyAg ICAgICAgKC5jb25zb2xlLXN0YXR1cy1iYXItaXRlbSAuZ2x5cGgpOgorICAgICAgICAqIGluc3Bl Y3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmh0bWw6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9pbnNwZWN0b3IuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuX2NyZWF0ZUdsb2JhbFN0 YXR1c0Jhckl0ZW1zKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5zZXQgYXR0YWNoZWQpOgorCisy MDExLTA2LTI3ICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AZ29vZ2xlLmNvbT4KKwogICAgICAg ICBSZXZpZXdlZCBieSBZdXJ5IFNlbWlraGF0c2t5LgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6 IFtSRUdSRVNTSU9OIHI4NDQ4MV0gdXBkYXRlTGF5b3V0IGNhbGxlZCBmcm9tIERyYXdOb2RlSGln aGxpZ2h0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0Nv bnNvbGVWaWV3LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xl Vmlldy5qcwppbmRleCA3ZTlmOGQyMGE2NDAyYTA5YWMwY2RjYzJlOGZmNzA5Y2QxNzcxNTg3Li5m YjE0MTFhMTdjYjMyOTc4ZTYwM2Q1ZTQxMTYwYWZmM2NhN2MzZWZmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanMKQEAgLTU0LDggKzU0 LDcgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3ID0gZnVuY3Rpb24oZHJhd2VyKQogICAgIHRo aXMubWVzc2FnZXNFbGVtZW50Lmluc2VydEJlZm9yZSh0aGlzLnRvcEdyb3VwLmVsZW1lbnQsIHRo aXMucHJvbXB0RWxlbWVudCk7CiAgICAgdGhpcy5jdXJyZW50R3JvdXAgPSB0aGlzLnRvcEdyb3Vw OwogCi0gICAgdGhpcy50b2dnbGVDb25zb2xlQnV0dG9uID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5 SWQoImNvbnNvbGUtc3RhdHVzLWJhci1pdGVtIik7Ci0gICAgdGhpcy50b2dnbGVDb25zb2xlQnV0 dG9uLnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTaG93IGNvbnNvbGUuIik7CisgICAg dGhpcy50b2dnbGVDb25zb2xlQnV0dG9uID0gbmV3IFdlYkluc3BlY3Rvci5TdGF0dXNCYXJCdXR0 b24oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTaG93IGNvbnNvbGUuIiksICJjb25zb2xlLXN0YXR1 cy1iYXItaXRlbSIpOwogICAgIHRoaXMudG9nZ2xlQ29uc29sZUJ1dHRvbi5hZGRFdmVudExpc3Rl bmVyKCJjbGljayIsIHRoaXMuX3RvZ2dsZUNvbnNvbGVCdXR0b25DbGlja2VkLmJpbmQodGhpcyks IGZhbHNlKTsKIAogICAgIC8vIFdpbGwgaG9sZCB0aGUgbGlzdCBvZiBmaWx0ZXIgZWxlbWVudHMK QEAgLTI0NSw3ICsyNDQsNyBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZVZpZXcucHJvdG90eXBlID0g ewogCiAgICAgc2hvdzogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgdGhpcy50b2dnbGVDb25z b2xlQnV0dG9uLmFkZFN0eWxlQ2xhc3MoInRvZ2dsZWQtb24iKTsKKyAgICAgICAgdGhpcy50b2dn bGVDb25zb2xlQnV0dG9uLnRvZ2dsZWQgPSB0cnVlOwogICAgICAgICB0aGlzLnRvZ2dsZUNvbnNv bGVCdXR0b24udGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkhpZGUgY29uc29sZS4iKTsK ICAgICAgICAgaWYgKCF0aGlzLnByb21wdC5pc0NhcmV0SW5zaWRlUHJvbXB0KCkpCiAgICAgICAg ICAgICB0aGlzLnByb21wdC5tb3ZlQ2FyZXRUb0VuZE9mUHJvbXB0KCk7CkBAIC0yNTgsNyArMjU3 LDcgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3LnByb3RvdHlwZSA9IHsKIAogICAgIGhpZGU6 IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIHRoaXMudG9nZ2xlQ29uc29sZUJ1dHRvbi5yZW1v dmVTdHlsZUNsYXNzKCJ0b2dnbGVkLW9uIik7CisgICAgICAgIHRoaXMudG9nZ2xlQ29uc29sZUJ1 dHRvbi50b2dnbGVkID0gZmFsc2U7CiAgICAgICAgIHRoaXMudG9nZ2xlQ29uc29sZUJ1dHRvbi50 aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiU2hvdyBjb25zb2xlLiIpOwogICAgIH0sCiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNQ YW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNQYW5l bC5qcwppbmRleCBkNmNjMGQyZmVhZGZhNTFmMzVhZjY3ZTQyNWU5MjMwNDhjZWZmOGEyLi5lZDAz ZjZjNTRlMTVmNzg0MzMxNTJlNjVjMTUzZjU5YTFiYjg1YWU5IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzUGFuZWwuanMKKysrIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1BhbmVsLmpzCkBAIC0xMDcsOCAr MTA3LDggQEAgV2ViSW5zcGVjdG9yLkVsZW1lbnRzUGFuZWwgPSBmdW5jdGlvbigpCiAgICAgdGhp cy5zaWRlYmFyUmVzaXplRWxlbWVudC5jbGFzc05hbWUgPSAic2lkZWJhci1yZXNpemVyLXZlcnRp Y2FsIjsKICAgICB0aGlzLnNpZGViYXJSZXNpemVFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoIm1v dXNlZG93biIsIHRoaXMucmlnaHRTaWRlYmFyUmVzaXplckRyYWdTdGFydC5iaW5kKHRoaXMpLCBm YWxzZSk7CiAKLSAgICB0aGlzLl9ub2RlU2VhcmNoQnV0dG9uID0gbmV3IFdlYkluc3BlY3Rvci5T dGF0dXNCYXJCdXR0b24oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTZWxlY3QgYW4gZWxlbWVudCBp biB0aGUgcGFnZSB0byBpbnNwZWN0IGl0LiIpLCAibm9kZS1zZWFyY2gtc3RhdHVzLWJhci1pdGVt Iik7Ci0gICAgdGhpcy5fbm9kZVNlYXJjaEJ1dHRvbi5hZGRFdmVudExpc3RlbmVyKCJjbGljayIs IHRoaXMudG9nZ2xlU2VhcmNoaW5nRm9yTm9kZS5iaW5kKHRoaXMpLCBmYWxzZSk7CisgICAgdGhp cy5ub2RlU2VhcmNoQnV0dG9uID0gbmV3IFdlYkluc3BlY3Rvci5TdGF0dXNCYXJCdXR0b24oV2Vi SW5zcGVjdG9yLlVJU3RyaW5nKCJTZWxlY3QgYW4gZWxlbWVudCBpbiB0aGUgcGFnZSB0byBpbnNw ZWN0IGl0LiIpLCAibm9kZS1zZWFyY2gtc3RhdHVzLWJhci1pdGVtIik7CisgICAgdGhpcy5ub2Rl U2VhcmNoQnV0dG9uLmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy50b2dnbGVTZWFyY2hp bmdGb3JOb2RlLmJpbmQodGhpcyksIGZhbHNlKTsKIAogICAgIHRoaXMuZWxlbWVudC5hcHBlbmRD aGlsZCh0aGlzLmNvbnRlbnRFbGVtZW50KTsKICAgICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQo dGhpcy5zaWRlYmFyRWxlbWVudCk7CkBAIC0xMzQsNyArMTM0LDcgQEAgV2ViSW5zcGVjdG9yLkVs ZW1lbnRzUGFuZWwucHJvdG90eXBlID0gewogCiAgICAgZ2V0IHN0YXR1c0Jhckl0ZW1zKCkKICAg ICB7Ci0gICAgICAgIHJldHVybiBbdGhpcy5fbm9kZVNlYXJjaEJ1dHRvbi5lbGVtZW50LCB0aGlz LmNydW1ic0VsZW1lbnRdOworICAgICAgICByZXR1cm4gW3RoaXMuY3J1bWJzRWxlbWVudF07CiAg ICAgfSwKIAogICAgIGdldCBkZWZhdWx0Rm9jdXNlZEVsZW1lbnQoKQpAQCAtMTEzOCwxNSArMTEz OCwxNSBAQCBXZWJJbnNwZWN0b3IuRWxlbWVudHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAg ICAgICByZXR1cm47CiAKICAgICAgICAgdGhpcy5mb2N1c2VkRE9NTm9kZSA9IG5vZGU7Ci0gICAg ICAgIGlmICh0aGlzLl9ub2RlU2VhcmNoQnV0dG9uLnRvZ2dsZWQpIHsKKyAgICAgICAgaWYgKHRo aXMubm9kZVNlYXJjaEJ1dHRvbi50b2dnbGVkKSB7CiAgICAgICAgICAgICBJbnNwZWN0b3JGcm9u dGVuZEhvc3QuYnJpbmdUb0Zyb250KCk7Ci0gICAgICAgICAgICB0aGlzLl9ub2RlU2VhcmNoQnV0 dG9uLnRvZ2dsZWQgPSBmYWxzZTsKKyAgICAgICAgICAgIHRoaXMubm9kZVNlYXJjaEJ1dHRvbi50 b2dnbGVkID0gZmFsc2U7CiAgICAgICAgIH0KICAgICB9LAogCiAgICAgX3NldFNlYXJjaGluZ0Zv ck5vZGU6IGZ1bmN0aW9uKGVuYWJsZWQpCiAgICAgewotICAgICAgICB0aGlzLl9ub2RlU2VhcmNo QnV0dG9uLnRvZ2dsZWQgPSBlbmFibGVkOworICAgICAgICB0aGlzLm5vZGVTZWFyY2hCdXR0b24u dG9nZ2xlZCA9IGVuYWJsZWQ7CiAgICAgfSwKIAogICAgIHNldFNlYXJjaGluZ0Zvck5vZGU6IGZ1 bmN0aW9uKGVuYWJsZWQpCkBAIC0xMTU2LDcgKzExNTYsNyBAQCBXZWJJbnNwZWN0b3IuRWxlbWVu dHNQYW5lbC5wcm90b3R5cGUgPSB7CiAKICAgICB0b2dnbGVTZWFyY2hpbmdGb3JOb2RlOiBmdW5j dGlvbigpCiAgICAgewotICAgICAgICB0aGlzLnNldFNlYXJjaGluZ0Zvck5vZGUoIXRoaXMuX25v ZGVTZWFyY2hCdXR0b24udG9nZ2xlZCk7CisgICAgICAgIHRoaXMuc2V0U2VhcmNoaW5nRm9yTm9k ZSghdGhpcy5ub2RlU2VhcmNoQnV0dG9uLnRvZ2dsZWQpOwogICAgIH0sCiAKICAgICBlbGVtZW50 c1RvUmVzdG9yZVNjcm9sbFBvc2l0aW9uc0ZvcjogZnVuY3Rpb24oKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuY3NzIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuY3NzCmluZGV4IGZjMWE4MDg5NDcy YjZiNDJmZDhiZTcwZjQ1ZGI3N2Y0MTRlY2JlZDAuLjk3Nzc3MWQ0OTZhZjYyZTEzODQ5YzNhYmY3 NzkxMjM3OWJmYjk4NDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvaW5zcGVjdG9yLmNzcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL2luc3BlY3Rvci5jc3MKQEAgLTU0OCwxOSArNTQ4LDIxIEBAIHNlbGVjdC5zdGF0dXMtYmFy LWl0ZW06YWN0aXZlIHsKICAgICAtd2Via2l0LW1hc2staW1hZ2U6IHVybChJbWFnZXMvc3RhdHVz YmFyQnV0dG9uR2x5cGhzLnBuZyk7CiB9CiAKLSNkb2NrLXN0YXR1cy1iYXItaXRlbSAuZ2x5cGgg eworCitidXR0b24uZG9jay1zdGF0dXMtYmFyLWl0ZW0uc3RhdHVzLWJhci1pdGVtIC5nbHlwaCB7 CiAgICAgLXdlYmtpdC1tYXNrLXBvc2l0aW9uOiAwIC00OHB4OwogfQogCi1ib2R5LmRldGFjaGVk ICNkb2NrLXN0YXR1cy1iYXItaXRlbSAuZ2x5cGggeworYnV0dG9uLmRvY2stc3RhdHVzLWJhci1p dGVtLnN0YXR1cy1iYXItaXRlbS50b2dnbGVkLW9uIC5nbHlwaCB7CiAgICAgLXdlYmtpdC1tYXNr LXBvc2l0aW9uOiAtMzJweCAtMjRweDsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2JhKDAsIDAs IDAsIDAuNzUpOwogfQogCiBib2R5LnBvcnQtcXQgI2RvY2stc3RhdHVzLWJhci1pdGVtIHsKICAg ICBkaXNwbGF5OiBub25lCiB9CiAKLSNjb25zb2xlLXN0YXR1cy1iYXItaXRlbSAuZ2x5cGggewor LmNvbnNvbGUtc3RhdHVzLWJhci1pdGVtIC5nbHlwaCB7CiAgICAgLXdlYmtpdC1tYXNrLXBvc2l0 aW9uOiAtNjRweCAtMjRweDsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuaHRtbCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvaW5zcGVjdG9yLmh0bWwKaW5kZXggOWYzZTRjZmIxMzAzODMxMmQ2Y2VkMjIwY2Ji MzMwODFhNzJiNTFkMS4uN2VhNTNhZjM0ZGZiZGQ0OTVhZTAxODQ2ZTNlZDAxNzk1NWZjMGRlOCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3Iu aHRtbAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5o dG1sCkBAIC0xODAsNyArMTgwLDcgQEAgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9G IFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICAgICA8L2Rpdj4KICAgICA8ZGl2IGlk PSJtYWluIj4KICAgICAgICAgPGRpdiBpZD0ibWFpbi1wYW5lbHMiIHNwZWxsY2hlY2s9ImZhbHNl Ij48L2Rpdj4KLSAgICAgICAgPGRpdiBpZD0ibWFpbi1zdGF0dXMtYmFyIiBjbGFzcz0ic3RhdHVz LWJhciI+PGRpdiBpZD0iYW5jaG9yZWQtc3RhdHVzLWJhci1pdGVtcyI+PGJ1dHRvbiBpZD0iZG9j ay1zdGF0dXMtYmFyLWl0ZW0iIGNsYXNzPSJzdGF0dXMtYmFyLWl0ZW0iPjxkaXYgY2xhc3M9Imds eXBoIj48L2Rpdj48ZGl2IGNsYXNzPSJnbHlwaCBzaGFkb3ciPjwvZGl2PjwvYnV0dG9uPjxidXR0 b24gaWQ9ImNvbnNvbGUtc3RhdHVzLWJhci1pdGVtIiBjbGFzcz0ic3RhdHVzLWJhci1pdGVtIj48 ZGl2IGNsYXNzPSJnbHlwaCI+PC9kaXY+PGRpdiBjbGFzcz0iZ2x5cGggc2hhZG93Ij48L2Rpdj48 L2J1dHRvbj48ZGl2IGlkPSJjb3VudGVycyI+PGRpdiBpZD0iZXJyb3Itd2FybmluZy1jb3VudCIg Y2xhc3M9ImhpZGRlbiI+PC9kaXY+PC9kaXY+PC9kaXY+PC9kaXY+CisgICAgICAgIDxkaXYgaWQ9 Im1haW4tc3RhdHVzLWJhciIgY2xhc3M9InN0YXR1cy1iYXIiPjxkaXYgaWQ9ImFuY2hvcmVkLXN0 YXR1cy1iYXItaXRlbXMiPjxkaXYgaWQ9ImNvdW50ZXJzIj48ZGl2IGlkPSJlcnJvci13YXJuaW5n LWNvdW50IiBjbGFzcz0iaGlkZGVuIj48L2Rpdj48L2Rpdj48L2Rpdj48L2Rpdj4KICAgICA8L2Rp dj4KICAgICA8ZGl2IGlkPSJkcmF3ZXIiPgogICAgICAgICA8ZGl2IGlkPSJjb25zb2xlLXZpZXci PjxkaXYgaWQ9ImNvbnNvbGUtbWVzc2FnZXMiIGNsYXNzPSJtb25vc3BhY2UiPjxkaXYgaWQ9ImNv bnNvbGUtcHJvbXB0IiBzcGVsbGNoZWNrPSJmYWxzZSI+PGJyPjwvZGl2PjwvZGl2PjwvZGl2Pgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3Iu anMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcwppbmRl eCA2MjIzMGM5YzgzYWRiM2EwOGI4MGJhNDM1YTg1Y2E0NmY5NmU2MTcyLi45OGY0YmI1ZjhkODE0 MjYyODQwMTA3MmVlZmY4ZmQ3NjE2N2YwMjdjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcwpAQCAtMTc3LDYgKzE3NywxOCBAQCB2YXIgV2Vi SW5zcGVjdG9yID0gewogICAgICAgICAgICAgdGhpcy5wYW5lbHMuY29uc29sZSA9IG5ldyBXZWJJ bnNwZWN0b3IuQ29uc29sZVBhbmVsKCk7CiAgICAgfSwKIAorICAgIF9jcmVhdGVHbG9iYWxTdGF0 dXNCYXJJdGVtczogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgdGhpcy5fZG9ja1RvZ2dsZUJ1 dHRvbiA9IG5ldyBXZWJJbnNwZWN0b3IuU3RhdHVzQmFyQnV0dG9uKHRoaXMuYXR0YWNoZWQgPyBX ZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlVuZG9jayBpbnRvIHNlcGFyYXRlIHdpbmRvdy4iKSA6IFdl Ykluc3BlY3Rvci5VSVN0cmluZygiRG9jayB0byBtYWluIHdpbmRvdy4iKSwgImRvY2stc3RhdHVz LWJhci1pdGVtIik7CisgICAgICAgIHRoaXMuX2RvY2tUb2dnbGVCdXR0b24uYWRkRXZlbnRMaXN0 ZW5lcigiY2xpY2siLCB0aGlzLnRvZ2dsZUF0dGFjaC5iaW5kKHRoaXMpLCBmYWxzZSk7CisgICAg ICAgIHRoaXMuX2RvY2tUb2dnbGVCdXR0b24udG9nZ2xlZCA9ICF0aGlzLmF0dGFjaGVkOworCisg ICAgICAgIHZhciBhbmNob3JlZFN0YXR1c0JhciA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJh bmNob3JlZC1zdGF0dXMtYmFyLWl0ZW1zIik7CisgICAgICAgIGFuY2hvcmVkU3RhdHVzQmFyLmFw cGVuZENoaWxkKHRoaXMuX2RvY2tUb2dnbGVCdXR0b24uZWxlbWVudCk7CisgICAgICAgIGFuY2hv cmVkU3RhdHVzQmFyLmFwcGVuZENoaWxkKHRoaXMuY29uc29sZS50b2dnbGVDb25zb2xlQnV0dG9u LmVsZW1lbnQpOworICAgICAgICBhbmNob3JlZFN0YXR1c0Jhci5hcHBlbmRDaGlsZCh0aGlzLnBh bmVscy5lbGVtZW50cy5ub2RlU2VhcmNoQnV0dG9uLmVsZW1lbnQpOworICAgIH0sCisKICAgICBn ZXQgYXR0YWNoZWQoKQogICAgIHsKICAgICAgICAgcmV0dXJuIHRoaXMuX2F0dGFjaGVkOwpAQCAt MTg5LDE3ICsyMDEsMTkgQEAgdmFyIFdlYkluc3BlY3RvciA9IHsKIAogICAgICAgICB0aGlzLl9h dHRhY2hlZCA9IHg7CiAKLSAgICAgICAgdmFyIGRvY2tUb2dnbGVCdXR0b24gPSBkb2N1bWVudC5n ZXRFbGVtZW50QnlJZCgiZG9jay1zdGF0dXMtYmFyLWl0ZW0iKTsKICAgICAgICAgdmFyIGJvZHkg PSBkb2N1bWVudC5ib2R5OwogCi0gICAgICAgIGlmICh4KSB7Ci0gICAgICAgICAgICBib2R5LnJl bW92ZVN0eWxlQ2xhc3MoImRldGFjaGVkIik7Ci0gICAgICAgICAgICBib2R5LmFkZFN0eWxlQ2xh c3MoImF0dGFjaGVkIik7Ci0gICAgICAgICAgICBkb2NrVG9nZ2xlQnV0dG9uLnRpdGxlID0gV2Vi SW5zcGVjdG9yLlVJU3RyaW5nKCJVbmRvY2sgaW50byBzZXBhcmF0ZSB3aW5kb3cuIik7Ci0gICAg ICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBib2R5LnJlbW92ZVN0eWxlQ2xhc3MoImF0dGFjaGVk Iik7Ci0gICAgICAgICAgICBib2R5LmFkZFN0eWxlQ2xhc3MoImRldGFjaGVkIik7Ci0gICAgICAg ICAgICBkb2NrVG9nZ2xlQnV0dG9uLnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJEb2Nr IHRvIG1haW4gd2luZG93LiIpOworICAgICAgICBpZiAodGhpcy5fZG9ja1RvZ2dsZUJ1dHRvbikg eworICAgICAgICAgICAgaWYgKHgpIHsKKyAgICAgICAgICAgICAgICBib2R5LnJlbW92ZVN0eWxl Q2xhc3MoImRldGFjaGVkIik7CisgICAgICAgICAgICAgICAgYm9keS5hZGRTdHlsZUNsYXNzKCJh dHRhY2hlZCIpOworICAgICAgICAgICAgICAgIHRoaXMuX2RvY2tUb2dnbGVCdXR0b24udGl0bGUg PSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlVuZG9jayBpbnRvIHNlcGFyYXRlIHdpbmRvdy4iKTsK KyAgICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAgICAgYm9keS5yZW1vdmVTdHlsZUNs YXNzKCJhdHRhY2hlZCIpOworICAgICAgICAgICAgICAgIGJvZHkuYWRkU3R5bGVDbGFzcygiZGV0 YWNoZWQiKTsKKyAgICAgICAgICAgICAgICB0aGlzLl9kb2NrVG9nZ2xlQnV0dG9uLnRpdGxlID0g V2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJEb2NrIHRvIG1haW4gd2luZG93LiIpOworICAgICAgICAg ICAgfQorICAgICAgICAgICAgdGhpcy5fZG9ja1RvZ2dsZUJ1dHRvbi50b2dnbGVkID0gIXg7CiAg ICAgICAgIH0KIAogICAgICAgICAvLyBUaGlzIG1heSBiZSBjYWxsZWQgYmVmb3JlIG9uTG9hZGVk RG9uZSwgaGVuY2UgdGhlIGJ1bGsgb2YgaW5zcGVjdG9yIG9iamVjdHMgbWF5CkBAIC00NDcsNiAr NDYxLDggQEAgV2ViSW5zcGVjdG9yLmRvTG9hZGVkRG9uZSA9IGZ1bmN0aW9uKCkKIAogICAgIHRo aXMucGFuZWxzID0ge307CiAgICAgdGhpcy5fY3JlYXRlUGFuZWxzKCk7CisgICAgdGhpcy5fY3Jl YXRlR2xvYmFsU3RhdHVzQmFySXRlbXMoKTsKKwogICAgIHRoaXMuX3BhbmVsSGlzdG9yeSA9IG5l dyBXZWJJbnNwZWN0b3IuUGFuZWxIaXN0b3J5KCk7CiAgICAgdGhpcy50b29sYmFyID0gbmV3IFdl Ykluc3BlY3Rvci5Ub29sYmFyKCk7CiAgICAgdGhpcy50b29sYmFyLmF0dGFjaGVkID0gV2ViSW5z cGVjdG9yLmF0dGFjaGVkOwpAQCAtNDczLDE0ICs0ODksNiBAQCBXZWJJbnNwZWN0b3IuZG9Mb2Fk ZWREb25lID0gZnVuY3Rpb24oKQogICAgIGRvY3VtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNvcHki LCB0aGlzLmRvY3VtZW50Q29weS5iaW5kKHRoaXMpLCB0cnVlKTsKICAgICBkb2N1bWVudC5hZGRF dmVudExpc3RlbmVyKCJjb250ZXh0bWVudSIsIHRoaXMuY29udGV4dE1lbnVFdmVudEZpcmVkLmJp bmQodGhpcyksIHRydWUpOwogCi0gICAgdmFyIGRvY2tUb2dnbGVCdXR0b24gPSBkb2N1bWVudC5n ZXRFbGVtZW50QnlJZCgiZG9jay1zdGF0dXMtYmFyLWl0ZW0iKTsKLSAgICBkb2NrVG9nZ2xlQnV0 dG9uLmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy50b2dnbGVBdHRhY2guYmluZCh0aGlz KSwgZmFsc2UpOwotCi0gICAgaWYgKHRoaXMuYXR0YWNoZWQpCi0gICAgICAgIGRvY2tUb2dnbGVC dXR0b24udGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlVuZG9jayBpbnRvIHNlcGFyYXRl IHdpbmRvdy4iKTsKLSAgICBlbHNlCi0gICAgICAgIGRvY2tUb2dnbGVCdXR0b24udGl0bGUgPSBX ZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkRvY2sgdG8gbWFpbiB3aW5kb3cuIik7Ci0KICAgICB2YXIg ZXJyb3JXYXJuaW5nQ291bnQgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiZXJyb3Itd2Fybmlu Zy1jb3VudCIpOwogICAgIGVycm9yV2FybmluZ0NvdW50LmFkZEV2ZW50TGlzdGVuZXIoImNsaWNr IiwgdGhpcy5zaG93Q29uc29sZS5iaW5kKHRoaXMpLCBmYWxzZSk7CiAgICAgdGhpcy5fdXBkYXRl RXJyb3JBbmRXYXJuaW5nQ291bnRzKCk7Cg== 98726 2011-06-27 07:58:11 -0700 2011-06-28 08:40:37 -0700 Patch bug-63450-20110627185809.patch text/plain 11532 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogODk4MTcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBkNzc4NWJhYzAzYWE0YjU0 ZThiYjU1ZGM2MTVjNmNlMTRhODljMjI2Li5jN2RkYzlmY2IwZjFhZjhkMTcyN2I4ODA3NzY3ODI0 YjQzNzg4NDFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzMgQEAKIDIwMTEtMDYtMjcgIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGNyZWF0ZSBzdGF0dXMgYmFy IGJ1dHRvbnMgcHJvZ3JhbW1hdGljYWxseS4gQWRkICJJbnNwZWN0IiBidXR0b24gdG8gYWxsIHBh bmVscy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYz NDUwCisKKyAgICAgICAgQnV0dG9ucyBzaG91bGQgYmUgY3JlYXRlZCBpbiBjb2RlLCBub3QgaW4g SFRNTC4gQWxzbyBtYWtpbmcgSW5zcGVjdCBFbGVtZW50CisgICAgICAgIGFjdGlvbiBhdmFpbGFi bGUgb24gYWxsIHBhbmVscyAoYXMgYW4gZXhwZXJpbWVudCkuCisKKyAgICAgICAgKiBpbnNwZWN0 b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNv bGVWaWV3LnByb3RvdHlwZS5zaG93KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlVmll dy5wcm90b3R5cGUuaGlkZSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50 c1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkVsZW1lbnRzUGFuZWwpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLkVsZW1lbnRzUGFuZWwucHJvdG90eXBlLmdldCBzdGF0dXNCYXJJdGVt cyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRWxlbWVudHNQYW5lbC5wcm90b3R5cGUudXBkYXRl Rm9jdXNlZE5vZGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkVsZW1lbnRzUGFuZWwucHJvdG90 eXBlLl9zZXRTZWFyY2hpbmdGb3JOb2RlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5FbGVtZW50 c1BhbmVsLnByb3RvdHlwZS50b2dnbGVTZWFyY2hpbmdGb3JOb2RlKToKKyAgICAgICAgKiBpbnNw ZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5jc3M6CisgICAgICAgIChidXR0b24uZG9jay1zdGF0 dXMtYmFyLWl0ZW0uc3RhdHVzLWJhci1pdGVtIC5nbHlwaCk6CisgICAgICAgIChidXR0b24uZG9j ay1zdGF0dXMtYmFyLWl0ZW0uc3RhdHVzLWJhci1pdGVtLnRvZ2dsZWQtb24gLmdseXBoKToKKyAg ICAgICAgKC5jb25zb2xlLXN0YXR1cy1iYXItaXRlbSAuZ2x5cGgpOgorICAgICAgICAqIGluc3Bl Y3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmh0bWw6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9pbnNwZWN0b3IuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuX2NyZWF0ZUdsb2JhbFN0 YXR1c0Jhckl0ZW1zKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5zZXQgYXR0YWNoZWQpOgorCisy MDExLTA2LTI3ICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AZ29vZ2xlLmNvbT4KKwogICAgICAg ICBSZXZpZXdlZCBieSBZdXJ5IFNlbWlraGF0c2t5LgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6 IFtSRUdSRVNTSU9OIHI4NDQ4MV0gdXBkYXRlTGF5b3V0IGNhbGxlZCBmcm9tIERyYXdOb2RlSGln aGxpZ2h0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0Nv bnNvbGVWaWV3LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xl Vmlldy5qcwppbmRleCA3ZTlmOGQyMGE2NDAyYTA5YWMwY2RjYzJlOGZmNzA5Y2QxNzcxNTg3Li5m YjE0MTFhMTdjYjMyOTc4ZTYwM2Q1ZTQxMTYwYWZmM2NhN2MzZWZmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanMKQEAgLTU0LDggKzU0 LDcgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3ID0gZnVuY3Rpb24oZHJhd2VyKQogICAgIHRo aXMubWVzc2FnZXNFbGVtZW50Lmluc2VydEJlZm9yZSh0aGlzLnRvcEdyb3VwLmVsZW1lbnQsIHRo aXMucHJvbXB0RWxlbWVudCk7CiAgICAgdGhpcy5jdXJyZW50R3JvdXAgPSB0aGlzLnRvcEdyb3Vw OwogCi0gICAgdGhpcy50b2dnbGVDb25zb2xlQnV0dG9uID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5 SWQoImNvbnNvbGUtc3RhdHVzLWJhci1pdGVtIik7Ci0gICAgdGhpcy50b2dnbGVDb25zb2xlQnV0 dG9uLnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTaG93IGNvbnNvbGUuIik7CisgICAg dGhpcy50b2dnbGVDb25zb2xlQnV0dG9uID0gbmV3IFdlYkluc3BlY3Rvci5TdGF0dXNCYXJCdXR0 b24oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTaG93IGNvbnNvbGUuIiksICJjb25zb2xlLXN0YXR1 cy1iYXItaXRlbSIpOwogICAgIHRoaXMudG9nZ2xlQ29uc29sZUJ1dHRvbi5hZGRFdmVudExpc3Rl bmVyKCJjbGljayIsIHRoaXMuX3RvZ2dsZUNvbnNvbGVCdXR0b25DbGlja2VkLmJpbmQodGhpcyks IGZhbHNlKTsKIAogICAgIC8vIFdpbGwgaG9sZCB0aGUgbGlzdCBvZiBmaWx0ZXIgZWxlbWVudHMK QEAgLTI0NSw3ICsyNDQsNyBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZVZpZXcucHJvdG90eXBlID0g ewogCiAgICAgc2hvdzogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgdGhpcy50b2dnbGVDb25z b2xlQnV0dG9uLmFkZFN0eWxlQ2xhc3MoInRvZ2dsZWQtb24iKTsKKyAgICAgICAgdGhpcy50b2dn bGVDb25zb2xlQnV0dG9uLnRvZ2dsZWQgPSB0cnVlOwogICAgICAgICB0aGlzLnRvZ2dsZUNvbnNv bGVCdXR0b24udGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkhpZGUgY29uc29sZS4iKTsK ICAgICAgICAgaWYgKCF0aGlzLnByb21wdC5pc0NhcmV0SW5zaWRlUHJvbXB0KCkpCiAgICAgICAg ICAgICB0aGlzLnByb21wdC5tb3ZlQ2FyZXRUb0VuZE9mUHJvbXB0KCk7CkBAIC0yNTgsNyArMjU3 LDcgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3LnByb3RvdHlwZSA9IHsKIAogICAgIGhpZGU6 IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIHRoaXMudG9nZ2xlQ29uc29sZUJ1dHRvbi5yZW1v dmVTdHlsZUNsYXNzKCJ0b2dnbGVkLW9uIik7CisgICAgICAgIHRoaXMudG9nZ2xlQ29uc29sZUJ1 dHRvbi50b2dnbGVkID0gZmFsc2U7CiAgICAgICAgIHRoaXMudG9nZ2xlQ29uc29sZUJ1dHRvbi50 aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiU2hvdyBjb25zb2xlLiIpOwogICAgIH0sCiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNQ YW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNQYW5l bC5qcwppbmRleCBkNmNjMGQyZmVhZGZhNTFmMzVhZjY3ZTQyNWU5MjMwNDhjZWZmOGEyLi5lZDAz ZjZjNTRlMTVmNzg0MzMxNTJlNjVjMTUzZjU5YTFiYjg1YWU5IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzUGFuZWwuanMKKysrIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1BhbmVsLmpzCkBAIC0xMDcsOCAr MTA3LDggQEAgV2ViSW5zcGVjdG9yLkVsZW1lbnRzUGFuZWwgPSBmdW5jdGlvbigpCiAgICAgdGhp cy5zaWRlYmFyUmVzaXplRWxlbWVudC5jbGFzc05hbWUgPSAic2lkZWJhci1yZXNpemVyLXZlcnRp Y2FsIjsKICAgICB0aGlzLnNpZGViYXJSZXNpemVFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoIm1v dXNlZG93biIsIHRoaXMucmlnaHRTaWRlYmFyUmVzaXplckRyYWdTdGFydC5iaW5kKHRoaXMpLCBm YWxzZSk7CiAKLSAgICB0aGlzLl9ub2RlU2VhcmNoQnV0dG9uID0gbmV3IFdlYkluc3BlY3Rvci5T dGF0dXNCYXJCdXR0b24oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTZWxlY3QgYW4gZWxlbWVudCBp biB0aGUgcGFnZSB0byBpbnNwZWN0IGl0LiIpLCAibm9kZS1zZWFyY2gtc3RhdHVzLWJhci1pdGVt Iik7Ci0gICAgdGhpcy5fbm9kZVNlYXJjaEJ1dHRvbi5hZGRFdmVudExpc3RlbmVyKCJjbGljayIs IHRoaXMudG9nZ2xlU2VhcmNoaW5nRm9yTm9kZS5iaW5kKHRoaXMpLCBmYWxzZSk7CisgICAgdGhp cy5ub2RlU2VhcmNoQnV0dG9uID0gbmV3IFdlYkluc3BlY3Rvci5TdGF0dXNCYXJCdXR0b24oV2Vi SW5zcGVjdG9yLlVJU3RyaW5nKCJTZWxlY3QgYW4gZWxlbWVudCBpbiB0aGUgcGFnZSB0byBpbnNw ZWN0IGl0LiIpLCAibm9kZS1zZWFyY2gtc3RhdHVzLWJhci1pdGVtIik7CisgICAgdGhpcy5ub2Rl U2VhcmNoQnV0dG9uLmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy50b2dnbGVTZWFyY2hp bmdGb3JOb2RlLmJpbmQodGhpcyksIGZhbHNlKTsKIAogICAgIHRoaXMuZWxlbWVudC5hcHBlbmRD aGlsZCh0aGlzLmNvbnRlbnRFbGVtZW50KTsKICAgICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQo dGhpcy5zaWRlYmFyRWxlbWVudCk7CkBAIC0xMzQsNyArMTM0LDcgQEAgV2ViSW5zcGVjdG9yLkVs ZW1lbnRzUGFuZWwucHJvdG90eXBlID0gewogCiAgICAgZ2V0IHN0YXR1c0Jhckl0ZW1zKCkKICAg ICB7Ci0gICAgICAgIHJldHVybiBbdGhpcy5fbm9kZVNlYXJjaEJ1dHRvbi5lbGVtZW50LCB0aGlz LmNydW1ic0VsZW1lbnRdOworICAgICAgICByZXR1cm4gW3RoaXMuY3J1bWJzRWxlbWVudF07CiAg ICAgfSwKIAogICAgIGdldCBkZWZhdWx0Rm9jdXNlZEVsZW1lbnQoKQpAQCAtMTEzOCwxNSArMTEz OCwxNSBAQCBXZWJJbnNwZWN0b3IuRWxlbWVudHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAg ICAgICByZXR1cm47CiAKICAgICAgICAgdGhpcy5mb2N1c2VkRE9NTm9kZSA9IG5vZGU7Ci0gICAg ICAgIGlmICh0aGlzLl9ub2RlU2VhcmNoQnV0dG9uLnRvZ2dsZWQpIHsKKyAgICAgICAgaWYgKHRo aXMubm9kZVNlYXJjaEJ1dHRvbi50b2dnbGVkKSB7CiAgICAgICAgICAgICBJbnNwZWN0b3JGcm9u dGVuZEhvc3QuYnJpbmdUb0Zyb250KCk7Ci0gICAgICAgICAgICB0aGlzLl9ub2RlU2VhcmNoQnV0 dG9uLnRvZ2dsZWQgPSBmYWxzZTsKKyAgICAgICAgICAgIHRoaXMubm9kZVNlYXJjaEJ1dHRvbi50 b2dnbGVkID0gZmFsc2U7CiAgICAgICAgIH0KICAgICB9LAogCiAgICAgX3NldFNlYXJjaGluZ0Zv ck5vZGU6IGZ1bmN0aW9uKGVuYWJsZWQpCiAgICAgewotICAgICAgICB0aGlzLl9ub2RlU2VhcmNo QnV0dG9uLnRvZ2dsZWQgPSBlbmFibGVkOworICAgICAgICB0aGlzLm5vZGVTZWFyY2hCdXR0b24u dG9nZ2xlZCA9IGVuYWJsZWQ7CiAgICAgfSwKIAogICAgIHNldFNlYXJjaGluZ0Zvck5vZGU6IGZ1 bmN0aW9uKGVuYWJsZWQpCkBAIC0xMTU2LDcgKzExNTYsNyBAQCBXZWJJbnNwZWN0b3IuRWxlbWVu dHNQYW5lbC5wcm90b3R5cGUgPSB7CiAKICAgICB0b2dnbGVTZWFyY2hpbmdGb3JOb2RlOiBmdW5j dGlvbigpCiAgICAgewotICAgICAgICB0aGlzLnNldFNlYXJjaGluZ0Zvck5vZGUoIXRoaXMuX25v ZGVTZWFyY2hCdXR0b24udG9nZ2xlZCk7CisgICAgICAgIHRoaXMuc2V0U2VhcmNoaW5nRm9yTm9k ZSghdGhpcy5ub2RlU2VhcmNoQnV0dG9uLnRvZ2dsZWQpOwogICAgIH0sCiAKICAgICBlbGVtZW50 c1RvUmVzdG9yZVNjcm9sbFBvc2l0aW9uc0ZvcjogZnVuY3Rpb24oKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuY3NzIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuY3NzCmluZGV4IGZjMWE4MDg5NDcy YjZiNDJmZDhiZTcwZjQ1ZGI3N2Y0MTRlY2JlZDAuLjk3Nzc3MWQ0OTZhZjYyZTEzODQ5YzNhYmY3 NzkxMjM3OWJmYjk4NDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvaW5zcGVjdG9yLmNzcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL2luc3BlY3Rvci5jc3MKQEAgLTU0OCwxOSArNTQ4LDIxIEBAIHNlbGVjdC5zdGF0dXMtYmFy LWl0ZW06YWN0aXZlIHsKICAgICAtd2Via2l0LW1hc2staW1hZ2U6IHVybChJbWFnZXMvc3RhdHVz YmFyQnV0dG9uR2x5cGhzLnBuZyk7CiB9CiAKLSNkb2NrLXN0YXR1cy1iYXItaXRlbSAuZ2x5cGgg eworCitidXR0b24uZG9jay1zdGF0dXMtYmFyLWl0ZW0uc3RhdHVzLWJhci1pdGVtIC5nbHlwaCB7 CiAgICAgLXdlYmtpdC1tYXNrLXBvc2l0aW9uOiAwIC00OHB4OwogfQogCi1ib2R5LmRldGFjaGVk ICNkb2NrLXN0YXR1cy1iYXItaXRlbSAuZ2x5cGggeworYnV0dG9uLmRvY2stc3RhdHVzLWJhci1p dGVtLnN0YXR1cy1iYXItaXRlbS50b2dnbGVkLW9uIC5nbHlwaCB7CiAgICAgLXdlYmtpdC1tYXNr LXBvc2l0aW9uOiAtMzJweCAtMjRweDsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2JhKDAsIDAs IDAsIDAuNzUpOwogfQogCiBib2R5LnBvcnQtcXQgI2RvY2stc3RhdHVzLWJhci1pdGVtIHsKICAg ICBkaXNwbGF5OiBub25lCiB9CiAKLSNjb25zb2xlLXN0YXR1cy1iYXItaXRlbSAuZ2x5cGggewor LmNvbnNvbGUtc3RhdHVzLWJhci1pdGVtIC5nbHlwaCB7CiAgICAgLXdlYmtpdC1tYXNrLXBvc2l0 aW9uOiAtNjRweCAtMjRweDsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuaHRtbCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvaW5zcGVjdG9yLmh0bWwKaW5kZXggOWYzZTRjZmIxMzAzODMxMmQ2Y2VkMjIwY2Ji MzMwODFhNzJiNTFkMS4uN2VhNTNhZjM0ZGZiZGQ0OTVhZTAxODQ2ZTNlZDAxNzk1NWZjMGRlOCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3Iu aHRtbAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5o dG1sCkBAIC0xODAsNyArMTgwLDcgQEAgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9G IFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICAgICA8L2Rpdj4KICAgICA8ZGl2IGlk PSJtYWluIj4KICAgICAgICAgPGRpdiBpZD0ibWFpbi1wYW5lbHMiIHNwZWxsY2hlY2s9ImZhbHNl Ij48L2Rpdj4KLSAgICAgICAgPGRpdiBpZD0ibWFpbi1zdGF0dXMtYmFyIiBjbGFzcz0ic3RhdHVz LWJhciI+PGRpdiBpZD0iYW5jaG9yZWQtc3RhdHVzLWJhci1pdGVtcyI+PGJ1dHRvbiBpZD0iZG9j ay1zdGF0dXMtYmFyLWl0ZW0iIGNsYXNzPSJzdGF0dXMtYmFyLWl0ZW0iPjxkaXYgY2xhc3M9Imds eXBoIj48L2Rpdj48ZGl2IGNsYXNzPSJnbHlwaCBzaGFkb3ciPjwvZGl2PjwvYnV0dG9uPjxidXR0 b24gaWQ9ImNvbnNvbGUtc3RhdHVzLWJhci1pdGVtIiBjbGFzcz0ic3RhdHVzLWJhci1pdGVtIj48 ZGl2IGNsYXNzPSJnbHlwaCI+PC9kaXY+PGRpdiBjbGFzcz0iZ2x5cGggc2hhZG93Ij48L2Rpdj48 L2J1dHRvbj48ZGl2IGlkPSJjb3VudGVycyI+PGRpdiBpZD0iZXJyb3Itd2FybmluZy1jb3VudCIg Y2xhc3M9ImhpZGRlbiI+PC9kaXY+PC9kaXY+PC9kaXY+PC9kaXY+CisgICAgICAgIDxkaXYgaWQ9 Im1haW4tc3RhdHVzLWJhciIgY2xhc3M9InN0YXR1cy1iYXIiPjxkaXYgaWQ9ImFuY2hvcmVkLXN0 YXR1cy1iYXItaXRlbXMiPjxkaXYgaWQ9ImNvdW50ZXJzIj48ZGl2IGlkPSJlcnJvci13YXJuaW5n LWNvdW50IiBjbGFzcz0iaGlkZGVuIj48L2Rpdj48L2Rpdj48L2Rpdj48L2Rpdj4KICAgICA8L2Rp dj4KICAgICA8ZGl2IGlkPSJkcmF3ZXIiPgogICAgICAgICA8ZGl2IGlkPSJjb25zb2xlLXZpZXci PjxkaXYgaWQ9ImNvbnNvbGUtbWVzc2FnZXMiIGNsYXNzPSJtb25vc3BhY2UiPjxkaXYgaWQ9ImNv bnNvbGUtcHJvbXB0IiBzcGVsbGNoZWNrPSJmYWxzZSI+PGJyPjwvZGl2PjwvZGl2PjwvZGl2Pgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3Iu anMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcwppbmRl eCA2MjIzMGM5YzgzYWRiM2EwOGI4MGJhNDM1YTg1Y2E0NmY5NmU2MTcyLi5lZTczNjIyMzJiMjQ2 Y2EwM2Y5NzIyNzA4NTQ3YzZlOWNhYTBmZjQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcwpAQCAtMTc3LDYgKzE3NywxOCBAQCB2YXIgV2Vi SW5zcGVjdG9yID0gewogICAgICAgICAgICAgdGhpcy5wYW5lbHMuY29uc29sZSA9IG5ldyBXZWJJ bnNwZWN0b3IuQ29uc29sZVBhbmVsKCk7CiAgICAgfSwKIAorICAgIF9jcmVhdGVHbG9iYWxTdGF0 dXNCYXJJdGVtczogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgdGhpcy5fZG9ja1RvZ2dsZUJ1 dHRvbiA9IG5ldyBXZWJJbnNwZWN0b3IuU3RhdHVzQmFyQnV0dG9uKHRoaXMuYXR0YWNoZWQgPyBX ZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlVuZG9jayBpbnRvIHNlcGFyYXRlIHdpbmRvdy4iKSA6IFdl Ykluc3BlY3Rvci5VSVN0cmluZygiRG9jayB0byBtYWluIHdpbmRvdy4iKSwgImRvY2stc3RhdHVz LWJhci1pdGVtIik7CisgICAgICAgIHRoaXMuX2RvY2tUb2dnbGVCdXR0b24uYWRkRXZlbnRMaXN0 ZW5lcigiY2xpY2siLCB0aGlzLnRvZ2dsZUF0dGFjaC5iaW5kKHRoaXMpLCBmYWxzZSk7CisgICAg ICAgIHRoaXMuX2RvY2tUb2dnbGVCdXR0b24udG9nZ2xlZCA9ICF0aGlzLmF0dGFjaGVkOworCisg ICAgICAgIHZhciBhbmNob3JlZFN0YXR1c0JhciA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJh bmNob3JlZC1zdGF0dXMtYmFyLWl0ZW1zIik7CisgICAgICAgIGFuY2hvcmVkU3RhdHVzQmFyLmFw cGVuZENoaWxkKHRoaXMuX2RvY2tUb2dnbGVCdXR0b24uZWxlbWVudCk7CisgICAgICAgIGFuY2hv cmVkU3RhdHVzQmFyLmFwcGVuZENoaWxkKHRoaXMuY29uc29sZS50b2dnbGVDb25zb2xlQnV0dG9u LmVsZW1lbnQpOworICAgICAgICBhbmNob3JlZFN0YXR1c0Jhci5hcHBlbmRDaGlsZCh0aGlzLnBh bmVscy5lbGVtZW50cy5ub2RlU2VhcmNoQnV0dG9uLmVsZW1lbnQpOworICAgIH0sCisKICAgICBn ZXQgYXR0YWNoZWQoKQogICAgIHsKICAgICAgICAgcmV0dXJuIHRoaXMuX2F0dGFjaGVkOwpAQCAt MTg5LDE3ICsyMDEsMjIgQEAgdmFyIFdlYkluc3BlY3RvciA9IHsKIAogICAgICAgICB0aGlzLl9h dHRhY2hlZCA9IHg7CiAKLSAgICAgICAgdmFyIGRvY2tUb2dnbGVCdXR0b24gPSBkb2N1bWVudC5n ZXRFbGVtZW50QnlJZCgiZG9jay1zdGF0dXMtYmFyLWl0ZW0iKTsKICAgICAgICAgdmFyIGJvZHkg PSBkb2N1bWVudC5ib2R5OwogCiAgICAgICAgIGlmICh4KSB7CiAgICAgICAgICAgICBib2R5LnJl bW92ZVN0eWxlQ2xhc3MoImRldGFjaGVkIik7CiAgICAgICAgICAgICBib2R5LmFkZFN0eWxlQ2xh c3MoImF0dGFjaGVkIik7Ci0gICAgICAgICAgICBkb2NrVG9nZ2xlQnV0dG9uLnRpdGxlID0gV2Vi SW5zcGVjdG9yLlVJU3RyaW5nKCJVbmRvY2sgaW50byBzZXBhcmF0ZSB3aW5kb3cuIik7CisgICAg ICAgICAgICBpZiAodGhpcy5fZG9ja1RvZ2dsZUJ1dHRvbikgeworICAgICAgICAgICAgICAgIHRo aXMuX2RvY2tUb2dnbGVCdXR0b24udGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlVuZG9j ayBpbnRvIHNlcGFyYXRlIHdpbmRvdy4iKTsKKyAgICAgICAgICAgICAgICB0aGlzLl9kb2NrVG9n Z2xlQnV0dG9uLnRvZ2dsZWQgPSBmYWxzZTsKKyAgICAgICAgICAgIH0KICAgICAgICAgfSBlbHNl IHsKICAgICAgICAgICAgIGJvZHkucmVtb3ZlU3R5bGVDbGFzcygiYXR0YWNoZWQiKTsKICAgICAg ICAgICAgIGJvZHkuYWRkU3R5bGVDbGFzcygiZGV0YWNoZWQiKTsKLSAgICAgICAgICAgIGRvY2tU b2dnbGVCdXR0b24udGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkRvY2sgdG8gbWFpbiB3 aW5kb3cuIik7CisgICAgICAgICAgICBpZiAodGhpcy5fZG9ja1RvZ2dsZUJ1dHRvbikgeworICAg ICAgICAgICAgICAgIHRoaXMuX2RvY2tUb2dnbGVCdXR0b24udGl0bGUgPSBXZWJJbnNwZWN0b3Iu VUlTdHJpbmcoIkRvY2sgdG8gbWFpbiB3aW5kb3cuIik7CisgICAgICAgICAgICAgICAgdGhpcy5f ZG9ja1RvZ2dsZUJ1dHRvbi50b2dnbGVkID0gdHJ1ZTsKKyAgICAgICAgICAgIH0KICAgICAgICAg fQogCiAgICAgICAgIC8vIFRoaXMgbWF5IGJlIGNhbGxlZCBiZWZvcmUgb25Mb2FkZWREb25lLCBo ZW5jZSB0aGUgYnVsayBvZiBpbnNwZWN0b3Igb2JqZWN0cyBtYXkKQEAgLTQ0Nyw2ICs0NjQsOCBA QCBXZWJJbnNwZWN0b3IuZG9Mb2FkZWREb25lID0gZnVuY3Rpb24oKQogCiAgICAgdGhpcy5wYW5l bHMgPSB7fTsKICAgICB0aGlzLl9jcmVhdGVQYW5lbHMoKTsKKyAgICB0aGlzLl9jcmVhdGVHbG9i YWxTdGF0dXNCYXJJdGVtcygpOworCiAgICAgdGhpcy5fcGFuZWxIaXN0b3J5ID0gbmV3IFdlYklu c3BlY3Rvci5QYW5lbEhpc3RvcnkoKTsKICAgICB0aGlzLnRvb2xiYXIgPSBuZXcgV2ViSW5zcGVj dG9yLlRvb2xiYXIoKTsKICAgICB0aGlzLnRvb2xiYXIuYXR0YWNoZWQgPSBXZWJJbnNwZWN0b3Iu YXR0YWNoZWQ7CkBAIC00NzMsMTQgKzQ5Miw2IEBAIFdlYkluc3BlY3Rvci5kb0xvYWRlZERvbmUg PSBmdW5jdGlvbigpCiAgICAgZG9jdW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiY29weSIsIHRoaXMu ZG9jdW1lbnRDb3B5LmJpbmQodGhpcyksIHRydWUpOwogICAgIGRvY3VtZW50LmFkZEV2ZW50TGlz dGVuZXIoImNvbnRleHRtZW51IiwgdGhpcy5jb250ZXh0TWVudUV2ZW50RmlyZWQuYmluZCh0aGlz KSwgdHJ1ZSk7CiAKLSAgICB2YXIgZG9ja1RvZ2dsZUJ1dHRvbiA9IGRvY3VtZW50LmdldEVsZW1l bnRCeUlkKCJkb2NrLXN0YXR1cy1iYXItaXRlbSIpOwotICAgIGRvY2tUb2dnbGVCdXR0b24uYWRk RXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0aGlzLnRvZ2dsZUF0dGFjaC5iaW5kKHRoaXMpLCBmYWxz ZSk7Ci0KLSAgICBpZiAodGhpcy5hdHRhY2hlZCkKLSAgICAgICAgZG9ja1RvZ2dsZUJ1dHRvbi50 aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiVW5kb2NrIGludG8gc2VwYXJhdGUgd2luZG93 LiIpOwotICAgIGVsc2UKLSAgICAgICAgZG9ja1RvZ2dsZUJ1dHRvbi50aXRsZSA9IFdlYkluc3Bl Y3Rvci5VSVN0cmluZygiRG9jayB0byBtYWluIHdpbmRvdy4iKTsKLQogICAgIHZhciBlcnJvcldh cm5pbmdDb3VudCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJlcnJvci13YXJuaW5nLWNvdW50 Iik7CiAgICAgZXJyb3JXYXJuaW5nQ291bnQuYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0aGlz LnNob3dDb25zb2xlLmJpbmQodGhpcyksIGZhbHNlKTsKICAgICB0aGlzLl91cGRhdGVFcnJvckFu ZFdhcm5pbmdDb3VudHMoKTsK 98930 2011-06-28 08:40:44 -0700 2011-06-29 06:58:19 -0700 Patch bug-63450-20110628194042.patch text/plain 11319 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogODk5MzEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA3OTdkN2ExZTA1MGY5MjE4 MjQ2MTI2ODI4ZjBlMGRhOTk0NTFlNTY5Li5mZDk0YzZiYWE1NTBkYTVmMmY1OWE3OTI2YzAwYWJj ZjcyMzVhMmIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMTEtMDYtMjggIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGNyZWF0ZSBzdGF0dXMgYmFy IGJ1dHRvbnMgcHJvZ3JhbW1hdGljYWxseS4gQWRkICJJbnNwZWN0IiBidXR0b24gdG8gYWxsIHBh bmVscy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYz NDUwCisKKyAgICAgICAgQnV0dG9ucyBzaG91bGQgYmUgY3JlYXRlZCBpbiBjb2RlLCBub3QgaW4g SFRNTC4gQWxzbyBtYWtpbmcgSW5zcGVjdCBFbGVtZW50CisgICAgICAgIGFjdGlvbiBhdmFpbGFi bGUgb24gYWxsIHBhbmVscyAoYXMgYW4gZXhwZXJpbWVudCkuCisKKyAgICAgICAgKiBpbnNwZWN0 b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNv bGVWaWV3LnByb3RvdHlwZS5zaG93KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlVmll dy5wcm90b3R5cGUuaGlkZSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50 c1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkVsZW1lbnRzUGFuZWwpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLkVsZW1lbnRzUGFuZWwucHJvdG90eXBlLmdldCBzdGF0dXNCYXJJdGVt cyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRWxlbWVudHNQYW5lbC5wcm90b3R5cGUudXBkYXRl Rm9jdXNlZE5vZGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkVsZW1lbnRzUGFuZWwucHJvdG90 eXBlLl9zZXRTZWFyY2hpbmdGb3JOb2RlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5FbGVtZW50 c1BhbmVsLnByb3RvdHlwZS50b2dnbGVTZWFyY2hpbmdGb3JOb2RlKToKKyAgICAgICAgKiBpbnNw ZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5jc3M6CisgICAgICAgIChidXR0b24uZG9jay1zdGF0 dXMtYmFyLWl0ZW0uc3RhdHVzLWJhci1pdGVtIC5nbHlwaCk6CisgICAgICAgIChidXR0b24uZG9j ay1zdGF0dXMtYmFyLWl0ZW0uc3RhdHVzLWJhci1pdGVtLnRvZ2dsZWQtb24gLmdseXBoKToKKyAg ICAgICAgKC5jb25zb2xlLXN0YXR1cy1iYXItaXRlbSAuZ2x5cGgpOgorICAgICAgICAqIGluc3Bl Y3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmh0bWw6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9pbnNwZWN0b3IuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuX2NyZWF0ZUdsb2JhbFN0 YXR1c0Jhckl0ZW1zKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5zZXQgYXR0YWNoZWQpOgorCiAy MDExLTA2LTI3ICBBbGV4YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgUGF2ZWwgRmVsZG1hbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanMgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzCmluZGV4IDRiMzc1MTdiNDk5YjUxODY3 MzYzMmQzOWE1Y2EzMTYyMzAzMGViNDEuLjkyOTNhNDdiNzY1ZTI5NzRjYTU0OTYyY2QxMzRiMmRi NzUyYzVlOTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv Q29uc29sZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9D b25zb2xlVmlldy5qcwpAQCAtNTQsOCArNTQsNyBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZVZpZXcg PSBmdW5jdGlvbihkcmF3ZXIpCiAgICAgdGhpcy5tZXNzYWdlc0VsZW1lbnQuaW5zZXJ0QmVmb3Jl KHRoaXMudG9wR3JvdXAuZWxlbWVudCwgdGhpcy5wcm9tcHRFbGVtZW50KTsKICAgICB0aGlzLmN1 cnJlbnRHcm91cCA9IHRoaXMudG9wR3JvdXA7CiAKLSAgICB0aGlzLnRvZ2dsZUNvbnNvbGVCdXR0 b24gPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiY29uc29sZS1zdGF0dXMtYmFyLWl0ZW0iKTsK LSAgICB0aGlzLnRvZ2dsZUNvbnNvbGVCdXR0b24udGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJp bmcoIlNob3cgY29uc29sZS4iKTsKKyAgICB0aGlzLnRvZ2dsZUNvbnNvbGVCdXR0b24gPSBuZXcg V2ViSW5zcGVjdG9yLlN0YXR1c0JhckJ1dHRvbihXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNob3cg Y29uc29sZS4iKSwgImNvbnNvbGUtc3RhdHVzLWJhci1pdGVtIik7CiAgICAgdGhpcy50b2dnbGVD b25zb2xlQnV0dG9uLmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5fdG9nZ2xlQ29uc29s ZUJ1dHRvbkNsaWNrZWQuYmluZCh0aGlzKSwgZmFsc2UpOwogCiAgICAgLy8gV2lsbCBob2xkIHRo ZSBsaXN0IG9mIGZpbHRlciBlbGVtZW50cwpAQCAtMjQ1LDcgKzI0NCw3IEBAIFdlYkluc3BlY3Rv ci5Db25zb2xlVmlldy5wcm90b3R5cGUgPSB7CiAKICAgICBzaG93OiBmdW5jdGlvbigpCiAgICAg ewotICAgICAgICB0aGlzLnRvZ2dsZUNvbnNvbGVCdXR0b24uYWRkU3R5bGVDbGFzcygidG9nZ2xl ZC1vbiIpOworICAgICAgICB0aGlzLnRvZ2dsZUNvbnNvbGVCdXR0b24udG9nZ2xlZCA9IHRydWU7 CiAgICAgICAgIHRoaXMudG9nZ2xlQ29uc29sZUJ1dHRvbi50aXRsZSA9IFdlYkluc3BlY3Rvci5V SVN0cmluZygiSGlkZSBjb25zb2xlLiIpOwogICAgICAgICBpZiAoIXRoaXMucHJvbXB0LmlzQ2Fy ZXRJbnNpZGVQcm9tcHQoKSkKICAgICAgICAgICAgIHRoaXMucHJvbXB0Lm1vdmVDYXJldFRvRW5k T2ZQcm9tcHQoKTsKQEAgLTI1OCw3ICsyNTcsNyBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZVZpZXcu cHJvdG90eXBlID0gewogCiAgICAgaGlkZTogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgdGhp cy50b2dnbGVDb25zb2xlQnV0dG9uLnJlbW92ZVN0eWxlQ2xhc3MoInRvZ2dsZWQtb24iKTsKKyAg ICAgICAgdGhpcy50b2dnbGVDb25zb2xlQnV0dG9uLnRvZ2dsZWQgPSBmYWxzZTsKICAgICAgICAg dGhpcy50b2dnbGVDb25zb2xlQnV0dG9uLnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJT aG93IGNvbnNvbGUuIik7CiAgICAgfSwKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1BhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9FbGVtZW50c1BhbmVsLmpzCmluZGV4IGQ2Y2MwZDJmZWFkZmE1MWYzNWFm NjdlNDI1ZTkyMzA0OGNlZmY4YTIuLmVkMDNmNmM1NGUxNWY3ODQzMzE1MmU2NWMxNTNmNTlhMWJi ODVhZTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxl bWVudHNQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0Vs ZW1lbnRzUGFuZWwuanMKQEAgLTEwNyw4ICsxMDcsOCBAQCBXZWJJbnNwZWN0b3IuRWxlbWVudHNQ YW5lbCA9IGZ1bmN0aW9uKCkKICAgICB0aGlzLnNpZGViYXJSZXNpemVFbGVtZW50LmNsYXNzTmFt ZSA9ICJzaWRlYmFyLXJlc2l6ZXItdmVydGljYWwiOwogICAgIHRoaXMuc2lkZWJhclJlc2l6ZUVs ZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2Vkb3duIiwgdGhpcy5yaWdodFNpZGViYXJSZXNp emVyRHJhZ1N0YXJ0LmJpbmQodGhpcyksIGZhbHNlKTsKIAotICAgIHRoaXMuX25vZGVTZWFyY2hC dXR0b24gPSBuZXcgV2ViSW5zcGVjdG9yLlN0YXR1c0JhckJ1dHRvbihXZWJJbnNwZWN0b3IuVUlT dHJpbmcoIlNlbGVjdCBhbiBlbGVtZW50IGluIHRoZSBwYWdlIHRvIGluc3BlY3QgaXQuIiksICJu b2RlLXNlYXJjaC1zdGF0dXMtYmFyLWl0ZW0iKTsKLSAgICB0aGlzLl9ub2RlU2VhcmNoQnV0dG9u LmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy50b2dnbGVTZWFyY2hpbmdGb3JOb2RlLmJp bmQodGhpcyksIGZhbHNlKTsKKyAgICB0aGlzLm5vZGVTZWFyY2hCdXR0b24gPSBuZXcgV2ViSW5z cGVjdG9yLlN0YXR1c0JhckJ1dHRvbihXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNlbGVjdCBhbiBl bGVtZW50IGluIHRoZSBwYWdlIHRvIGluc3BlY3QgaXQuIiksICJub2RlLXNlYXJjaC1zdGF0dXMt YmFyLWl0ZW0iKTsKKyAgICB0aGlzLm5vZGVTZWFyY2hCdXR0b24uYWRkRXZlbnRMaXN0ZW5lcigi Y2xpY2siLCB0aGlzLnRvZ2dsZVNlYXJjaGluZ0Zvck5vZGUuYmluZCh0aGlzKSwgZmFsc2UpOwog CiAgICAgdGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuY29udGVudEVsZW1lbnQpOwogICAg IHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLnNpZGViYXJFbGVtZW50KTsKQEAgLTEzNCw3 ICsxMzQsNyBAQCBXZWJJbnNwZWN0b3IuRWxlbWVudHNQYW5lbC5wcm90b3R5cGUgPSB7CiAKICAg ICBnZXQgc3RhdHVzQmFySXRlbXMoKQogICAgIHsKLSAgICAgICAgcmV0dXJuIFt0aGlzLl9ub2Rl U2VhcmNoQnV0dG9uLmVsZW1lbnQsIHRoaXMuY3J1bWJzRWxlbWVudF07CisgICAgICAgIHJldHVy biBbdGhpcy5jcnVtYnNFbGVtZW50XTsKICAgICB9LAogCiAgICAgZ2V0IGRlZmF1bHRGb2N1c2Vk RWxlbWVudCgpCkBAIC0xMTM4LDE1ICsxMTM4LDE1IEBAIFdlYkluc3BlY3Rvci5FbGVtZW50c1Bh bmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICB0aGlzLmZv Y3VzZWRET01Ob2RlID0gbm9kZTsKLSAgICAgICAgaWYgKHRoaXMuX25vZGVTZWFyY2hCdXR0b24u dG9nZ2xlZCkgeworICAgICAgICBpZiAodGhpcy5ub2RlU2VhcmNoQnV0dG9uLnRvZ2dsZWQpIHsK ICAgICAgICAgICAgIEluc3BlY3RvckZyb250ZW5kSG9zdC5icmluZ1RvRnJvbnQoKTsKLSAgICAg ICAgICAgIHRoaXMuX25vZGVTZWFyY2hCdXR0b24udG9nZ2xlZCA9IGZhbHNlOworICAgICAgICAg ICAgdGhpcy5ub2RlU2VhcmNoQnV0dG9uLnRvZ2dsZWQgPSBmYWxzZTsKICAgICAgICAgfQogICAg IH0sCiAKICAgICBfc2V0U2VhcmNoaW5nRm9yTm9kZTogZnVuY3Rpb24oZW5hYmxlZCkKICAgICB7 Ci0gICAgICAgIHRoaXMuX25vZGVTZWFyY2hCdXR0b24udG9nZ2xlZCA9IGVuYWJsZWQ7CisgICAg ICAgIHRoaXMubm9kZVNlYXJjaEJ1dHRvbi50b2dnbGVkID0gZW5hYmxlZDsKICAgICB9LAogCiAg ICAgc2V0U2VhcmNoaW5nRm9yTm9kZTogZnVuY3Rpb24oZW5hYmxlZCkKQEAgLTExNTYsNyArMTE1 Niw3IEBAIFdlYkluc3BlY3Rvci5FbGVtZW50c1BhbmVsLnByb3RvdHlwZSA9IHsKIAogICAgIHRv Z2dsZVNlYXJjaGluZ0Zvck5vZGU6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIHRoaXMuc2V0 U2VhcmNoaW5nRm9yTm9kZSghdGhpcy5fbm9kZVNlYXJjaEJ1dHRvbi50b2dnbGVkKTsKKyAgICAg ICAgdGhpcy5zZXRTZWFyY2hpbmdGb3JOb2RlKCF0aGlzLm5vZGVTZWFyY2hCdXR0b24udG9nZ2xl ZCk7CiAgICAgfSwKIAogICAgIGVsZW1lbnRzVG9SZXN0b3JlU2Nyb2xsUG9zaXRpb25zRm9yOiBm dW5jdGlvbigpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L2luc3BlY3Rvci5jc3MgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3Bl Y3Rvci5jc3MKaW5kZXggNTFhYTQ0NmEwMzdkYmRlMDQwZmU1YjRmZTEyYjI4MWZlMTIzYjlmMS4u ZWIxNzZlMDAyYzE4ZDg0MWFhMGU1NTE2ZWJkZDk1NzZmODM4YzllOSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuY3NzCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmNzcwpAQCAtNTQ4LDE5ICs1 NDgsMjEgQEAgc2VsZWN0LnN0YXR1cy1iYXItaXRlbTphY3RpdmUgewogICAgIC13ZWJraXQtbWFz ay1pbWFnZTogdXJsKEltYWdlcy9zdGF0dXNiYXJCdXR0b25HbHlwaHMucG5nKTsKIH0KIAotI2Rv Y2stc3RhdHVzLWJhci1pdGVtIC5nbHlwaCB7CisKK2J1dHRvbi5kb2NrLXN0YXR1cy1iYXItaXRl bS5zdGF0dXMtYmFyLWl0ZW0gLmdseXBoIHsKICAgICAtd2Via2l0LW1hc2stcG9zaXRpb246IDAg LTQ4cHg7CiB9CiAKLWJvZHkuZGV0YWNoZWQgI2RvY2stc3RhdHVzLWJhci1pdGVtIC5nbHlwaCB7 CitidXR0b24uZG9jay1zdGF0dXMtYmFyLWl0ZW0uc3RhdHVzLWJhci1pdGVtLnRvZ2dsZWQtb24g LmdseXBoIHsKICAgICAtd2Via2l0LW1hc2stcG9zaXRpb246IC0zMnB4IC0yNHB4OworICAgIGJh Y2tncm91bmQtY29sb3I6IHJnYmEoMCwgMCwgMCwgMC43NSk7CiB9CiAKIGJvZHkucG9ydC1xdCAj ZG9jay1zdGF0dXMtYmFyLWl0ZW0gewogICAgIGRpc3BsYXk6IG5vbmUKIH0KIAotI2NvbnNvbGUt c3RhdHVzLWJhci1pdGVtIC5nbHlwaCB7CisuY29uc29sZS1zdGF0dXMtYmFyLWl0ZW0gLmdseXBo IHsKICAgICAtd2Via2l0LW1hc2stcG9zaXRpb246IC02NHB4IC0yNHB4OwogfQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5odG1sIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuaHRtbAppbmRleCA5 ZjNlNGNmYjEzMDM4MzEyZDZjZWQyMjBjYmIzMzA4MWE3MmI1MWQxLi43ZWE1M2FmMzRkZmJkZDQ5 NWFlMDE4NDZlM2VkMDE3OTU1ZmMwZGU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5odG1sCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmh0bWwKQEAgLTE4MCw3ICsxODAsNyBAQCBUSElTIFNP RlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdF LgogICAgIDwvZGl2PgogICAgIDxkaXYgaWQ9Im1haW4iPgogICAgICAgICA8ZGl2IGlkPSJtYWlu LXBhbmVscyIgc3BlbGxjaGVjaz0iZmFsc2UiPjwvZGl2PgotICAgICAgICA8ZGl2IGlkPSJtYWlu LXN0YXR1cy1iYXIiIGNsYXNzPSJzdGF0dXMtYmFyIj48ZGl2IGlkPSJhbmNob3JlZC1zdGF0dXMt YmFyLWl0ZW1zIj48YnV0dG9uIGlkPSJkb2NrLXN0YXR1cy1iYXItaXRlbSIgY2xhc3M9InN0YXR1 cy1iYXItaXRlbSI+PGRpdiBjbGFzcz0iZ2x5cGgiPjwvZGl2PjxkaXYgY2xhc3M9ImdseXBoIHNo YWRvdyI+PC9kaXY+PC9idXR0b24+PGJ1dHRvbiBpZD0iY29uc29sZS1zdGF0dXMtYmFyLWl0ZW0i IGNsYXNzPSJzdGF0dXMtYmFyLWl0ZW0iPjxkaXYgY2xhc3M9ImdseXBoIj48L2Rpdj48ZGl2IGNs YXNzPSJnbHlwaCBzaGFkb3ciPjwvZGl2PjwvYnV0dG9uPjxkaXYgaWQ9ImNvdW50ZXJzIj48ZGl2 IGlkPSJlcnJvci13YXJuaW5nLWNvdW50IiBjbGFzcz0iaGlkZGVuIj48L2Rpdj48L2Rpdj48L2Rp dj48L2Rpdj4KKyAgICAgICAgPGRpdiBpZD0ibWFpbi1zdGF0dXMtYmFyIiBjbGFzcz0ic3RhdHVz LWJhciI+PGRpdiBpZD0iYW5jaG9yZWQtc3RhdHVzLWJhci1pdGVtcyI+PGRpdiBpZD0iY291bnRl cnMiPjxkaXYgaWQ9ImVycm9yLXdhcm5pbmctY291bnQiIGNsYXNzPSJoaWRkZW4iPjwvZGl2Pjwv ZGl2PjwvZGl2PjwvZGl2PgogICAgIDwvZGl2PgogICAgIDxkaXYgaWQ9ImRyYXdlciI+CiAgICAg ICAgIDxkaXYgaWQ9ImNvbnNvbGUtdmlldyI+PGRpdiBpZD0iY29uc29sZS1tZXNzYWdlcyIgY2xh c3M9Im1vbm9zcGFjZSI+PGRpdiBpZD0iY29uc29sZS1wcm9tcHQiIHNwZWxsY2hlY2s9ImZhbHNl Ij48YnI+PC9kaXY+PC9kaXY+PC9kaXY+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvaW5zcGVjdG9yLmpzCmluZGV4IDYyMjMwYzljODNhZGIzYTA4YjgwYmE0MzVhODVj YTQ2Zjk2ZTYxNzIuLjNiMTYzZmQ2OTQ2ZDNiZDgxNzlkNzkzZTIwZjA5MzQ0MDE2ZmJlNzUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpz CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCkBA IC0xNzcsNiArMTc3LDI0IEBAIHZhciBXZWJJbnNwZWN0b3IgPSB7CiAgICAgICAgICAgICB0aGlz LnBhbmVscy5jb25zb2xlID0gbmV3IFdlYkluc3BlY3Rvci5Db25zb2xlUGFuZWwoKTsKICAgICB9 LAogCisgICAgX2NyZWF0ZUdsb2JhbFN0YXR1c0Jhckl0ZW1zOiBmdW5jdGlvbigpCisgICAgewor ICAgICAgICB0aGlzLl9kb2NrVG9nZ2xlQnV0dG9uID0gbmV3IFdlYkluc3BlY3Rvci5TdGF0dXNC YXJCdXR0b24odGhpcy5fZG9ja0J1dHRvblRpdGxlKCksICJkb2NrLXN0YXR1cy1iYXItaXRlbSIp OworICAgICAgICB0aGlzLl9kb2NrVG9nZ2xlQnV0dG9uLmFkZEV2ZW50TGlzdGVuZXIoImNsaWNr IiwgdGhpcy50b2dnbGVBdHRhY2guYmluZCh0aGlzKSwgZmFsc2UpOworICAgICAgICB0aGlzLl9k b2NrVG9nZ2xlQnV0dG9uLnRvZ2dsZWQgPSAhdGhpcy5hdHRhY2hlZDsKKworICAgICAgICB2YXIg YW5jaG9yZWRTdGF0dXNCYXIgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiYW5jaG9yZWQtc3Rh dHVzLWJhci1pdGVtcyIpOworICAgICAgICBhbmNob3JlZFN0YXR1c0Jhci5hcHBlbmRDaGlsZCh0 aGlzLl9kb2NrVG9nZ2xlQnV0dG9uLmVsZW1lbnQpOworICAgICAgICBhbmNob3JlZFN0YXR1c0Jh ci5hcHBlbmRDaGlsZCh0aGlzLmNvbnNvbGUudG9nZ2xlQ29uc29sZUJ1dHRvbi5lbGVtZW50KTsK KyAgICAgICAgaWYgKHRoaXMucGFuZWxzLmVsZW1lbnRzKQorICAgICAgICAgICAgYW5jaG9yZWRT dGF0dXNCYXIuYXBwZW5kQ2hpbGQodGhpcy5wYW5lbHMuZWxlbWVudHMubm9kZVNlYXJjaEJ1dHRv bi5lbGVtZW50KTsKKyAgICB9LAorCisgICAgX2RvY2tCdXR0b25UaXRsZTogZnVuY3Rpb24oKQor ICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuYXR0YWNoZWQgPyBXZWJJbnNwZWN0b3IuVUlTdHJp bmcoIlVuZG9jayBpbnRvIHNlcGFyYXRlIHdpbmRvdy4iKSA6IFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiRG9jayB0byBtYWluIHdpbmRvdy4iKTsKKyAgICB9LAorCiAgICAgZ2V0IGF0dGFjaGVkKCkK ICAgICB7CiAgICAgICAgIHJldHVybiB0aGlzLl9hdHRhY2hlZDsKQEAgLTE4OSwxNyArMjA3LDE5 IEBAIHZhciBXZWJJbnNwZWN0b3IgPSB7CiAKICAgICAgICAgdGhpcy5fYXR0YWNoZWQgPSB4Owog Ci0gICAgICAgIHZhciBkb2NrVG9nZ2xlQnV0dG9uID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQo ImRvY2stc3RhdHVzLWJhci1pdGVtIik7CiAgICAgICAgIHZhciBib2R5ID0gZG9jdW1lbnQuYm9k eTsKIAogICAgICAgICBpZiAoeCkgewogICAgICAgICAgICAgYm9keS5yZW1vdmVTdHlsZUNsYXNz KCJkZXRhY2hlZCIpOwogICAgICAgICAgICAgYm9keS5hZGRTdHlsZUNsYXNzKCJhdHRhY2hlZCIp OwotICAgICAgICAgICAgZG9ja1RvZ2dsZUJ1dHRvbi50aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0 cmluZygiVW5kb2NrIGludG8gc2VwYXJhdGUgd2luZG93LiIpOwogICAgICAgICB9IGVsc2Ugewog ICAgICAgICAgICAgYm9keS5yZW1vdmVTdHlsZUNsYXNzKCJhdHRhY2hlZCIpOwogICAgICAgICAg ICAgYm9keS5hZGRTdHlsZUNsYXNzKCJkZXRhY2hlZCIpOwotICAgICAgICAgICAgZG9ja1RvZ2ds ZUJ1dHRvbi50aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiRG9jayB0byBtYWluIHdpbmRv dy4iKTsKKyAgICAgICAgfQorCisgICAgICAgIGlmICh0aGlzLl9kb2NrVG9nZ2xlQnV0dG9uKSB7 CisgICAgICAgICAgICB0aGlzLl9kb2NrVG9nZ2xlQnV0dG9uLnRpdGxlID0gdGhpcy5fZG9ja0J1 dHRvblRpdGxlKCk7CisgICAgICAgICAgICB0aGlzLl9kb2NrVG9nZ2xlQnV0dG9uLnRvZ2dsZWQg PSAheDsKICAgICAgICAgfQogCiAgICAgICAgIC8vIFRoaXMgbWF5IGJlIGNhbGxlZCBiZWZvcmUg b25Mb2FkZWREb25lLCBoZW5jZSB0aGUgYnVsayBvZiBpbnNwZWN0b3Igb2JqZWN0cyBtYXkKQEAg LTQ0Nyw2ICs0NjcsOCBAQCBXZWJJbnNwZWN0b3IuZG9Mb2FkZWREb25lID0gZnVuY3Rpb24oKQog CiAgICAgdGhpcy5wYW5lbHMgPSB7fTsKICAgICB0aGlzLl9jcmVhdGVQYW5lbHMoKTsKKyAgICB0 aGlzLl9jcmVhdGVHbG9iYWxTdGF0dXNCYXJJdGVtcygpOworCiAgICAgdGhpcy5fcGFuZWxIaXN0 b3J5ID0gbmV3IFdlYkluc3BlY3Rvci5QYW5lbEhpc3RvcnkoKTsKICAgICB0aGlzLnRvb2xiYXIg PSBuZXcgV2ViSW5zcGVjdG9yLlRvb2xiYXIoKTsKICAgICB0aGlzLnRvb2xiYXIuYXR0YWNoZWQg PSBXZWJJbnNwZWN0b3IuYXR0YWNoZWQ7CkBAIC00NzMsMTQgKzQ5NSw2IEBAIFdlYkluc3BlY3Rv ci5kb0xvYWRlZERvbmUgPSBmdW5jdGlvbigpCiAgICAgZG9jdW1lbnQuYWRkRXZlbnRMaXN0ZW5l cigiY29weSIsIHRoaXMuZG9jdW1lbnRDb3B5LmJpbmQodGhpcyksIHRydWUpOwogICAgIGRvY3Vt ZW50LmFkZEV2ZW50TGlzdGVuZXIoImNvbnRleHRtZW51IiwgdGhpcy5jb250ZXh0TWVudUV2ZW50 RmlyZWQuYmluZCh0aGlzKSwgdHJ1ZSk7CiAKLSAgICB2YXIgZG9ja1RvZ2dsZUJ1dHRvbiA9IGRv Y3VtZW50LmdldEVsZW1lbnRCeUlkKCJkb2NrLXN0YXR1cy1iYXItaXRlbSIpOwotICAgIGRvY2tU b2dnbGVCdXR0b24uYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0aGlzLnRvZ2dsZUF0dGFjaC5i aW5kKHRoaXMpLCBmYWxzZSk7Ci0KLSAgICBpZiAodGhpcy5hdHRhY2hlZCkKLSAgICAgICAgZG9j a1RvZ2dsZUJ1dHRvbi50aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiVW5kb2NrIGludG8g c2VwYXJhdGUgd2luZG93LiIpOwotICAgIGVsc2UKLSAgICAgICAgZG9ja1RvZ2dsZUJ1dHRvbi50 aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiRG9jayB0byBtYWluIHdpbmRvdy4iKTsKLQog ICAgIHZhciBlcnJvcldhcm5pbmdDb3VudCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJlcnJv ci13YXJuaW5nLWNvdW50Iik7CiAgICAgZXJyb3JXYXJuaW5nQ291bnQuYWRkRXZlbnRMaXN0ZW5l cigiY2xpY2siLCB0aGlzLnNob3dDb25zb2xlLmJpbmQodGhpcyksIGZhbHNlKTsKICAgICB0aGlz Ll91cGRhdGVFcnJvckFuZFdhcm5pbmdDb3VudHMoKTsK