99980 2012-10-22 04:59:17 -0700 Web Inspector: Elaborate source panel sidebar context menus. 2012-10-23 03:45:45 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 eustas.bug eustas.bug apavlov bweinstein caseq eustas.bug joepeck keishi loislo pfeldman pmuellr rik vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 747430 0 eustas.bug 2012-10-22 04:59:17 -0700 * Watches: add "Add watch expression" item to items and empty element * Watches: hide "Remove watch expression" from editing prompt context menu * Watches: add titles to header buttons * XHR Breakpoints: add "Add Breakpoint" item to items and empty element * XHR Breakpoints: add "Remove all breakpoints" item to items (when >1) * XHR Breakpoints: add title to header button * JS Breakpoints: hide "Remove/(De)Activate all breakpoints" when only 1 item present 747435 1 169879 eustas.bug 2012-10-22 05:03:17 -0700 Created attachment 169879 Patch 748277 2 169879 yurys 2012-10-22 22:22:31 -0700 Comment on attachment 169879 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=169879&action=review > Source/WebCore/inspector/front-end/BreakpointsSidebarPane.js:198 > + var breakpointActiveTitle = WebInspector.UIString(breakpointActive ? "Deactivate All Breakpoints" : "Activate All Breakpoints"); We can change state of "Activate All Breakpoints" option on the toolbar even if there are no breakpoints so I think it could make sense to always have this option in the context menu no matter how many breakpoints we have. 748412 3 169879 eustas.bug 2012-10-23 02:30:48 -0700 Comment on attachment 169879 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=169879&action=review >> Source/WebCore/inspector/front-end/BreakpointsSidebarPane.js:198 >> + var breakpointActiveTitle = WebInspector.UIString(breakpointActive ? "Deactivate All Breakpoints" : "Activate All Breakpoints"); > > We can change state of "Activate All Breakpoints" option on the toolbar even if there are no breakpoints so I think it could make sense to always have this option in the context menu no matter how many breakpoints we have. Right you are. Fixed. Also renamed "(De)Activate All Breakpoints" to "(De)Activate Breakpoints" 748421 4 170095 eustas.bug 2012-10-23 02:43:34 -0700 Created attachment 170095 Patch 748436 5 170095 vsevik 2012-10-23 02:59:57 -0700 Comment on attachment 170095 Patch rs=me 748457 6 170095 webkit.review.bot 2012-10-23 03:45:42 -0700 Comment on attachment 170095 Patch Clearing flags on attachment: 170095 Committed r132199: <http://trac.webkit.org/changeset/132199> 748458 7 webkit.review.bot 2012-10-23 03:45:45 -0700 All reviewed patches have been landed. Closing bug. 169879 2012-10-22 05:03:17 -0700 2012-10-23 02:43:28 -0700 Patch bug-99980-20121022160155.patch text/plain 11259 eustas.bug U3VidmVyc2lvbiBSZXZpc2lvbjogMTMyMDUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTNjM2I5ODQ2MTRjYjMz NGE3ZTcyNGY3MjYyNzNjYjBlOTc4OGVkNi4uZDI2OWU5YjBjMDcwNTkxOWEyZTMzZTY4MWU2MWE3 MDkzYzlhZDAxYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTEwLTIyICBFdWdl bmUgS2x5dWNobmlrb3YgIDxldXN0YXMuYnVnQGdtYWlsLmNvbT4KKworICAgICAgICBXZWIgSW5z cGVjdG9yOiBFbGFib3JhdGUgc291cmNlIHBhbmVsIHNpZGViYXIgY29udGV4dCBtZW51cy4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk5OTgwCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgLSBXYXRjaGVzOiBh ZGQgIkFkZCB3YXRjaCBleHByZXNzaW9uIiBpdGVtIHRvIGl0ZW1zIGFuZCBlbXB0eSBlbGVtZW50 CisgICAgICAgIC0gV2F0Y2hlczogaGlkZSAiUmVtb3ZlIHdhdGNoIGV4cHJlc3Npb24iIGZyb20g ZWRpdGluZyBwcm9tcHQgY29udGV4dCBtZW51CisgICAgICAgIC0gV2F0Y2hlczogYWRkIHRpdGxl cyB0byBoZWFkZXIgYnV0dG9ucworICAgICAgICAtIFhIUiBCcmVha3BvaW50czogYWRkICJBZGQg QnJlYWtwb2ludCIgaXRlbSB0byBpdGVtcyBhbmQgZW1wdHkgZWxlbWVudAorICAgICAgICAtIFhI UiBCcmVha3BvaW50czogYWRkICJSZW1vdmUgYWxsIGJyZWFrcG9pbnRzIiBpdGVtIHRvIGl0ZW1z ICh3aGVuID4xKQorICAgICAgICAtIFhIUiBCcmVha3BvaW50czogYWRkIHRpdGxlIHRvIGhlYWRl ciBidXR0b24KKyAgICAgICAgLSBKUyBCcmVha3BvaW50czogaGlkZSAiUmVtb3ZlLyhEZSlBY3Rp dmF0ZSBhbGwgYnJlYWtwb2ludHMiIHdoZW4gb25seSAxIGl0ZW0gcHJlc2VudAorCisgICAgICAg ICogRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzOiBBZGRlZCBjb3JyZXNwb25kaW5n IHN0cmluZ3MuCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9CcmVha3BvaW50c1NpZGVi YXJQYW5lLmpzOiBBZGp1c3RlZCBjb250ZXh0IG1lbnUuCisgICAgICAgIChXZWJJbnNwZWN0b3Iu WEhSQnJlYWtwb2ludHNTaWRlYmFyUGFuZSk6IERpdHRvLgorICAgICAgICAqIGluc3BlY3Rvci9m cm9udC1lbmQvT2JqZWN0UHJvcGVydGllc1NlY3Rpb24uanM6IEFkZGVkICJpc0VkaXRpbmcoKSIK KyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1dhdGNoRXhwcmVzc2lvbnNTaWRlYmFyUGFu ZS5qczogQWRqdXN0ZWQgY29udGV4dCBtZW51LgorCiAyMDEyLTEwLTIyICBBbGxhbiBTYW5kZmVs ZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgogCiAgICAgICAgIFtRdF0gSGFuZGxl IEdFVCBvZiBibG9iIFVSTHMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9FbmdsaXNoLmxw cm9qL2xvY2FsaXplZFN0cmluZ3MuanMgYi9Tb3VyY2UvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL2xv Y2FsaXplZFN0cmluZ3MuanMKaW5kZXggYTk2MmVjNTUzZjEwZGIzMWZmNzYxOWRmNGEwOTMwMTA2 ZDJmZDVkMy4uZjBiOTQ2NDQyMzIwMWE0YjI0NDQ3NmU2Y2I3ZWJhNDM5NjU1ZDE4NCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCisr KyBiL1NvdXJjZS9XZWJDb3JlL0VuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwpAQCAt NTk0LDYgKzU5NCw4IEBAIGxvY2FsaXplZFN0cmluZ3NbIlNlYXJjaCBmaW5pc2hlZC4iXSA9ICJT ZWFyY2ggZmluaXNoZWQuIjsKIGxvY2FsaXplZFN0cmluZ3NbIlNlYXJjaCBpbnRlcnJ1cHRlZC4i XSA9ICJTZWFyY2ggaW50ZXJydXB0ZWQuIjsKIGxvY2FsaXplZFN0cmluZ3NbIkFkZCB0byBXYXRj aCJdID0gIkFkZCB0byBXYXRjaCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJBZGQgdG8gd2F0Y2giXSA9 ICJBZGQgdG8gd2F0Y2giOworbG9jYWxpemVkU3RyaW5nc1siQWRkIHdhdGNoIGV4cHJlc3Npb24i XSA9ICJBZGQgd2F0Y2ggZXhwcmVzc2lvbiI7Citsb2NhbGl6ZWRTdHJpbmdzWyJBZGQgWEhSIGJy ZWFrcG9pbnQiXSA9ICJBZGQgWEhSIGJyZWFrcG9pbnQiOwogbG9jYWxpemVkU3RyaW5nc1siSW5k ZW50YXRpb24iXSA9ICJJbmRlbnRhdGlvbiI7CiBsb2NhbGl6ZWRTdHJpbmdzWyIyIHNwYWNlcyJd ID0gIjIgc3BhY2VzIjsKIGxvY2FsaXplZFN0cmluZ3NbIjQgc3BhY2VzIl0gPSAiNCBzcGFjZXMi OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9CcmVha3Bv aW50c1NpZGViYXJQYW5lLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9C cmVha3BvaW50c1NpZGViYXJQYW5lLmpzCmluZGV4IGJjNGJiNmIwMmYxZGEwZDUzYjI5NGYzYmEy NTg0Zjc3MTI5NTliODMuLjE5M2RiZDRjNGJkMTJmNWY0NzZkNWIwZDMxOTc3ZTBhNDZlYzUzNTYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQnJlYWtwb2lu dHNTaWRlYmFyUGFuZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0JyZWFrcG9pbnRzU2lkZWJhclBhbmUuanMKQEAgLTE3OSwxMiArMTc5LDYgQEAgV2ViSW5zcGVj dG9yLkphdmFTY3JpcHRCcmVha3BvaW50c1NpZGViYXJQYW5lLnByb3RvdHlwZSA9IHsKICAgICB7 CiAgICAgICAgIHZhciBjb250ZXh0TWVudSA9IG5ldyBXZWJJbnNwZWN0b3IuQ29udGV4dE1lbnUo KTsKICAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmco IlJlbW92ZSBCcmVha3BvaW50IiksIGJyZWFrcG9pbnQucmVtb3ZlLmJpbmQoYnJlYWtwb2ludCkp OwotICAgICAgICB2YXIgcmVtb3ZlQWxsVGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoV2Vi SW5zcGVjdG9yLnVzZUxvd2VyQ2FzZU1lbnVUaXRsZXMoKSA/ICJSZW1vdmUgYWxsIGJyZWFrcG9p bnRzIiA6ICJSZW1vdmUgQWxsIEJyZWFrcG9pbnRzIik7Ci0gICAgICAgIGNvbnRleHRNZW51LmFw cGVuZEl0ZW0ocmVtb3ZlQWxsVGl0bGUsIHRoaXMuX2JyZWFrcG9pbnRNYW5hZ2VyLnJlbW92ZUFs bEJyZWFrcG9pbnRzLmJpbmQodGhpcy5fYnJlYWtwb2ludE1hbmFnZXIpKTsKLSAgICAgICAgCi0g ICAgICAgIHZhciBicmVha3BvaW50QWN0aXZlID0gV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwu YnJlYWtwb2ludHNBY3RpdmUoKTsKLSAgICAgICAgdmFyIGJyZWFrcG9pbnRBY3RpdmVUaXRsZSA9 IFdlYkluc3BlY3Rvci5VSVN0cmluZyhicmVha3BvaW50QWN0aXZlID8gIkRlYWN0aXZhdGUgQWxs IEJyZWFrcG9pbnRzIiA6ICJBY3RpdmF0ZSBBbGwgQnJlYWtwb2ludHMiKTsKLSAgICAgICAgY29u dGV4dE1lbnUuYXBwZW5kSXRlbShicmVha3BvaW50QWN0aXZlVGl0bGUsIFdlYkluc3BlY3Rvci5k ZWJ1Z2dlck1vZGVsLnNldEJyZWFrcG9pbnRzQWN0aXZlLmJpbmQoV2ViSW5zcGVjdG9yLmRlYnVn Z2VyTW9kZWwsICFicmVha3BvaW50QWN0aXZlKSk7CiAKICAgICAgICAgZnVuY3Rpb24gZW5hYmxl ZEJyZWFrcG9pbnRDb3VudChicmVha3BvaW50cykKICAgICAgICAgewpAQCAtMTk3LDYgKzE5MSwx MyBAQCBXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdEJyZWFrcG9pbnRzU2lkZWJhclBhbmUucHJvdG90 eXBlID0gewogICAgICAgICB9CiAgICAgICAgIHZhciBicmVha3BvaW50cyA9IHRoaXMuX2l0ZW1z LnZhbHVlcygpOwogICAgICAgICBpZiAoYnJlYWtwb2ludHMubGVuZ3RoID4gMSkgeworICAgICAg ICAgICAgdmFyIHJlbW92ZUFsbFRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKFdlYkluc3Bl Y3Rvci51c2VMb3dlckNhc2VNZW51VGl0bGVzKCkgPyAiUmVtb3ZlIGFsbCBicmVha3BvaW50cyIg OiAiUmVtb3ZlIEFsbCBCcmVha3BvaW50cyIpOworICAgICAgICAgICAgY29udGV4dE1lbnUuYXBw ZW5kSXRlbShyZW1vdmVBbGxUaXRsZSwgdGhpcy5fYnJlYWtwb2ludE1hbmFnZXIucmVtb3ZlQWxs QnJlYWtwb2ludHMuYmluZCh0aGlzLl9icmVha3BvaW50TWFuYWdlcikpOworCisgICAgICAgICAg ICB2YXIgYnJlYWtwb2ludEFjdGl2ZSA9IFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1vZGVsLmJyZWFr cG9pbnRzQWN0aXZlKCk7CisgICAgICAgICAgICB2YXIgYnJlYWtwb2ludEFjdGl2ZVRpdGxlID0g V2ViSW5zcGVjdG9yLlVJU3RyaW5nKGJyZWFrcG9pbnRBY3RpdmUgPyAiRGVhY3RpdmF0ZSBBbGwg QnJlYWtwb2ludHMiIDogIkFjdGl2YXRlIEFsbCBCcmVha3BvaW50cyIpOworICAgICAgICAgICAg Y29udGV4dE1lbnUuYXBwZW5kSXRlbShicmVha3BvaW50QWN0aXZlVGl0bGUsIFdlYkluc3BlY3Rv ci5kZWJ1Z2dlck1vZGVsLnNldEJyZWFrcG9pbnRzQWN0aXZlLmJpbmQoV2ViSW5zcGVjdG9yLmRl YnVnZ2VyTW9kZWwsICFicmVha3BvaW50QWN0aXZlKSk7CisKICAgICAgICAgICAgIHZhciBlbmFi bGVCcmVha3BvaW50Q291bnQgPSBlbmFibGVkQnJlYWtwb2ludENvdW50KGJyZWFrcG9pbnRzKTsK ICAgICAgICAgICAgIHZhciBlbmFibGVUaXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZyhXZWJJ bnNwZWN0b3IudXNlTG93ZXJDYXNlTWVudVRpdGxlcygpID8gIkVuYWJsZSBhbGwgYnJlYWtwb2lu dHMiIDogIkVuYWJsZSBBbGwgQnJlYWtwb2ludHMiKTsKICAgICAgICAgICAgIHZhciBkaXNhYmxl VGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoV2ViSW5zcGVjdG9yLnVzZUxvd2VyQ2FzZU1l bnVUaXRsZXMoKSA/ICJEaXNhYmxlIGFsbCBicmVha3BvaW50cyIgOiAiRGlzYWJsZSBBbGwgQnJl YWtwb2ludHMiKTsKQEAgLTI3MCwxNSArMjcxLDI2IEBAIFdlYkluc3BlY3Rvci5YSFJCcmVha3Bv aW50c1NpZGViYXJQYW5lID0gZnVuY3Rpb24oKQogICAgIHZhciBhZGRCdXR0b24gPSBkb2N1bWVu dC5jcmVhdGVFbGVtZW50KCJidXR0b24iKTsKICAgICBhZGRCdXR0b24uY2xhc3NOYW1lID0gInBh bmUtdGl0bGUtYnV0dG9uIGFkZCI7CiAgICAgYWRkQnV0dG9uLmFkZEV2ZW50TGlzdGVuZXIoImNs aWNrIiwgdGhpcy5fYWRkQnV0dG9uQ2xpY2tlZC5iaW5kKHRoaXMpLCBmYWxzZSk7CisgICAgYWRk QnV0dG9uLnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJBZGQgWEhSIGJyZWFrcG9pbnQi KTsKICAgICB0aGlzLnRpdGxlRWxlbWVudC5hcHBlbmRDaGlsZChhZGRCdXR0b24pOwogCisgICAg dGhpcy5lbXB0eUVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiY29udGV4dG1lbnUiLCB0aGlzLl9l bXB0eUVsZW1lbnRDb250ZXh0TWVudS5iaW5kKHRoaXMpLCB0cnVlKTsKKwogICAgIHRoaXMuX3Jl c3RvcmVCcmVha3BvaW50cygpOwogfQogCiBXZWJJbnNwZWN0b3IuWEhSQnJlYWtwb2ludHNTaWRl YmFyUGFuZS5wcm90b3R5cGUgPSB7CisgICAgX2VtcHR5RWxlbWVudENvbnRleHRNZW51OiBmdW5j dGlvbihldmVudCkKKyAgICB7CisgICAgICAgIHZhciBjb250ZXh0TWVudSA9IG5ldyBXZWJJbnNw ZWN0b3IuQ29udGV4dE1lbnUoKTsKKyAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoIkFkZCBCcmVha3BvaW50IiksIHRoaXMuX2FkZEJ1dHRvbkNsaWNr ZWQuYmluZCh0aGlzKSk7CisgICAgICAgIGNvbnRleHRNZW51LnNob3coZXZlbnQpOworICAgIH0s CisKICAgICBfYWRkQnV0dG9uQ2xpY2tlZDogZnVuY3Rpb24oZXZlbnQpCiAgICAgewotICAgICAg ICBldmVudC5jb25zdW1lKCk7CisgICAgICAgIGlmIChldmVudCkKKyAgICAgICAgICAgIGV2ZW50 LmNvbnN1bWUoKTsKIAogICAgICAgICB0aGlzLmV4cGFuZGVkID0gdHJ1ZTsKIApAQCAtMzYyLDcg KzM3NCwxNyBAQCBXZWJJbnNwZWN0b3IuWEhSQnJlYWtwb2ludHNTaWRlYmFyUGFuZS5wcm90b3R5 cGUgPSB7CiAgICAgICAgICAgICB0aGlzLl9yZW1vdmVCcmVha3BvaW50KHVybCk7CiAgICAgICAg ICAgICB0aGlzLl9zYXZlQnJlYWtwb2ludHMoKTsKICAgICAgICAgfQorICAgICAgICBmdW5jdGlv biByZW1vdmVBbGxCcmVha3BvaW50cygpCisgICAgICAgIHsKKyAgICAgICAgICAgIGZvciAodmFy IHVybCBpbiB0aGlzLl9icmVha3BvaW50RWxlbWVudHMpCisgICAgICAgICAgICAgICAgdGhpcy5f cmVtb3ZlQnJlYWtwb2ludCh1cmwpOworICAgICAgICAgICAgdGhpcy5fc2F2ZUJyZWFrcG9pbnRz KCk7CisgICAgICAgIH0KKyAgICAgICAgdmFyIHJlbW92ZUFsbFRpdGxlID0gV2ViSW5zcGVjdG9y LlVJU3RyaW5nKFdlYkluc3BlY3Rvci51c2VMb3dlckNhc2VNZW51VGl0bGVzKCkgPyAiUmVtb3Zl IGFsbCBicmVha3BvaW50cyIgOiAiUmVtb3ZlIEFsbCBCcmVha3BvaW50cyIpOworCisgICAgICAg IGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJBZGQgQnJlYWtw b2ludCIpLCB0aGlzLl9hZGRCdXR0b25DbGlja2VkLmJpbmQodGhpcykpOwogICAgICAgICBjb250 ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmluZygiUmVtb3ZlIEJyZWFrcG9p bnQiKSwgcmVtb3ZlQnJlYWtwb2ludC5iaW5kKHRoaXMpKTsKKyAgICAgICAgY29udGV4dE1lbnUu YXBwZW5kSXRlbShyZW1vdmVBbGxUaXRsZSwgcmVtb3ZlQWxsQnJlYWtwb2ludHMuYmluZCh0aGlz KSk7CiAgICAgICAgIGNvbnRleHRNZW51LnNob3coZXZlbnQpOwogICAgIH0sCiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvT2JqZWN0UHJvcGVydGllc1Nl Y3Rpb24uanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL09iamVjdFByb3Bl cnRpZXNTZWN0aW9uLmpzCmluZGV4IGI2NGEwMGJlOWMxM2QzNTZjMTQxOTA5YTBhZjYyYzMyNWM0 ODU2Y2QuLjYyNTYwZDRmZThlNGViZDNjNzM5YWQ3NWNlOTg5MDVkMGRlNzRiZGUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvT2JqZWN0UHJvcGVydGllc1Nl Y3Rpb24uanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9PYmplY3RQ cm9wZXJ0aWVzU2VjdGlvbi5qcwpAQCAtMzE5LDYgKzMxOSwxNCBAQCBXZWJJbnNwZWN0b3IuT2Jq ZWN0UHJvcGVydHlUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHByb3h5RWxlbWVu dC5hZGRFdmVudExpc3RlbmVyKCJrZXlkb3duIiwgdGhpcy5fcHJvbXB0S2V5RG93bi5iaW5kKHRo aXMsIGNvbnRleHQpLCBmYWxzZSk7CiAgICAgfSwKIAorICAgIC8qKgorICAgICAqIEByZXR1cm4g e2Jvb2xlYW59CisgICAgICovCisgICAgaXNFZGl0aW5nOiBmdW5jdGlvbigpCisgICAgeworICAg ICAgICByZXR1cm4gISF0aGlzLl9wcm9tcHQ7CisgICAgfSwKKwogICAgIGVkaXRpbmdFbmRlZDog ZnVuY3Rpb24oY29udGV4dCkKICAgICB7CiAgICAgICAgIHRoaXMuX3Byb21wdC5kZXRhY2goKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvV2F0Y2hFeHBy ZXNzaW9uc1NpZGViYXJQYW5lLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9XYXRjaEV4cHJlc3Npb25zU2lkZWJhclBhbmUuanMKaW5kZXggMWQ5MmI3YTBhYTNmYWY4MTFi MmEwNWRkZmY0Njc3MTk1M2QzNzI2Ni4uMDk4N2UwMjY0MjE2N2M0ZGNmN2EyODI3OGE5MGQ0MjUw ODFjNTc2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9X YXRjaEV4cHJlc3Npb25zU2lkZWJhclBhbmUuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9XYXRjaEV4cHJlc3Npb25zU2lkZWJhclBhbmUuanMKQEAgLTUyLDE2ICs1 MiwxOCBAQCBXZWJJbnNwZWN0b3IuV2F0Y2hFeHByZXNzaW9uc1NpZGViYXJQYW5lLnByb3RvdHlw ZSA9IHsKIAogICAgICAgICB0aGlzLnNlY3Rpb24gPSBuZXcgV2ViSW5zcGVjdG9yLldhdGNoRXhw cmVzc2lvbnNTZWN0aW9uKCk7CiAgICAgICAgIHRoaXMuYm9keUVsZW1lbnQuYXBwZW5kQ2hpbGQo dGhpcy5zZWN0aW9uLmVsZW1lbnQpOwotICAgIAorCiAgICAgICAgIHZhciByZWZyZXNoQnV0dG9u ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiYnV0dG9uIik7CiAgICAgICAgIHJlZnJlc2hCdXR0 b24uY2xhc3NOYW1lID0gInBhbmUtdGl0bGUtYnV0dG9uIHJlZnJlc2giOwogICAgICAgICByZWZy ZXNoQnV0dG9uLmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5fcmVmcmVzaEJ1dHRvbkNs aWNrZWQuYmluZCh0aGlzKSwgZmFsc2UpOworICAgICAgICByZWZyZXNoQnV0dG9uLnRpdGxlID0g V2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJSZWZyZXNoIik7CiAgICAgICAgIHRoaXMudGl0bGVFbGVt ZW50LmFwcGVuZENoaWxkKHJlZnJlc2hCdXR0b24pOwotICAgIAorCiAgICAgICAgIHZhciBhZGRC dXR0b24gPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJidXR0b24iKTsKICAgICAgICAgYWRkQnV0 dG9uLmNsYXNzTmFtZSA9ICJwYW5lLXRpdGxlLWJ1dHRvbiBhZGQiOwogICAgICAgICBhZGRCdXR0 b24uYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0aGlzLl9hZGRCdXR0b25DbGlja2VkLmJpbmQo dGhpcyksIGZhbHNlKTsKICAgICAgICAgdGhpcy50aXRsZUVsZW1lbnQuYXBwZW5kQ2hpbGQoYWRk QnV0dG9uKTsKKyAgICAgICAgYWRkQnV0dG9uLnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5n KCJBZGQgd2F0Y2ggZXhwcmVzc2lvbiIpOwogICAgICAgICB0aGlzLl9yZXF1aXJlc1VwZGF0ZSA9 IHRydWU7CiAKICAgICAgICAgaWYgKFdlYkluc3BlY3Rvci5zZXR0aW5ncy53YXRjaEV4cHJlc3Np b25zLmdldCgpLmxlbmd0aCA+IDApCkBAIC0xNDMsNiArMTQ1LDcgQEAgV2ViSW5zcGVjdG9yLldh dGNoRXhwcmVzc2lvbnNTZWN0aW9uID0gZnVuY3Rpb24oKQogICAgIHRoaXMuZWxlbWVudC5hZGRF dmVudExpc3RlbmVyKCJtb3VzZW1vdmUiLCB0aGlzLl9tb3VzZU1vdmUuYmluZCh0aGlzKSwgdHJ1 ZSk7CiAgICAgdGhpcy5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNlb3V0IiwgdGhpcy5f bW91c2VPdXQuYmluZCh0aGlzKSwgdHJ1ZSk7CiAgICAgdGhpcy5lbGVtZW50LmFkZEV2ZW50TGlz dGVuZXIoImRibGNsaWNrIiwgdGhpcy5fc2VjdGlvbkRvdWJsZUNsaWNrLmJpbmQodGhpcyksIGZh bHNlKTsKKyAgICB0aGlzLmVtcHR5RWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJjb250ZXh0bWVu dSIsIHRoaXMuX2VtcHR5RWxlbWVudENvbnRleHRNZW51LmJpbmQodGhpcyksIGZhbHNlKTsKIH0K IAogV2ViSW5zcGVjdG9yLldhdGNoRXhwcmVzc2lvbnNTZWN0aW9uLk5ld1dhdGNoRXhwcmVzc2lv biA9ICJceEEwIjsKQEAgLTMyNiw2ICszMjksMTMgQEAgV2ViSW5zcGVjdG9yLldhdGNoRXhwcmVz c2lvbnNTZWN0aW9uLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5fbGFzdE1vdXNlTW92ZVBh Z2VZID0gcGFnZVk7CiAgICAgfSwKIAorICAgIF9lbXB0eUVsZW1lbnRDb250ZXh0TWVudTogZnVu Y3Rpb24oZXZlbnQpCisgICAgeworICAgICAgICB2YXIgY29udGV4dE1lbnUgPSBuZXcgV2ViSW5z cGVjdG9yLkNvbnRleHRNZW51KCk7CisgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2Vi SW5zcGVjdG9yLlVJU3RyaW5nKCJBZGQgd2F0Y2ggZXhwcmVzc2lvbiIpLCB0aGlzLmFkZE5ld0V4 cHJlc3Npb25BbmRFZGl0LmJpbmQodGhpcykpOworICAgICAgICBjb250ZXh0TWVudS5zaG93KGV2 ZW50KTsKKyAgICB9LAorCiAgICAgX19wcm90b19fOiBXZWJJbnNwZWN0b3IuT2JqZWN0UHJvcGVy dGllc1NlY3Rpb24ucHJvdG90eXBlCiB9CiAKQEAgLTM5MCwxNCArNDAwLDE3IEBAIFdlYkluc3Bl Y3Rvci5XYXRjaEV4cHJlc3Npb25UcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRo aXMubGlzdEl0ZW1FbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNvbnRleHRtZW51IiwgdGhpcy5f Y29udGV4dE1lbnUuYmluZCh0aGlzKSwgZmFsc2UpOwogICAgICAgICB0aGlzLmxpc3RJdGVtRWxl bWVudC5pbnNlcnRCZWZvcmUoZGVsZXRlQnV0dG9uLCB0aGlzLmxpc3RJdGVtRWxlbWVudC5maXJz dENoaWxkKTsKICAgICB9LAotICAgIAorCiAgICAgLyoqCiAgICAgICogQHBhcmFtIHtXZWJJbnNw ZWN0b3IuQ29udGV4dE1lbnV9IGNvbnRleHRNZW51CiAgICAgICogQG92ZXJyaWRlCiAgICAgICov CiAgICAgcG9wdWxhdGVDb250ZXh0TWVudTogZnVuY3Rpb24oY29udGV4dE1lbnUpCiAgICAgewot ICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmluZygiRGVs ZXRlIHdhdGNoIGV4cHJlc3Npb24iKSwgdGhpcy5fZGVsZXRlQnV0dG9uQ2xpY2tlZC5iaW5kKHRo aXMpKTsKKyAgICAgICAgaWYgKCF0aGlzLmlzRWRpdGluZygpKSB7CisgICAgICAgICAgICBjb250 ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmluZygiQWRkIHdhdGNoIGV4cHJl c3Npb24iKSwgdGhpcy50cmVlT3V0bGluZS5zZWN0aW9uLmFkZE5ld0V4cHJlc3Npb25BbmRFZGl0 LmJpbmQodGhpcy50cmVlT3V0bGluZS5zZWN0aW9uKSk7CisgICAgICAgICAgICBjb250ZXh0TWVu dS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmluZygiRGVsZXRlIHdhdGNoIGV4cHJlc3Np b24iKSwgdGhpcy5fZGVsZXRlQnV0dG9uQ2xpY2tlZC5iaW5kKHRoaXMpKTsKKyAgICAgICAgfQog ICAgICAgICBpZiAodGhpcy50cmVlT3V0bGluZS5zZWN0aW9uLndhdGNoRXhwcmVzc2lvbnMubGVu Z3RoID4gMSkKICAgICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9y LlVJU3RyaW5nKCJEZWxldGUgYWxsIHdhdGNoIGV4cHJlc3Npb25zIiksIHRoaXMuX2RlbGV0ZUFs bEJ1dHRvbkNsaWNrZWQuYmluZCh0aGlzKSk7CiAgICAgfSwKQEAgLTQwOCw3ICs0MjEsNyBAQCBX ZWJJbnNwZWN0b3IuV2F0Y2hFeHByZXNzaW9uVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogICAg ICAgICB0aGlzLnBvcHVsYXRlQ29udGV4dE1lbnUoY29udGV4dE1lbnUpOwogICAgICAgICBjb250 ZXh0TWVudS5zaG93KGV2ZW50KTsKICAgICB9LAotICAgIAorCiAgICAgX2RlbGV0ZUFsbEJ1dHRv bkNsaWNrZWQ6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIHRoaXMudHJlZU91dGxpbmUuc2Vj dGlvbi5fZGVsZXRlQWxsRXhwcmVzc2lvbnMoKTsK 170095 2012-10-23 02:43:34 -0700 2012-10-23 03:45:41 -0700 Patch bug-99980-20121023134211.patch text/plain 16071 eustas.bug U3VidmVyc2lvbiBSZXZpc2lvbjogMTMyMTkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGY2ZTEyMmViZGI1NTlm ZjE1MjZlYzYwZDVjN2QyMGJmZjlkOWZiMi4uNjM0ZTllMjA0NGNmNDBlNzI4NmE5YWVjOGVhMjEz Zjg4MGI5NDliMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTEwLTIzICBFdWdl bmUgS2x5dWNobmlrb3YgIDxldXN0YXMuYnVnQGdtYWlsLmNvbT4KKworICAgICAgICBXZWIgSW5z cGVjdG9yOiBFbGFib3JhdGUgc291cmNlIHBhbmVsIHNpZGViYXIgY29udGV4dCBtZW51cy4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk5OTgwCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgLSBXYXRjaGVzOiBh ZGQgIkFkZCB3YXRjaCBleHByZXNzaW9uIiBpdGVtIHRvIGl0ZW1zIGFuZCBlbXB0eSBlbGVtZW50 CisgICAgICAgIC0gV2F0Y2hlczogaGlkZSAiUmVtb3ZlIHdhdGNoIGV4cHJlc3Npb24iIGZyb20g ZWRpdGluZyBwcm9tcHQgY29udGV4dCBtZW51CisgICAgICAgIC0gV2F0Y2hlczogYWRkIHRpdGxl cyB0byBoZWFkZXIgYnV0dG9ucworICAgICAgICAtIFhIUiBCcmVha3BvaW50czogYWRkICJBZGQg QnJlYWtwb2ludCIgaXRlbSB0byBpdGVtcyBhbmQgZW1wdHkgZWxlbWVudAorICAgICAgICAtIFhI UiBCcmVha3BvaW50czogYWRkICJSZW1vdmUgYWxsIGJyZWFrcG9pbnRzIiBpdGVtIHRvIGl0ZW1z ICh3aGVuID4xKQorICAgICAgICAtIFhIUiBCcmVha3BvaW50czogYWRkIHRpdGxlIHRvIGhlYWRl ciBidXR0b24KKyAgICAgICAgLSBKUyBCcmVha3BvaW50czogaGlkZSAiUmVtb3ZlLyhEZSlBY3Rp dmF0ZSBicmVha3BvaW50cyIgd2hlbiBvbmx5IDEgaXRlbSBwcmVzZW50CisgICAgICAgIC0gSlMg QnJlYWtwb2ludHM6IGFkZCAiKERlKUFjdGl2YXRlIGJyZWFrcG9pbnRzIiB0byBlbXB0eSBlbGVt ZW50IGNvbnRleHQgbWVudQorCisgICAgICAgICogRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJp bmdzLmpzOiBBZGRlZCBjb3JyZXNwb25kaW5nIHN0cmluZ3MuCisgICAgICAgICogaW5zcGVjdG9y L2Zyb250LWVuZC9CcmVha3BvaW50c1NpZGViYXJQYW5lLmpzOiBBZGp1c3RlZCBjb250ZXh0IG1l bnUuCisgICAgICAgIChXZWJJbnNwZWN0b3IuWEhSQnJlYWtwb2ludHNTaWRlYmFyUGFuZSk6IERp dHRvLgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvT2JqZWN0UHJvcGVydGllc1NlY3Rp b24uanM6IEFkZGVkICJpc0VkaXRpbmcoKSIKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5k L1dhdGNoRXhwcmVzc2lvbnNTaWRlYmFyUGFuZS5qczogQWRqdXN0ZWQgY29udGV4dCBtZW51Lgor CiAyMDEyLTEwLTIzICBLZW50IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KIAogICAgICAg ICBTdXBwb3J0IGZ1bGwgbW9udGggbmFtZXMgaW4gRGF0ZVRpbWVFZGl0RWxlbWVudCwgYW5kIHVz ZSB0aGVtIGluIGlucHV0W3R5cGU9bW9udGhdIGJ5IGRlZmF1bHQKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL0VuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcyBiL1NvdXJjZS9XZWJD b3JlL0VuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwppbmRleCBhOTYyZWM1NTNmMTBk YjMxZmY3NjE5ZGY0YTA5MzAxMDZkMmZkNWQzLi5jNmNkZjc3NmJmMGU0ZDk4OWM1NDAyNjI1MTVm NDE2MDhhZjA5MzBhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL2xv Y2FsaXplZFN0cmluZ3MuanMKKysrIGIvU291cmNlL1dlYkNvcmUvRW5nbGlzaC5scHJvai9sb2Nh bGl6ZWRTdHJpbmdzLmpzCkBAIC01Miw4ICs1Miw4IEBAIGxvY2FsaXplZFN0cmluZ3NbIih1bmFi bGUgdG8gZGVjb2RlIHZhbHVlKSJdID0gIih1bmFibGUgdG8gZGVjb2RlIHZhbHVlKSI7CiBsb2Nh bGl6ZWRTdHJpbmdzWyIod2hpdGVzcGFjZSkiXSA9ICIod2hpdGVzcGFjZSkiOwogbG9jYWxpemVk U3RyaW5nc1siQXBwbGljYXRpb24gQ2FjaGUiXSA9ICJBcHBsaWNhdGlvbiBDYWNoZSI7CiBsb2Nh bGl6ZWRTdHJpbmdzWyJBY2NlcHQgc3VnZ2VzdGlvbiJdID0gIkFjY2VwdCBzdWdnZXN0aW9uIjsK LWxvY2FsaXplZFN0cmluZ3NbIkFjdGl2YXRlIEFsbCBicmVha3BvaW50cyJdID0gIkFjdGl2YXRl IEFsbCBicmVha3BvaW50cyI7Ci1sb2NhbGl6ZWRTdHJpbmdzWyJBY3RpdmF0ZSBhbGwgYnJlYWtw b2ludHMiXSA9ICJBY3RpdmF0ZSBhbGwgYnJlYWtwb2ludHMiOworbG9jYWxpemVkU3RyaW5nc1si QWN0aXZhdGUgQnJlYWtwb2ludHMiXSA9ICJBY3RpdmF0ZSBCcmVha3BvaW50cyI7Citsb2NhbGl6 ZWRTdHJpbmdzWyJBY3RpdmF0ZSBicmVha3BvaW50cy4iXSA9ICJBY3RpdmF0ZSBicmVha3BvaW50 cy4iOwogbG9jYWxpemVkU3RyaW5nc1siQWRkIEF0dHJpYnV0ZSJdID0gIkFkZCBBdHRyaWJ1dGUi OwogbG9jYWxpemVkU3RyaW5nc1siQWRkIGF0dHJpYnV0ZSJdID0gIkFkZCBhdHRyaWJ1dGUiOwog bG9jYWxpemVkU3RyaW5nc1siQWRkIEJyZWFrcG9pbnQiXSA9ICJBZGQgQnJlYWtwb2ludCI7CkBA IC0xMzQsOCArMTM0LDggQEAgbG9jYWxpemVkU3RyaW5nc1siRE9NQ29udGVudCBldmVudCBmaXJl ZCJdID0gIkRPTUNvbnRlbnQgZXZlbnQgZmlyZWQiOwogbG9jYWxpemVkU3RyaW5nc1siRE9NQ29u dGVudCBldmVudCJdID0gIkRPTUNvbnRlbnQgZXZlbnQiOwogbG9jYWxpemVkU3RyaW5nc1siRE9N IE5vZGUgQ291bnQiXSA9ICJET00gTm9kZSBDb3VudCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJEYXRh YmFzZSBubyBsb25nZXIgaGFzIGV4cGVjdGVkIHZlcnNpb24uIl0gPSAiRGF0YWJhc2Ugbm8gbG9u Z2VyIGhhcyBleHBlY3RlZCB2ZXJzaW9uLiI7Ci1sb2NhbGl6ZWRTdHJpbmdzWyJEZWFjdGl2YXRl IGFsbCBicmVha3BvaW50cy4iXSA9ICJEZWFjdGl2YXRlIGFsbCBicmVha3BvaW50cy4iOwotbG9j YWxpemVkU3RyaW5nc1siRGVhY3RpdmF0ZSBBbGwgYnJlYWtwb2ludHMiXSA9ICJEZWFjdGl2YXRl IEFsbCBicmVha3BvaW50cyI7Citsb2NhbGl6ZWRTdHJpbmdzWyJEZWFjdGl2YXRlIGJyZWFrcG9p bnRzLiJdID0gIkRlYWN0aXZhdGUgYnJlYWtwb2ludHMuIjsKK2xvY2FsaXplZFN0cmluZ3NbIkRl YWN0aXZhdGUgYnJlYWtwb2ludHMiXSA9ICJEZWFjdGl2YXRlIGJyZWFrcG9pbnRzIjsKIGxvY2Fs aXplZFN0cmluZ3NbIkRlYnVnIl0gPSAiRGVidWciOwogbG9jYWxpemVkU3RyaW5nc1siRGVidWdn aW5nIGRpc2FibGVkLiBDbGljayB0byBlbmFibGUuIl0gPSAiRGVidWdnaW5nIGRpc2FibGVkLiBD bGljayB0byBlbmFibGUuIjsKIGxvY2FsaXplZFN0cmluZ3NbIkRlYnVnZ2luZyBlbmFibGVkLiBD bGljayB0byBkaXNhYmxlLiJdID0gIkRlYnVnZ2luZyBlbmFibGVkLiBDbGljayB0byBkaXNhYmxl LiI7CkBAIC01OTQsNiArNTk0LDggQEAgbG9jYWxpemVkU3RyaW5nc1siU2VhcmNoIGZpbmlzaGVk LiJdID0gIlNlYXJjaCBmaW5pc2hlZC4iOwogbG9jYWxpemVkU3RyaW5nc1siU2VhcmNoIGludGVy cnVwdGVkLiJdID0gIlNlYXJjaCBpbnRlcnJ1cHRlZC4iOwogbG9jYWxpemVkU3RyaW5nc1siQWRk IHRvIFdhdGNoIl0gPSAiQWRkIHRvIFdhdGNoIjsKIGxvY2FsaXplZFN0cmluZ3NbIkFkZCB0byB3 YXRjaCJdID0gIkFkZCB0byB3YXRjaCI7Citsb2NhbGl6ZWRTdHJpbmdzWyJBZGQgd2F0Y2ggZXhw cmVzc2lvbiJdID0gIkFkZCB3YXRjaCBleHByZXNzaW9uIjsKK2xvY2FsaXplZFN0cmluZ3NbIkFk ZCBYSFIgYnJlYWtwb2ludCJdID0gIkFkZCBYSFIgYnJlYWtwb2ludCI7CiBsb2NhbGl6ZWRTdHJp bmdzWyJJbmRlbnRhdGlvbiJdID0gIkluZGVudGF0aW9uIjsKIGxvY2FsaXplZFN0cmluZ3NbIjIg c3BhY2VzIl0gPSAiMiBzcGFjZXMiOwogbG9jYWxpemVkU3RyaW5nc1siNCBzcGFjZXMiXSA9ICI0 IHNwYWNlcyI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0JyZWFrcG9pbnRzU2lkZWJhclBhbmUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0JyZWFrcG9pbnRzU2lkZWJhclBhbmUuanMKaW5kZXggYmM0YmI2YjAyZjFkYTBkNTNi Mjk0ZjNiYTI1ODRmNzcxMjk1OWI4My4uZDY3YTFkY2I1ZGU5NDc2NzJjYTExY2MyYjI1YmQ4MjQ5 ODhhZGJlYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9C cmVha3BvaW50c1NpZGViYXJQYW5lLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvQnJlYWtwb2ludHNTaWRlYmFyUGFuZS5qcwpAQCAtNTIsOSArNTIsMjAgQEAgV2Vi SW5zcGVjdG9yLkphdmFTY3JpcHRCcmVha3BvaW50c1NpZGViYXJQYW5lID0gZnVuY3Rpb24oYnJl YWtwb2ludE1hbmFnZXIsIHNob3cKIAogICAgIHRoaXMuX2JyZWFrcG9pbnRNYW5hZ2VyLmFkZEV2 ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnRNYW5hZ2VyLkV2ZW50cy5CcmVha3Bv aW50QWRkZWQsIHRoaXMuX2JyZWFrcG9pbnRBZGRlZCwgdGhpcyk7CiAgICAgdGhpcy5fYnJlYWtw b2ludE1hbmFnZXIuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuQnJlYWtwb2ludE1hbmFn ZXIuRXZlbnRzLkJyZWFrcG9pbnRSZW1vdmVkLCB0aGlzLl9icmVha3BvaW50UmVtb3ZlZCwgdGhp cyk7CisKKyAgICB0aGlzLmVtcHR5RWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJjb250ZXh0bWVu dSIsIHRoaXMuX2VtcHR5RWxlbWVudENvbnRleHRNZW51LmJpbmQodGhpcyksIHRydWUpOwogfQog CiBXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdEJyZWFrcG9pbnRzU2lkZWJhclBhbmUucHJvdG90eXBl ID0geworICAgIF9lbXB0eUVsZW1lbnRDb250ZXh0TWVudTogZnVuY3Rpb24oZXZlbnQpCisgICAg eworICAgICAgICB2YXIgY29udGV4dE1lbnUgPSBuZXcgV2ViSW5zcGVjdG9yLkNvbnRleHRNZW51 KCk7CisgICAgICAgIHZhciBicmVha3BvaW50QWN0aXZlID0gV2ViSW5zcGVjdG9yLmRlYnVnZ2Vy TW9kZWwuYnJlYWtwb2ludHNBY3RpdmUoKTsKKyAgICAgICAgdmFyIGJyZWFrcG9pbnRBY3RpdmVU aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZyhicmVha3BvaW50QWN0aXZlID8gIkRlYWN0aXZh dGUgQnJlYWtwb2ludHMiIDogIkFjdGl2YXRlIEJyZWFrcG9pbnRzIik7CisgICAgICAgIGNvbnRl eHRNZW51LmFwcGVuZEl0ZW0oYnJlYWtwb2ludEFjdGl2ZVRpdGxlLCBXZWJJbnNwZWN0b3IuZGVi dWdnZXJNb2RlbC5zZXRCcmVha3BvaW50c0FjdGl2ZS5iaW5kKFdlYkluc3BlY3Rvci5kZWJ1Z2dl ck1vZGVsLCAhYnJlYWtwb2ludEFjdGl2ZSkpOworICAgICAgICBjb250ZXh0TWVudS5zaG93KGV2 ZW50KTsKKyAgICB9LAorCiAgICAgLyoqCiAgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuRXZl bnR9IGV2ZW50CiAgICAgICovCkBAIC0xNzcsMTMgKzE4OCwxNyBAQCBXZWJJbnNwZWN0b3IuSmF2 YVNjcmlwdEJyZWFrcG9pbnRzU2lkZWJhclBhbmUucHJvdG90eXBlID0gewogICAgICAqLwogICAg IF9icmVha3BvaW50Q29udGV4dE1lbnU6IGZ1bmN0aW9uKGJyZWFrcG9pbnQsIGV2ZW50KQogICAg IHsKKyAgICAgICAgdmFyIGJyZWFrcG9pbnRzID0gdGhpcy5faXRlbXMudmFsdWVzKCk7CiAgICAg ICAgIHZhciBjb250ZXh0TWVudSA9IG5ldyBXZWJJbnNwZWN0b3IuQ29udGV4dE1lbnUoKTsKICAg ICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlJlbW92 ZSBCcmVha3BvaW50IiksIGJyZWFrcG9pbnQucmVtb3ZlLmJpbmQoYnJlYWtwb2ludCkpOwotICAg ICAgICB2YXIgcmVtb3ZlQWxsVGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoV2ViSW5zcGVj dG9yLnVzZUxvd2VyQ2FzZU1lbnVUaXRsZXMoKSA/ICJSZW1vdmUgYWxsIGJyZWFrcG9pbnRzIiA6 ICJSZW1vdmUgQWxsIEJyZWFrcG9pbnRzIik7Ci0gICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0 ZW0ocmVtb3ZlQWxsVGl0bGUsIHRoaXMuX2JyZWFrcG9pbnRNYW5hZ2VyLnJlbW92ZUFsbEJyZWFr cG9pbnRzLmJpbmQodGhpcy5fYnJlYWtwb2ludE1hbmFnZXIpKTsKLSAgICAgICAgCisgICAgICAg IGlmIChicmVha3BvaW50cy5sZW5ndGggPiAxKSB7CisgICAgICAgICAgICB2YXIgcmVtb3ZlQWxs VGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoV2ViSW5zcGVjdG9yLnVzZUxvd2VyQ2FzZU1l bnVUaXRsZXMoKSA/ICJSZW1vdmUgYWxsIGJyZWFrcG9pbnRzIiA6ICJSZW1vdmUgQWxsIEJyZWFr cG9pbnRzIik7CisgICAgICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKHJlbW92ZUFsbFRp dGxlLCB0aGlzLl9icmVha3BvaW50TWFuYWdlci5yZW1vdmVBbGxCcmVha3BvaW50cy5iaW5kKHRo aXMuX2JyZWFrcG9pbnRNYW5hZ2VyKSk7CisgICAgICAgIH0KKworICAgICAgICBjb250ZXh0TWVu dS5hcHBlbmRTZXBhcmF0b3IoKTsKICAgICAgICAgdmFyIGJyZWFrcG9pbnRBY3RpdmUgPSBXZWJJ bnNwZWN0b3IuZGVidWdnZXJNb2RlbC5icmVha3BvaW50c0FjdGl2ZSgpOwotICAgICAgICB2YXIg YnJlYWtwb2ludEFjdGl2ZVRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKGJyZWFrcG9pbnRB Y3RpdmUgPyAiRGVhY3RpdmF0ZSBBbGwgQnJlYWtwb2ludHMiIDogIkFjdGl2YXRlIEFsbCBCcmVh a3BvaW50cyIpOworICAgICAgICB2YXIgYnJlYWtwb2ludEFjdGl2ZVRpdGxlID0gV2ViSW5zcGVj dG9yLlVJU3RyaW5nKGJyZWFrcG9pbnRBY3RpdmUgPyAiRGVhY3RpdmF0ZSBCcmVha3BvaW50cyIg OiAiQWN0aXZhdGUgQnJlYWtwb2ludHMiKTsKICAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRl bShicmVha3BvaW50QWN0aXZlVGl0bGUsIFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1vZGVsLnNldEJy ZWFrcG9pbnRzQWN0aXZlLmJpbmQoV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwsICFicmVha3Bv aW50QWN0aXZlKSk7CiAKICAgICAgICAgZnVuY3Rpb24gZW5hYmxlZEJyZWFrcG9pbnRDb3VudChi cmVha3BvaW50cykKQEAgLTE5NSw3ICsyMTAsNiBAQCBXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdEJy ZWFrcG9pbnRzU2lkZWJhclBhbmUucHJvdG90eXBlID0gewogICAgICAgICAgICAgfQogICAgICAg ICAgICAgcmV0dXJuIGNvdW50OwogICAgICAgICB9Ci0gICAgICAgIHZhciBicmVha3BvaW50cyA9 IHRoaXMuX2l0ZW1zLnZhbHVlcygpOwogICAgICAgICBpZiAoYnJlYWtwb2ludHMubGVuZ3RoID4g MSkgewogICAgICAgICAgICAgdmFyIGVuYWJsZUJyZWFrcG9pbnRDb3VudCA9IGVuYWJsZWRCcmVh a3BvaW50Q291bnQoYnJlYWtwb2ludHMpOwogICAgICAgICAgICAgdmFyIGVuYWJsZVRpdGxlID0g V2ViSW5zcGVjdG9yLlVJU3RyaW5nKFdlYkluc3BlY3Rvci51c2VMb3dlckNhc2VNZW51VGl0bGVz KCkgPyAiRW5hYmxlIGFsbCBicmVha3BvaW50cyIgOiAiRW5hYmxlIEFsbCBCcmVha3BvaW50cyIp OwpAQCAtMjcwLDE1ICsyODQsMjYgQEAgV2ViSW5zcGVjdG9yLlhIUkJyZWFrcG9pbnRzU2lkZWJh clBhbmUgPSBmdW5jdGlvbigpCiAgICAgdmFyIGFkZEJ1dHRvbiA9IGRvY3VtZW50LmNyZWF0ZUVs ZW1lbnQoImJ1dHRvbiIpOwogICAgIGFkZEJ1dHRvbi5jbGFzc05hbWUgPSAicGFuZS10aXRsZS1i dXR0b24gYWRkIjsKICAgICBhZGRCdXR0b24uYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0aGlz Ll9hZGRCdXR0b25DbGlja2VkLmJpbmQodGhpcyksIGZhbHNlKTsKKyAgICBhZGRCdXR0b24udGl0 bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkFkZCBYSFIgYnJlYWtwb2ludCIpOwogICAgIHRo aXMudGl0bGVFbGVtZW50LmFwcGVuZENoaWxkKGFkZEJ1dHRvbik7CiAKKyAgICB0aGlzLmVtcHR5 RWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJjb250ZXh0bWVudSIsIHRoaXMuX2VtcHR5RWxlbWVu dENvbnRleHRNZW51LmJpbmQodGhpcyksIHRydWUpOworCiAgICAgdGhpcy5fcmVzdG9yZUJyZWFr cG9pbnRzKCk7CiB9CiAKIFdlYkluc3BlY3Rvci5YSFJCcmVha3BvaW50c1NpZGViYXJQYW5lLnBy b3RvdHlwZSA9IHsKKyAgICBfZW1wdHlFbGVtZW50Q29udGV4dE1lbnU6IGZ1bmN0aW9uKGV2ZW50 KQorICAgIHsKKyAgICAgICAgdmFyIGNvbnRleHRNZW51ID0gbmV3IFdlYkluc3BlY3Rvci5Db250 ZXh0TWVudSgpOworICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5V SVN0cmluZygiQWRkIEJyZWFrcG9pbnQiKSwgdGhpcy5fYWRkQnV0dG9uQ2xpY2tlZC5iaW5kKHRo aXMpKTsKKyAgICAgICAgY29udGV4dE1lbnUuc2hvdyhldmVudCk7CisgICAgfSwKKwogICAgIF9h ZGRCdXR0b25DbGlja2VkOiBmdW5jdGlvbihldmVudCkKICAgICB7Ci0gICAgICAgIGV2ZW50LmNv bnN1bWUoKTsKKyAgICAgICAgaWYgKGV2ZW50KQorICAgICAgICAgICAgZXZlbnQuY29uc3VtZSgp OwogCiAgICAgICAgIHRoaXMuZXhwYW5kZWQgPSB0cnVlOwogCkBAIC0zNjIsNyArMzg3LDE3IEBA IFdlYkluc3BlY3Rvci5YSFJCcmVha3BvaW50c1NpZGViYXJQYW5lLnByb3RvdHlwZSA9IHsKICAg ICAgICAgICAgIHRoaXMuX3JlbW92ZUJyZWFrcG9pbnQodXJsKTsKICAgICAgICAgICAgIHRoaXMu X3NhdmVCcmVha3BvaW50cygpOwogICAgICAgICB9CisgICAgICAgIGZ1bmN0aW9uIHJlbW92ZUFs bEJyZWFrcG9pbnRzKCkKKyAgICAgICAgeworICAgICAgICAgICAgZm9yICh2YXIgdXJsIGluIHRo aXMuX2JyZWFrcG9pbnRFbGVtZW50cykKKyAgICAgICAgICAgICAgICB0aGlzLl9yZW1vdmVCcmVh a3BvaW50KHVybCk7CisgICAgICAgICAgICB0aGlzLl9zYXZlQnJlYWtwb2ludHMoKTsKKyAgICAg ICAgfQorICAgICAgICB2YXIgcmVtb3ZlQWxsVGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmco V2ViSW5zcGVjdG9yLnVzZUxvd2VyQ2FzZU1lbnVUaXRsZXMoKSA/ICJSZW1vdmUgYWxsIGJyZWFr cG9pbnRzIiA6ICJSZW1vdmUgQWxsIEJyZWFrcG9pbnRzIik7CisKKyAgICAgICAgY29udGV4dE1l bnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkFkZCBCcmVha3BvaW50IiksIHRo aXMuX2FkZEJ1dHRvbkNsaWNrZWQuYmluZCh0aGlzKSk7CiAgICAgICAgIGNvbnRleHRNZW51LmFw cGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJSZW1vdmUgQnJlYWtwb2ludCIpLCByZW1v dmVCcmVha3BvaW50LmJpbmQodGhpcykpOworICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVt KHJlbW92ZUFsbFRpdGxlLCByZW1vdmVBbGxCcmVha3BvaW50cy5iaW5kKHRoaXMpKTsKICAgICAg ICAgY29udGV4dE1lbnUuc2hvdyhldmVudCk7CiAgICAgfSwKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9PYmplY3RQcm9wZXJ0aWVzU2VjdGlvbi5qcyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvT2JqZWN0UHJvcGVydGllc1NlY3Rp b24uanMKaW5kZXggYjY0YTAwYmU5YzEzZDM1NmMxNDE5MDlhMGFmNjJjMzI1YzQ4NTZjZC4uNjI1 NjBkNGZlOGU0ZWJkM2M3MzlhZDc1Y2U5ODkwNWQwZGU3NGJkZSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9PYmplY3RQcm9wZXJ0aWVzU2VjdGlvbi5qcwor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL09iamVjdFByb3BlcnRpZXNT ZWN0aW9uLmpzCkBAIC0zMTksNiArMzE5LDE0IEBAIFdlYkluc3BlY3Rvci5PYmplY3RQcm9wZXJ0 eVRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICAgICAgcHJveHlFbGVtZW50LmFkZEV2ZW50 TGlzdGVuZXIoImtleWRvd24iLCB0aGlzLl9wcm9tcHRLZXlEb3duLmJpbmQodGhpcywgY29udGV4 dCksIGZhbHNlKTsKICAgICB9LAogCisgICAgLyoqCisgICAgICogQHJldHVybiB7Ym9vbGVhbn0K KyAgICAgKi8KKyAgICBpc0VkaXRpbmc6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHJldHVy biAhIXRoaXMuX3Byb21wdDsKKyAgICB9LAorCiAgICAgZWRpdGluZ0VuZGVkOiBmdW5jdGlvbihj b250ZXh0KQogICAgIHsKICAgICAgICAgdGhpcy5fcHJvbXB0LmRldGFjaCgpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcwppbmRleCBh MjdhNDViYjE3MmI0MDdkNGUyZmU4OTQ0OGFlMTZkMDU2MGZhNWIwLi4xNzJhZTY5YWI4YjllMTQ0 NWYwN2JkNTUyMzNmZmNhY2M3NmFhMTcxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcwpAQCAtNzM0LDExICs3MzQsMTEgQEAgV2Vi SW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciBhY3RpdmUg PSBldmVudC5kYXRhOwogICAgICAgICB0aGlzLl90b2dnbGVCcmVha3BvaW50c0J1dHRvbi50b2dn bGVkID0gYWN0aXZlOwogICAgICAgICBpZiAoYWN0aXZlKSB7Ci0gICAgICAgICAgICB0aGlzLl90 b2dnbGVCcmVha3BvaW50c0J1dHRvbi50aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiRGVh Y3RpdmF0ZSBhbGwgYnJlYWtwb2ludHMuIik7CisgICAgICAgICAgICB0aGlzLl90b2dnbGVCcmVh a3BvaW50c0J1dHRvbi50aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiRGVhY3RpdmF0ZSBi cmVha3BvaW50cy4iKTsKICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5pbnNwZWN0b3JWaWV3LmVs ZW1lbnQucmVtb3ZlU3R5bGVDbGFzcygiYnJlYWtwb2ludHMtZGVhY3RpdmF0ZWQiKTsKICAgICAg ICAgICAgIHRoaXMuc2lkZWJhclBhbmVzLmpzQnJlYWtwb2ludHMubGlzdEVsZW1lbnQucmVtb3Zl U3R5bGVDbGFzcygiYnJlYWtwb2ludHMtbGlzdC1kZWFjdGl2YXRlZCIpOwogICAgICAgICB9IGVs c2UgewotICAgICAgICAgICAgdGhpcy5fdG9nZ2xlQnJlYWtwb2ludHNCdXR0b24udGl0bGUgPSBX ZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkFjdGl2YXRlIGFsbCBicmVha3BvaW50cy4iKTsKKyAgICAg ICAgICAgIHRoaXMuX3RvZ2dsZUJyZWFrcG9pbnRzQnV0dG9uLnRpdGxlID0gV2ViSW5zcGVjdG9y LlVJU3RyaW5nKCJBY3RpdmF0ZSBicmVha3BvaW50cy4iKTsKICAgICAgICAgICAgIFdlYkluc3Bl Y3Rvci5pbnNwZWN0b3JWaWV3LmVsZW1lbnQuYWRkU3R5bGVDbGFzcygiYnJlYWtwb2ludHMtZGVh Y3RpdmF0ZWQiKTsKICAgICAgICAgICAgIHRoaXMuc2lkZWJhclBhbmVzLmpzQnJlYWtwb2ludHMu bGlzdEVsZW1lbnQuYWRkU3R5bGVDbGFzcygiYnJlYWtwb2ludHMtbGlzdC1kZWFjdGl2YXRlZCIp OwogICAgICAgICB9CkBAIC03OTUsNyArNzk1LDcgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5l bC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuc3RlcE91dEJ1dHRvbiA9IHRoaXMuX2NyZWF0 ZUJ1dHRvbkFuZFJlZ2lzdGVyU2hvcnRjdXRzKHNlY3Rpb24sICJzY3JpcHRzLXN0ZXAtb3V0Iiwg dGl0bGUsIGhhbmRsZXIsIHNob3J0Y3V0cywgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTdGVwIG91 dCIpKTsKICAgICAgICAgZGVidWdUb29sYmFyLmFwcGVuZENoaWxkKHRoaXMuc3RlcE91dEJ1dHRv bik7CiAKLSAgICAgICAgdGhpcy5fdG9nZ2xlQnJlYWtwb2ludHNCdXR0b24gPSBuZXcgV2ViSW5z cGVjdG9yLlN0YXR1c0JhckJ1dHRvbihXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkRlYWN0aXZhdGUg YWxsIGJyZWFrcG9pbnRzLiIpLCAidG9nZ2xlLWJyZWFrcG9pbnRzIik7CisgICAgICAgIHRoaXMu X3RvZ2dsZUJyZWFrcG9pbnRzQnV0dG9uID0gbmV3IFdlYkluc3BlY3Rvci5TdGF0dXNCYXJCdXR0 b24oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJEZWFjdGl2YXRlIGJyZWFrcG9pbnRzLiIpLCAidG9n Z2xlLWJyZWFrcG9pbnRzIik7CiAgICAgICAgIHRoaXMuX3RvZ2dsZUJyZWFrcG9pbnRzQnV0dG9u LnRvZ2dsZWQgPSB0cnVlOwogICAgICAgICB0aGlzLl90b2dnbGVCcmVha3BvaW50c0J1dHRvbi5h ZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuX3RvZ2dsZUJyZWFrcG9pbnRzQ2xpY2tlZCwg dGhpcyk7CiAgICAgICAgIGRlYnVnVG9vbGJhci5hcHBlbmRDaGlsZCh0aGlzLl90b2dnbGVCcmVh a3BvaW50c0J1dHRvbi5lbGVtZW50KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvV2F0Y2hFeHByZXNzaW9uc1NpZGViYXJQYW5lLmpzIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9XYXRjaEV4cHJlc3Npb25zU2lkZWJhclBhbmUuanMK aW5kZXggMWQ5MmI3YTBhYTNmYWY4MTFiMmEwNWRkZmY0Njc3MTk1M2QzNzI2Ni4uMDk4N2UwMjY0 MjE2N2M0ZGNmN2EyODI3OGE5MGQ0MjUwODFjNTc2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9XYXRjaEV4cHJlc3Npb25zU2lkZWJhclBhbmUuanMKKysr IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9XYXRjaEV4cHJlc3Npb25zU2lk ZWJhclBhbmUuanMKQEAgLTUyLDE2ICs1MiwxOCBAQCBXZWJJbnNwZWN0b3IuV2F0Y2hFeHByZXNz aW9uc1NpZGViYXJQYW5lLnByb3RvdHlwZSA9IHsKIAogICAgICAgICB0aGlzLnNlY3Rpb24gPSBu ZXcgV2ViSW5zcGVjdG9yLldhdGNoRXhwcmVzc2lvbnNTZWN0aW9uKCk7CiAgICAgICAgIHRoaXMu Ym9keUVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5zZWN0aW9uLmVsZW1lbnQpOwotICAgIAorCiAg ICAgICAgIHZhciByZWZyZXNoQnV0dG9uID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiYnV0dG9u Iik7CiAgICAgICAgIHJlZnJlc2hCdXR0b24uY2xhc3NOYW1lID0gInBhbmUtdGl0bGUtYnV0dG9u IHJlZnJlc2giOwogICAgICAgICByZWZyZXNoQnV0dG9uLmFkZEV2ZW50TGlzdGVuZXIoImNsaWNr IiwgdGhpcy5fcmVmcmVzaEJ1dHRvbkNsaWNrZWQuYmluZCh0aGlzKSwgZmFsc2UpOworICAgICAg ICByZWZyZXNoQnV0dG9uLnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJSZWZyZXNoIik7 CiAgICAgICAgIHRoaXMudGl0bGVFbGVtZW50LmFwcGVuZENoaWxkKHJlZnJlc2hCdXR0b24pOwot ICAgIAorCiAgICAgICAgIHZhciBhZGRCdXR0b24gPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJi dXR0b24iKTsKICAgICAgICAgYWRkQnV0dG9uLmNsYXNzTmFtZSA9ICJwYW5lLXRpdGxlLWJ1dHRv biBhZGQiOwogICAgICAgICBhZGRCdXR0b24uYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0aGlz Ll9hZGRCdXR0b25DbGlja2VkLmJpbmQodGhpcyksIGZhbHNlKTsKICAgICAgICAgdGhpcy50aXRs ZUVsZW1lbnQuYXBwZW5kQ2hpbGQoYWRkQnV0dG9uKTsKKyAgICAgICAgYWRkQnV0dG9uLnRpdGxl ID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJBZGQgd2F0Y2ggZXhwcmVzc2lvbiIpOwogICAgICAg ICB0aGlzLl9yZXF1aXJlc1VwZGF0ZSA9IHRydWU7CiAKICAgICAgICAgaWYgKFdlYkluc3BlY3Rv ci5zZXR0aW5ncy53YXRjaEV4cHJlc3Npb25zLmdldCgpLmxlbmd0aCA+IDApCkBAIC0xNDMsNiAr MTQ1LDcgQEAgV2ViSW5zcGVjdG9yLldhdGNoRXhwcmVzc2lvbnNTZWN0aW9uID0gZnVuY3Rpb24o KQogICAgIHRoaXMuZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZW1vdmUiLCB0aGlzLl9t b3VzZU1vdmUuYmluZCh0aGlzKSwgdHJ1ZSk7CiAgICAgdGhpcy5lbGVtZW50LmFkZEV2ZW50TGlz dGVuZXIoIm1vdXNlb3V0IiwgdGhpcy5fbW91c2VPdXQuYmluZCh0aGlzKSwgdHJ1ZSk7CiAgICAg dGhpcy5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImRibGNsaWNrIiwgdGhpcy5fc2VjdGlvbkRv dWJsZUNsaWNrLmJpbmQodGhpcyksIGZhbHNlKTsKKyAgICB0aGlzLmVtcHR5RWxlbWVudC5hZGRF dmVudExpc3RlbmVyKCJjb250ZXh0bWVudSIsIHRoaXMuX2VtcHR5RWxlbWVudENvbnRleHRNZW51 LmJpbmQodGhpcyksIGZhbHNlKTsKIH0KIAogV2ViSW5zcGVjdG9yLldhdGNoRXhwcmVzc2lvbnNT ZWN0aW9uLk5ld1dhdGNoRXhwcmVzc2lvbiA9ICJceEEwIjsKQEAgLTMyNiw2ICszMjksMTMgQEAg V2ViSW5zcGVjdG9yLldhdGNoRXhwcmVzc2lvbnNTZWN0aW9uLnByb3RvdHlwZSA9IHsKICAgICAg ICAgdGhpcy5fbGFzdE1vdXNlTW92ZVBhZ2VZID0gcGFnZVk7CiAgICAgfSwKIAorICAgIF9lbXB0 eUVsZW1lbnRDb250ZXh0TWVudTogZnVuY3Rpb24oZXZlbnQpCisgICAgeworICAgICAgICB2YXIg Y29udGV4dE1lbnUgPSBuZXcgV2ViSW5zcGVjdG9yLkNvbnRleHRNZW51KCk7CisgICAgICAgIGNv bnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJBZGQgd2F0Y2ggZXhw cmVzc2lvbiIpLCB0aGlzLmFkZE5ld0V4cHJlc3Npb25BbmRFZGl0LmJpbmQodGhpcykpOworICAg ICAgICBjb250ZXh0TWVudS5zaG93KGV2ZW50KTsKKyAgICB9LAorCiAgICAgX19wcm90b19fOiBX ZWJJbnNwZWN0b3IuT2JqZWN0UHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlCiB9CiAKQEAgLTM5 MCwxNCArNDAwLDE3IEBAIFdlYkluc3BlY3Rvci5XYXRjaEV4cHJlc3Npb25UcmVlRWxlbWVudC5w cm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMubGlzdEl0ZW1FbGVtZW50LmFkZEV2ZW50TGlzdGVu ZXIoImNvbnRleHRtZW51IiwgdGhpcy5fY29udGV4dE1lbnUuYmluZCh0aGlzKSwgZmFsc2UpOwog ICAgICAgICB0aGlzLmxpc3RJdGVtRWxlbWVudC5pbnNlcnRCZWZvcmUoZGVsZXRlQnV0dG9uLCB0 aGlzLmxpc3RJdGVtRWxlbWVudC5maXJzdENoaWxkKTsKICAgICB9LAotICAgIAorCiAgICAgLyoq CiAgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuQ29udGV4dE1lbnV9IGNvbnRleHRNZW51CiAg ICAgICogQG92ZXJyaWRlCiAgICAgICovCiAgICAgcG9wdWxhdGVDb250ZXh0TWVudTogZnVuY3Rp b24oY29udGV4dE1lbnUpCiAgICAgewotICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdl Ykluc3BlY3Rvci5VSVN0cmluZygiRGVsZXRlIHdhdGNoIGV4cHJlc3Npb24iKSwgdGhpcy5fZGVs ZXRlQnV0dG9uQ2xpY2tlZC5iaW5kKHRoaXMpKTsKKyAgICAgICAgaWYgKCF0aGlzLmlzRWRpdGlu ZygpKSB7CisgICAgICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5V SVN0cmluZygiQWRkIHdhdGNoIGV4cHJlc3Npb24iKSwgdGhpcy50cmVlT3V0bGluZS5zZWN0aW9u LmFkZE5ld0V4cHJlc3Npb25BbmRFZGl0LmJpbmQodGhpcy50cmVlT3V0bGluZS5zZWN0aW9uKSk7 CisgICAgICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiRGVsZXRlIHdhdGNoIGV4cHJlc3Npb24iKSwgdGhpcy5fZGVsZXRlQnV0dG9uQ2xpY2tlZC5i aW5kKHRoaXMpKTsKKyAgICAgICAgfQogICAgICAgICBpZiAodGhpcy50cmVlT3V0bGluZS5zZWN0 aW9uLndhdGNoRXhwcmVzc2lvbnMubGVuZ3RoID4gMSkKICAgICAgICAgICAgIGNvbnRleHRNZW51 LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJEZWxldGUgYWxsIHdhdGNoIGV4cHJl c3Npb25zIiksIHRoaXMuX2RlbGV0ZUFsbEJ1dHRvbkNsaWNrZWQuYmluZCh0aGlzKSk7CiAgICAg fSwKQEAgLTQwOCw3ICs0MjEsNyBAQCBXZWJJbnNwZWN0b3IuV2F0Y2hFeHByZXNzaW9uVHJlZUVs ZW1lbnQucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLnBvcHVsYXRlQ29udGV4dE1lbnUoY29u dGV4dE1lbnUpOwogICAgICAgICBjb250ZXh0TWVudS5zaG93KGV2ZW50KTsKICAgICB9LAotICAg IAorCiAgICAgX2RlbGV0ZUFsbEJ1dHRvbkNsaWNrZWQ6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAg ICAgIHRoaXMudHJlZU91dGxpbmUuc2VjdGlvbi5fZGVsZXRlQWxsRXhwcmVzc2lvbnMoKTsK