142607 2015-03-11 19:06:14 -0700 Web Inspector: Debugger sidebar should group global breakpoints together 2015-03-12 13:59:25 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 jonowells jonowells graouts joepeck jonowells mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1076533 0 jonowells 2015-03-11 19:06:14 -0700 Global breakpoints such as "All Exceptions" and "All Uncaught Exceptions" should go together in a container at the top of the debugger sidebar. 1076534 1 webkit-bug-importer 2015-03-11 19:06:34 -0700 <rdar://problem/20131488> 1076536 2 248478 jonowells 2015-03-11 19:19:42 -0700 Created attachment 248478 Patch 1076636 3 248478 timothy 2015-03-12 08:24:10 -0700 Comment on attachment 248478 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=248478&action=review > Source/WebInspectorUI/UserInterface/Views/ContainerTreeElement.js:30 > + WebInspector.FolderizedTreeElement.call(this, WebInspector.ContainerTreeElement.styleFromTypeMap.get(type), title, subtitle, null, hasChildren); This should be FolderTreeElement not FolderizedTreeElement. > Source/WebInspectorUI/UserInterface/Views/ContainerTreeElement.js:38 > +WebInspector.ContainerTreeElement.Type = { > + Global: "global" > +}; > + > +WebInspector.ContainerTreeElement.styleFromTypeMap = new Map(); > +WebInspector.ContainerTreeElement.styleFromTypeMap.set(WebInspector.ContainerTreeElement.Type.Global, "global-container"); You won't need these for FolderTreeElement. > Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js:152 > +WebInspector.DebuggerSidebarPanel.GlobalIconStyleClassName = "global-breakpoints-icon"; What icon is this? I don't see a CSS change to add this selector. 1076697 4 jonowells 2015-03-12 12:14:01 -0700 I decided to just get rid of ContainerTreeElement altogether. I think FolderTreeElement should be able to handle this fine, so I just adjusted it to take different classes. It would still benefit from a different icon maybe? Right now it is a folder. I also went ahead and expanded the folder. 1076700 5 248531 jonowells 2015-03-12 12:17:17 -0700 Created attachment 248531 Patch 1076716 6 248531 timothy 2015-03-12 13:09:25 -0700 Comment on attachment 248531 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=248531&action=review > Source/WebInspectorUI/UserInterface/Views/FolderTreeElement.js:28 > + var classNames = (additionalClassNames && typeof additionalClassNames === "string" ? [additionalClassNames] : []); Maybe additionalClassNames should be allowed to be an array too? 1076728 7 jonowells 2015-03-12 13:33:13 -0700 Committed r181452: <http://trac.webkit.org/changeset/181452> 1076747 8 248531 joepeck 2015-03-12 13:59:25 -0700 Comment on attachment 248531 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=248531&action=review > Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js:107 > + this._globalBreakpointsFolderTreeElement = new WebInspector.FolderTreeElement(WebInspector.UIString("Global Breakpoints"), null, WebInspector.DebuggerSidebarPanel.GlobalIconStyleClassName); If this folder is collapsed and a breakpoint inside it is enabled, should there be a UI indicating that? I think it would be surprising if I paused because of an uncaught exception and couldn't find where to disable it. (Fortunately if you Pause on a Breakpoint we should that breakpoint in the new pause reason section) 248478 2015-03-11 19:19:42 -0700 2015-03-12 12:17:05 -0700 Patch bug-142607-20150311191916.patch text/plain 9727 jonowells U3VidmVyc2lvbiBSZXZpc2lvbjogMTgxNDI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCAw Y2NiMGYyOGQ5MjRiYTI3MzJkMDZlZTQyZjBjYzNjOGIwNmNlM2RjLi44ZmUyMGM2MTUwMGYwOTY3 NDAyZjhhYmM1OTE2ODE5MGE5ZTA4MTVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNSBAQAorMjAxNS0wMy0xMSAgSm9ubyBXZWxscyAgPGpvbm93ZWxsc0BhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogRGVidWdnZXIgc2lkZWJhciBzaG91bGQgZ3JvdXAg Z2xvYmFsIGJyZWFrcG9pbnRzIHRvZ2V0aGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNDI2MDcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBVcGRhdGUgdGhlIERlYnVnZ2VyU2lkZWJhclBhbmVsIGNsYXNz IHRvIGhvbGQgZ2xvYmFsIGJyZWFrcG9pbnRzIHN1Y2ggYXMgIkFsbCBFeGNlcHRpb25zIiBpbiBv bmUgY29udGFpbmVyLiBUaGlzCisgICAgICAgIHdpbGwgYmUgdGhlIHBsYWNlIGZ1dHVyZSBzdWNo IGJyZWFrcG9pbnRzIGFyZSBhZGRlZC4gQSBuZXcgRm9sZGVyaXplZFRyZWVFbGVtZW50IGNhbGxl ZCBDb250YWluZXJUcmVlRWxlbWVudAorICAgICAgICBpcyB1c2VkIGFzIHRoZSBjb250YWluZXIu CisKKyAgICAgICAgKiBMb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanM6 IEFkZGVkIHN0cmluZy4KKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL01haW4uaHRtbDogQWRkZWQg Q29udGFpbmVyVHJlZUVsZW1lbnQuanMuCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9D b250YWluZXJUcmVlRWxlbWVudC5qczogQWRkZWQuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNl L1ZpZXdzL0RlYnVnZ2VyU2lkZWJhclBhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRl YnVnZ2VyU2lkZWJhclBhbmVsKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclNpZGVi YXJQYW5lbC5wcm90b3R5cGUuX3RyZWVFbGVtZW50U2VsZWN0ZWQpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkRlYnVnZ2VyU2lkZWJhclBhbmVsLnByb3RvdHlwZS5fY29tcGFyZVRvcExldmVsVHJl ZUVsZW1lbnRzKToKKyAgICAgICAgVXBkYXRlZCB0byB1c2UgQ29udGFpbmVyVHJlZUVsZW1lbnQg dG8gaG9sZCBnbG9iYWwgYnJlYWtwb2ludHMuCisKKwogMjAxNS0wMy0xMSAgQ29tbWl0IFF1ZXVl ICA8Y29tbWl0LXF1ZXVlQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGlu ZyBvdXQgcjE4MTM2Ny4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6 YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCmluZGV4IGVmOGY3 OTBhOWIyMzdmYmRmNjJjMjhmYzljZjY0ODQyYzkzZDZhZTAuLmRmODZmOGUxNTQxOTU4MzJiYjhm NWZmZjlhMjNlN2Y4NDIzMzE1OTMgMTAwNjQ0CkdJVCBiaW5hcnkgcGF0Y2gKZGVsdGEgMzQKcWNt WD9kaFdYSDA8XypgMkNtJjgkOyZ4fXFWYVI3bFZufTRqbmZ4S3lkR3BFUT5MTElIS25gMzAKCmRl bHRhIDE0CldjbVg/Zm1pZnBUPF8qYDJIOzB6dzc2QVl8TDxmNVMKCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9NYWluLmh0bWwgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9NYWluLmh0bWwKaW5kZXggMDlhNTk5NDVkODY5OGQ3MzUy ODg1YmVjYTIzNDBlM2U4ZTI5OTUzYy4uN2Y3ZTIwZDViOWQ4ZmJhNTE0MDIzODQyOWRlZDM4OTdk ZGIwNTM2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv TWFpbi5odG1sCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01haW4u aHRtbApAQCAtMzUxLDYgKzM1MSw3IEBACiAgICAgPHNjcmlwdCBzcmM9IlZpZXdzL0NvbnNvbGVH cm91cC5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCBzcmM9IlZpZXdzL0NvbnNvbGVQcm9tcHQu anMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3JjPSJWaWV3cy9Db25zb2xlU2Vzc2lvbi5qcyI+ PC9zY3JpcHQ+CisgICAgPHNjcmlwdCBzcmM9IlZpZXdzL0NvbnRhaW5lclRyZWVFbGVtZW50Lmpz Ij48L3NjcmlwdD4KICAgICA8c2NyaXB0IHNyYz0iVmlld3MvQ29udGVudEJyb3dzZXIuanMiPjwv c2NyaXB0PgogICAgIDxzY3JpcHQgc3JjPSJWaWV3cy9Db250ZW50Rmxvd0RPTVRyZWVDb250ZW50 Vmlldy5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCBzcmM9IlZpZXdzL0NvbnRlbnRGbG93VHJl ZUVsZW1lbnQuanMiPjwvc2NyaXB0PgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGFpbmVyVHJlZUVsZW1lbnQuanMgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250YWluZXJUcmVlRWxlbWVudC5qcwpu ZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwLi5kNjIzZmFkY2EwMDAxZGFkNDMzNjBhNmFhOTg0NjI1NWI0MDkxZmVjCi0tLSAv ZGV2L251bGwKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv Q29udGFpbmVyVHJlZUVsZW1lbnQuanMKQEAgLTAsMCArMSw0MyBAQAorLyoKKyAqIENvcHlyaWdo dCAoQykgMjAxNSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgorICogUmVkaXN0 cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRo b3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9s bG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Yg c291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNl LCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgor ICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBh Ym92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5k IHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5k L29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKgor ICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJ QlVUT1JTIGBgQVMgSVMnJworICogQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElF UywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisgKiBUSEUgSU1QTElFRCBXQVJSQU5U SUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQ VVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElU UyBDT05UUklCVVRPUlMKKyAqIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElO Q0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IKKyAqIENPTlNFUVVFTlRJQUwgREFNQUdF UyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GCisgKiBTVUJT VElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsg T1IgQlVTSU5FU1MKKyAqIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBU SEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOCisgKiBDT05UUkFDVCwgU1RSSUNUIExJQUJJ TElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKQorICogQVJJ U0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYg QURWSVNFRCBPRgorICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisKK1dl Ykluc3BlY3Rvci5Db250YWluZXJUcmVlRWxlbWVudCA9IGZ1bmN0aW9uKHR5cGUsIHRpdGxlLCBz dWJ0aXRsZSwgaGFzQ2hpbGRyZW4pCit7CisgICAgdGhpcy5fdHlwZSA9IHR5cGU7CisKKyAgICBX ZWJJbnNwZWN0b3IuRm9sZGVyaXplZFRyZWVFbGVtZW50LmNhbGwodGhpcywgV2ViSW5zcGVjdG9y LkNvbnRhaW5lclRyZWVFbGVtZW50LnN0eWxlRnJvbVR5cGVNYXAuZ2V0KHR5cGUpLCB0aXRsZSwg c3VidGl0bGUsIG51bGwsIGhhc0NoaWxkcmVuKTsKK307CisKK1dlYkluc3BlY3Rvci5Db250YWlu ZXJUcmVlRWxlbWVudC5UeXBlID0geworICAgIEdsb2JhbDogImdsb2JhbCIKK307CisKK1dlYklu c3BlY3Rvci5Db250YWluZXJUcmVlRWxlbWVudC5zdHlsZUZyb21UeXBlTWFwID0gbmV3IE1hcCgp OworV2ViSW5zcGVjdG9yLkNvbnRhaW5lclRyZWVFbGVtZW50LnN0eWxlRnJvbVR5cGVNYXAuc2V0 KFdlYkluc3BlY3Rvci5Db250YWluZXJUcmVlRWxlbWVudC5UeXBlLkdsb2JhbCwgImdsb2JhbC1j b250YWluZXIiKTsKKworV2ViSW5zcGVjdG9yLkNvbnRhaW5lclRyZWVFbGVtZW50LnByb3RvdHlw ZSA9IHsKKyAgICBjb25zdHJ1Y3RvcjogV2ViSW5zcGVjdG9yLkNvbnRhaW5lclRyZWVFbGVtZW50 LAorICAgIF9fcHJvdG9fXzogV2ViSW5zcGVjdG9yLkZvbGRlcml6ZWRUcmVlRWxlbWVudC5wcm90 b3R5cGUKK307CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9EZWJ1Z2dlclNpZGViYXJQYW5lbC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0RlYnVnZ2VyU2lkZWJhclBhbmVsLmpzCmluZGV4IGFiNTYxZDIw NDg1MTg1YTBkMGM0MjhiYjY4YzQ0NzY4ZTFiNzZjZTcuLjY3MTQ3Y2YwYjUyMmQyZWRmN2M2MGE1 MTg0YTE1NzgzNjgzM2JhNWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL0RlYnVnZ2VyU2lkZWJhclBhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RlYnVnZ2VyU2lkZWJhclBhbmVsLmpzCkBA IC0xMDQsNiArMTA0LDcgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyU2lkZWJhclBhbmVsID0gZnVu Y3Rpb24oKQogICAgIC8vIEFkZCB0aGlzIG9mZnNldC1zZWN0aW9ucyBjbGFzcyBuYW1lIHNvIHRo ZSBzdGlja3kgaGVhZGVycyBkb24ndCBvdmVybGFwIHRoZSBuYXZpZ2F0aW9uIGJhci4KICAgICB0 aGlzLmVsZW1lbnQuY2xhc3NMaXN0LmFkZChXZWJJbnNwZWN0b3IuRGVidWdnZXJTaWRlYmFyUGFu ZWwuT2Zmc2V0U2VjdGlvbnNTdHlsZUNsYXNzTmFtZSk7CiAKKyAgICB0aGlzLl9nbG9iYWxCcmVh a3BvaW50c0NvbnRhaW5lclRyZWVFbGVtZW50ID0gbmV3IFdlYkluc3BlY3Rvci5Db250YWluZXJU cmVlRWxlbWVudChXZWJJbnNwZWN0b3IuQ29udGFpbmVyVHJlZUVsZW1lbnQuVHlwZS5HbG9iYWws IFdlYkluc3BlY3Rvci5VSVN0cmluZygiR2xvYmFsIEJyZWFrcG9pbnRzIikpOwogICAgIHRoaXMu X2FsbEV4Y2VwdGlvbnNCcmVha3BvaW50VHJlZUVsZW1lbnQgPSBuZXcgV2ViSW5zcGVjdG9yLkJy ZWFrcG9pbnRUcmVlRWxlbWVudChXZWJJbnNwZWN0b3IuZGVidWdnZXJNYW5hZ2VyLmFsbEV4Y2Vw dGlvbnNCcmVha3BvaW50LCBXZWJJbnNwZWN0b3IuRGVidWdnZXJTaWRlYmFyUGFuZWwuRXhjZXB0 aW9uSWNvblN0eWxlQ2xhc3NOYW1lLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkFsbCBFeGNlcHRp b25zIikpOwogICAgIHRoaXMuX2FsbFVuY2F1Z2h0RXhjZXB0aW9uc0JyZWFrcG9pbnRUcmVlRWxl bWVudCA9IG5ldyBXZWJJbnNwZWN0b3IuQnJlYWtwb2ludFRyZWVFbGVtZW50KFdlYkluc3BlY3Rv ci5kZWJ1Z2dlck1hbmFnZXIuYWxsVW5jYXVnaHRFeGNlcHRpb25zQnJlYWtwb2ludCwgV2ViSW5z cGVjdG9yLkRlYnVnZ2VyU2lkZWJhclBhbmVsLkV4Y2VwdGlvbkljb25TdHlsZUNsYXNzTmFtZSwg V2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJBbGwgVW5jYXVnaHQgRXhjZXB0aW9ucyIpKTsKIApAQCAt MTE0LDggKzExNSw5IEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlclNpZGViYXJQYW5lbCA9IGZ1bmN0 aW9uKCkKICAgICB0aGlzLl9icmVha3BvaW50c0NvbnRlbnRUcmVlT3V0bGluZS5vbmRlbGV0ZSA9 IHRoaXMuX2JyZWFrcG9pbnRUcmVlT3V0bGluZURlbGV0ZVRyZWVFbGVtZW50LmJpbmQodGhpcyk7 CiAgICAgdGhpcy5fYnJlYWtwb2ludHNDb250ZW50VHJlZU91dGxpbmUub25jb250ZXh0bWVudSA9 IHRoaXMuX2JyZWFrcG9pbnRUcmVlT3V0bGluZUNvbnRleHRNZW51VHJlZUVsZW1lbnQuYmluZCh0 aGlzKTsKIAotICAgIHRoaXMuX2JyZWFrcG9pbnRzQ29udGVudFRyZWVPdXRsaW5lLmFwcGVuZENo aWxkKHRoaXMuX2FsbEV4Y2VwdGlvbnNCcmVha3BvaW50VHJlZUVsZW1lbnQpOwotICAgIHRoaXMu X2JyZWFrcG9pbnRzQ29udGVudFRyZWVPdXRsaW5lLmFwcGVuZENoaWxkKHRoaXMuX2FsbFVuY2F1 Z2h0RXhjZXB0aW9uc0JyZWFrcG9pbnRUcmVlRWxlbWVudCk7CisgICAgdGhpcy5fYnJlYWtwb2lu dHNDb250ZW50VHJlZU91dGxpbmUuYXBwZW5kQ2hpbGQodGhpcy5fZ2xvYmFsQnJlYWtwb2ludHND b250YWluZXJUcmVlRWxlbWVudCk7CisgICAgdGhpcy5fZ2xvYmFsQnJlYWtwb2ludHNDb250YWlu ZXJUcmVlRWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9hbGxFeGNlcHRpb25zQnJlYWtwb2ludFRy ZWVFbGVtZW50KTsKKyAgICB0aGlzLl9nbG9iYWxCcmVha3BvaW50c0NvbnRhaW5lclRyZWVFbGVt ZW50LmFwcGVuZENoaWxkKHRoaXMuX2FsbFVuY2F1Z2h0RXhjZXB0aW9uc0JyZWFrcG9pbnRUcmVl RWxlbWVudCk7CiAKICAgICB2YXIgYnJlYWtwb2ludHNSb3cgPSBuZXcgV2ViSW5zcGVjdG9yLkRl dGFpbHNTZWN0aW9uUm93OwogICAgIGJyZWFrcG9pbnRzUm93LmVsZW1lbnQuYXBwZW5kQ2hpbGQo dGhpcy5fYnJlYWtwb2ludHNDb250ZW50VHJlZU91dGxpbmUuZWxlbWVudCk7CkBAIC0xNDcsNiAr MTQ5LDcgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyU2lkZWJhclBhbmVsID0gZnVuY3Rpb24oKQog V2ViSW5zcGVjdG9yLkRlYnVnZ2VyU2lkZWJhclBhbmVsLk9mZnNldFNlY3Rpb25zU3R5bGVDbGFz c05hbWUgPSAib2Zmc2V0LXNlY3Rpb25zIjsKIFdlYkluc3BlY3Rvci5EZWJ1Z2dlclNpZGViYXJQ YW5lbC5FeGNlcHRpb25JY29uU3R5bGVDbGFzc05hbWUgPSAiYnJlYWtwb2ludC1leGNlcHRpb24t aWNvbiI7CiBXZWJJbnNwZWN0b3IuRGVidWdnZXJTaWRlYmFyUGFuZWwuUGF1c2VkQnJlYWtwb2lu dEljb25TdHlsZUNsYXNzTmFtZSA9ICJicmVha3BvaW50LXBhdXNlZC1pY29uIjsKK1dlYkluc3Bl Y3Rvci5EZWJ1Z2dlclNpZGViYXJQYW5lbC5HbG9iYWxJY29uU3R5bGVDbGFzc05hbWUgPSAiZ2xv YmFsLWJyZWFrcG9pbnRzLWljb24iOwogCiBXZWJJbnNwZWN0b3IuRGVidWdnZXJTaWRlYmFyUGFu ZWwuU2VsZWN0ZWRBbGxFeGNlcHRpb25zQ29va2llS2V5ID0gImRlYnVnZ2VyLXNpZGViYXItcGFu ZWwtYWxsLWV4Y2VwdGlvbnMtYnJlYWtwb2ludCI7CiBXZWJJbnNwZWN0b3IuRGVidWdnZXJTaWRl YmFyUGFuZWwuU2VsZWN0ZWRBbGxVbmNhdWdodEV4Y2VwdGlvbnNDb29raWVLZXkgPSAiZGVidWdn ZXItc2lkZWJhci1wYW5lbC1hbGwtdW5jYXVnaHQtZXhjZXB0aW9ucy1icmVha3BvaW50IjsKQEAg LTUyNCw3ICs1MjcsNyBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJTaWRlYmFyUGFuZWwucHJvdG90 eXBlID0gewogCiAgICAgX2JyZWFrcG9pbnRUcmVlT3V0bGluZUNvbnRleHRNZW51VHJlZUVsZW1l bnQ6IGZ1bmN0aW9uKGV2ZW50LCB0cmVlRWxlbWVudCkKICAgICB7Ci0gICAgICAgIGNvbnNvbGUu YXNzZXJ0KHRyZWVFbGVtZW50IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZUVs ZW1lbnQgfHwgdHJlZUVsZW1lbnQgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuU2NyaXB0VHJlZUVs ZW1lbnQpOworICAgICAgICBjb25zb2xlLmFzc2VydCh0cmVlRWxlbWVudCBpbnN0YW5jZW9mIFdl Ykluc3BlY3Rvci5SZXNvdXJjZVRyZWVFbGVtZW50IHx8IHRyZWVFbGVtZW50IGluc3RhbmNlb2Yg V2ViSW5zcGVjdG9yLlNjcmlwdFRyZWVFbGVtZW50IHx8IHRyZWVFbGVtZW50IGluc3RhbmNlb2Yg V2ViSW5zcGVjdG9yLkNvbnRhaW5lclRyZWVFbGVtZW50KTsKICAgICAgICAgaWYgKCEodHJlZUVs ZW1lbnQgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlRWxlbWVudCkgJiYgISh0 cmVlRWxlbWVudCBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5TY3JpcHRUcmVlRWxlbWVudCkpCiAg ICAgICAgICAgICByZXR1cm47CiAKQEAgLTYwMCw3ICs2MDMsNyBAQCBXZWJJbnNwZWN0b3IuRGVi dWdnZXJTaWRlYmFyUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICAgICAgcmV0dXJuOwogICAg ICAgICB9CiAKLSAgICAgICAgaWYgKCEodHJlZUVsZW1lbnQgaW5zdGFuY2VvZiBXZWJJbnNwZWN0 b3IuQnJlYWtwb2ludFRyZWVFbGVtZW50KSkKKyAgICAgICAgaWYgKCEodHJlZUVsZW1lbnQgaW5z dGFuY2VvZiBXZWJJbnNwZWN0b3IuQnJlYWtwb2ludFRyZWVFbGVtZW50KSB8fCB0cmVlRWxlbWVu dC5wYXJlbnQgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuQ29udGFpbmVyVHJlZUVsZW1lbnQpCiAg ICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgLy8gRGVzZWxlY3QgYW55IG90aGVyIHRyZWUg ZWxlbWVudHMgdG8gcHJldmVudCB0d28gc2VsZWN0aW9ucyBpbiB0aGUgc2lkZWJhci4KQEAgLTYy OSwxNCArNjMyLDkgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyU2lkZWJhclBhbmVsLnByb3RvdHlw ZSA9IHsKIAogICAgIF9jb21wYXJlVG9wTGV2ZWxUcmVlRWxlbWVudHM6IGZ1bmN0aW9uKGEsIGIp CiAgICAgewotICAgICAgICBpZiAoYSA9PT0gdGhpcy5fYWxsRXhjZXB0aW9uc0JyZWFrcG9pbnRU cmVlRWxlbWVudCkKLSAgICAgICAgICAgIHJldHVybiAtMTsKLSAgICAgICAgaWYgKGIgPT09IHRo aXMuX2FsbEV4Y2VwdGlvbnNCcmVha3BvaW50VHJlZUVsZW1lbnQpCi0gICAgICAgICAgICByZXR1 cm4gMTsKLQotICAgICAgICBpZiAoYSA9PT0gdGhpcy5fYWxsVW5jYXVnaHRFeGNlcHRpb25zQnJl YWtwb2ludFRyZWVFbGVtZW50KQorICAgICAgICBpZiAoYSA9PT0gdGhpcy5fZ2xvYmFsQnJlYWtw b2ludHNDb250YWluZXJUcmVlRWxlbWVudCkKICAgICAgICAgICAgIHJldHVybiAtMTsKLSAgICAg ICAgaWYgKGIgPT09IHRoaXMuX2FsbFVuY2F1Z2h0RXhjZXB0aW9uc0JyZWFrcG9pbnRUcmVlRWxl bWVudCkKKyAgICAgICAgaWYgKGIgPT09IHRoaXMuX2dsb2JhbEJyZWFrcG9pbnRzQ29udGFpbmVy VHJlZUVsZW1lbnQpCiAgICAgICAgICAgICByZXR1cm4gMTsKIAogICAgICAgICByZXR1cm4gYS5t YWluVGl0bGUubG9jYWxlQ29tcGFyZShiLm1haW5UaXRsZSk7Cg== 248531 2015-03-12 12:17:17 -0700 2015-03-12 13:09:25 -0700 Patch bug-142607-20150312121649.patch text/plain 10284 jonowells U3VidmVyc2lvbiBSZXZpc2lvbjogMTgxNDQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBm OTA4ODgyNTllY2I5ZjkzY2M2MmQwNTkwYWFlMDQ5Zjg4ODQ1MjZhLi5mYmZiYWE2YzNmODcxYTBl ZjM3ZjYzZDQ0MGQ3Y2RmNjVkNDkxNDliIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNCBAQAorMjAxNS0wMy0xMiAgSm9ubyBXZWxscyAgPGpvbm93ZWxsc0BhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogRGVidWdnZXIgc2lkZWJhciBzaG91bGQgZ3JvdXAg Z2xvYmFsIGJyZWFrcG9pbnRzIHRvZ2V0aGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNDI2MDcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBVcGRhdGUgdGhlIERlYnVnZ2VyU2lkZWJhclBhbmVsIGNsYXNz IHRvIGhvbGQgZ2xvYmFsIGJyZWFrcG9pbnRzIHN1Y2ggYXMgIkFsbCBFeGNlcHRpb25zIiBpbiBv bmUgY29udGFpbmVyLiBUaGlzCisgICAgICAgIHdpbGwgYmUgdGhlIHBsYWNlIGZ1dHVyZSBzdWNo IGJyZWFrcG9pbnRzIGFyZSBhZGRlZC4KKworICAgICAgICAqIExvY2FsaXphdGlvbnMvZW4ubHBy b2ovbG9jYWxpemVkU3RyaW5ncy5qczogQWRkZWQgc3RyaW5nLgorICAgICAgICAqIFVzZXJJbnRl cmZhY2UvTWFpbi5odG1sOiBTbWFsbCByZWFycmFuZ2VtZW50LgorCisgICAgICAgICogVXNlcklu dGVyZmFjZS9WaWV3cy9EZWJ1Z2dlclNpZGViYXJQYW5lbC5qczogQ2hhbmdlIGhvdyBleGNlcHRp b24gYnJlYWtpbmcgb3B0aW9ucyBhcmUgZGlzcGxheWVkLgorICAgICAgICAoV2ViSW5zcGVjdG9y LkRlYnVnZ2VyU2lkZWJhclBhbmVsKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclNp ZGViYXJQYW5lbC5wcm90b3R5cGUuX3RyZWVFbGVtZW50U2VsZWN0ZWQpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkRlYnVnZ2VyU2lkZWJhclBhbmVsLnByb3RvdHlwZS5fY29tcGFyZVRvcExldmVs VHJlZUVsZW1lbnRzKToKKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRm9sZGVyVHJl ZUVsZW1lbnQuanM6IFN1cHBvcnQgYWRkaXRpb25hbCBjbGFzc2VzIGZvciBpY29ucy4KKyAgICAg ICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlU2lkZWJhclBhbmVsLmpzOiBDaGFuZ2Ug Y2FsbCB0byBGb2xkZXJUcmVlRWxlbWVudCBjb25zdHJ1Y3Rvci4KKwogMjAxNS0wMy0xMiAgSm9z ZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0 b3I6IENvbnNvbGUgRXJyb3JzIGR1cmluZyBwcm92aXNpb25hbCBkb2N1bWVudCBsb2FkcyBnZXQg bG9zdCB3aXRoICJDbGVhciBMb2cgb24gUmVsb2FkIgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYklu c3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmlu Z3MuanMKaW5kZXggZWY4Zjc5MGE5YjIzN2ZiZGY2MmMyOGZjOWNmNjQ4NDJjOTNkNmFlMC4uZGY4 NmY4ZTE1NDE5NTgzMmJiOGY1ZmZmOWEyM2U3Zjg0MjMzMTU5MyAxMDA2NDQKR0lUIGJpbmFyeSBw YXRjaApkZWx0YSAzNApxY21YP2RoV1hIMDxfKmAyQ20mOCQ7Jnh9cVZhUjdsVm59NGpuZnhLeWRH cEVRPkxMSUhLbmAzMAoKZGVsdGEgMTQKV2NtWD9mbWlmcFQ8XypgMkg7MHp3NzZBWXxMPGY1UwoK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01haW4uaHRt bCBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01haW4uaHRtbAppbmRleCAw OWE1OTk0NWQ4Njk4ZDczNTI4ODViZWNhMjM0MGUzZThlMjk5NTNjLi4zNzNiNmZjMDk5NjhiOWM4 MGZmZmY3MTQ2Yjc5ZmZkODM2NDAxMmZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9NYWluLmh0bWwKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvTWFpbi5odG1sCkBAIC0zMTgsNiArMzE4LDcgQEAKIAogICAgIDxzY3JpcHQg c3JjPSJWaWV3cy9ET01EZXRhaWxzU2lkZWJhclBhbmVsLmpzIj48L3NjcmlwdD4KICAgICA8c2Ny aXB0IHNyYz0iVmlld3MvT2JqZWN0VHJlZUJhc2VUcmVlRWxlbWVudC5qcyI+PC9zY3JpcHQ+Cisg ICAgPHNjcmlwdCBzcmM9IlZpZXdzL0ZvbGRlclRyZWVFbGVtZW50LmpzIj48L3NjcmlwdD4KICAg ICA8c2NyaXB0IHNyYz0iVmlld3MvRm9sZGVyaXplZFRyZWVFbGVtZW50LmpzIj48L3NjcmlwdD4K ICAgICA8c2NyaXB0IHNyYz0iVmlld3MvU291cmNlQ29kZVRyZWVFbGVtZW50LmpzIj48L3Njcmlw dD4KICAgICA8c2NyaXB0IHNyYz0iVmlld3MvU3RvcmFnZVRyZWVFbGVtZW50LmpzIj48L3Njcmlw dD4KQEAgLTM5MSw3ICszOTIsNiBAQAogICAgIDxzY3JpcHQgc3JjPSJWaWV3cy9GaWx0ZXJCYXIu anMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3JjPSJWaWV3cy9GaW5kQmFubmVyLmpzIj48L3Nj cmlwdD4KICAgICA8c2NyaXB0IHNyYz0iVmlld3MvRmxleGlibGVTcGFjZU5hdmlnYXRpb25JdGVt LmpzIj48L3NjcmlwdD4KLSAgICA8c2NyaXB0IHNyYz0iVmlld3MvRm9sZGVyVHJlZUVsZW1lbnQu anMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3JjPSJWaWV3cy9Gb250UmVzb3VyY2VDb250ZW50 Vmlldy5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCBzcmM9IlZpZXdzL0Zvcm1hdHRlZFZhbHVl LmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHNyYz0iVmlld3MvRnJhbWVDb250ZW50Vmlldy5q cyI+PC9zY3JpcHQ+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9EZWJ1Z2dlclNpZGViYXJQYW5lbC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RlYnVnZ2VyU2lkZWJhclBhbmVsLmpzCmluZGV4IGFiNTYx ZDIwNDg1MTg1YTBkMGM0MjhiYjY4YzQ0NzY4ZTFiNzZjZTcuLjI4NzAzYzIwODkxOWFiOTc5OWVl Y2VmYzg3ZDVhNzdkZmZjYmE5N2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0RlYnVnZ2VyU2lkZWJhclBhbmVsLmpzCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RlYnVnZ2VyU2lkZWJhclBhbmVsLmpz CkBAIC0xMDQsNiArMTA0LDcgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyU2lkZWJhclBhbmVsID0g ZnVuY3Rpb24oKQogICAgIC8vIEFkZCB0aGlzIG9mZnNldC1zZWN0aW9ucyBjbGFzcyBuYW1lIHNv IHRoZSBzdGlja3kgaGVhZGVycyBkb24ndCBvdmVybGFwIHRoZSBuYXZpZ2F0aW9uIGJhci4KICAg ICB0aGlzLmVsZW1lbnQuY2xhc3NMaXN0LmFkZChXZWJJbnNwZWN0b3IuRGVidWdnZXJTaWRlYmFy UGFuZWwuT2Zmc2V0U2VjdGlvbnNTdHlsZUNsYXNzTmFtZSk7CiAKKyAgICB0aGlzLl9nbG9iYWxC cmVha3BvaW50c0ZvbGRlclRyZWVFbGVtZW50ID0gbmV3IFdlYkluc3BlY3Rvci5Gb2xkZXJUcmVl RWxlbWVudChXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkdsb2JhbCBCcmVha3BvaW50cyIpLCBudWxs LCBXZWJJbnNwZWN0b3IuRGVidWdnZXJTaWRlYmFyUGFuZWwuR2xvYmFsSWNvblN0eWxlQ2xhc3NO YW1lKTsKICAgICB0aGlzLl9hbGxFeGNlcHRpb25zQnJlYWtwb2ludFRyZWVFbGVtZW50ID0gbmV3 IFdlYkluc3BlY3Rvci5CcmVha3BvaW50VHJlZUVsZW1lbnQoV2ViSW5zcGVjdG9yLmRlYnVnZ2Vy TWFuYWdlci5hbGxFeGNlcHRpb25zQnJlYWtwb2ludCwgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyU2lk ZWJhclBhbmVsLkV4Y2VwdGlvbkljb25TdHlsZUNsYXNzTmFtZSwgV2ViSW5zcGVjdG9yLlVJU3Ry aW5nKCJBbGwgRXhjZXB0aW9ucyIpKTsKICAgICB0aGlzLl9hbGxVbmNhdWdodEV4Y2VwdGlvbnNC cmVha3BvaW50VHJlZUVsZW1lbnQgPSBuZXcgV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnRUcmVlRWxl bWVudChXZWJJbnNwZWN0b3IuZGVidWdnZXJNYW5hZ2VyLmFsbFVuY2F1Z2h0RXhjZXB0aW9uc0Jy ZWFrcG9pbnQsIFdlYkluc3BlY3Rvci5EZWJ1Z2dlclNpZGViYXJQYW5lbC5FeGNlcHRpb25JY29u U3R5bGVDbGFzc05hbWUsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiQWxsIFVuY2F1Z2h0IEV4Y2Vw dGlvbnMiKSk7CiAKQEAgLTExNCw4ICsxMTUsMTAgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyU2lk ZWJhclBhbmVsID0gZnVuY3Rpb24oKQogICAgIHRoaXMuX2JyZWFrcG9pbnRzQ29udGVudFRyZWVP dXRsaW5lLm9uZGVsZXRlID0gdGhpcy5fYnJlYWtwb2ludFRyZWVPdXRsaW5lRGVsZXRlVHJlZUVs ZW1lbnQuYmluZCh0aGlzKTsKICAgICB0aGlzLl9icmVha3BvaW50c0NvbnRlbnRUcmVlT3V0bGlu ZS5vbmNvbnRleHRtZW51ID0gdGhpcy5fYnJlYWtwb2ludFRyZWVPdXRsaW5lQ29udGV4dE1lbnVU cmVlRWxlbWVudC5iaW5kKHRoaXMpOwogCi0gICAgdGhpcy5fYnJlYWtwb2ludHNDb250ZW50VHJl ZU91dGxpbmUuYXBwZW5kQ2hpbGQodGhpcy5fYWxsRXhjZXB0aW9uc0JyZWFrcG9pbnRUcmVlRWxl bWVudCk7Ci0gICAgdGhpcy5fYnJlYWtwb2ludHNDb250ZW50VHJlZU91dGxpbmUuYXBwZW5kQ2hp bGQodGhpcy5fYWxsVW5jYXVnaHRFeGNlcHRpb25zQnJlYWtwb2ludFRyZWVFbGVtZW50KTsKKyAg ICB0aGlzLl9icmVha3BvaW50c0NvbnRlbnRUcmVlT3V0bGluZS5hcHBlbmRDaGlsZCh0aGlzLl9n bG9iYWxCcmVha3BvaW50c0ZvbGRlclRyZWVFbGVtZW50KTsKKyAgICB0aGlzLl9nbG9iYWxCcmVh a3BvaW50c0ZvbGRlclRyZWVFbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuX2FsbEV4Y2VwdGlvbnNC cmVha3BvaW50VHJlZUVsZW1lbnQpOworICAgIHRoaXMuX2dsb2JhbEJyZWFrcG9pbnRzRm9sZGVy VHJlZUVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fYWxsVW5jYXVnaHRFeGNlcHRpb25zQnJlYWtw b2ludFRyZWVFbGVtZW50KTsKKyAgICB0aGlzLl9nbG9iYWxCcmVha3BvaW50c0ZvbGRlclRyZWVF bGVtZW50LmV4cGFuZCgpOwogCiAgICAgdmFyIGJyZWFrcG9pbnRzUm93ID0gbmV3IFdlYkluc3Bl Y3Rvci5EZXRhaWxzU2VjdGlvblJvdzsKICAgICBicmVha3BvaW50c1Jvdy5lbGVtZW50LmFwcGVu ZENoaWxkKHRoaXMuX2JyZWFrcG9pbnRzQ29udGVudFRyZWVPdXRsaW5lLmVsZW1lbnQpOwpAQCAt MTQ3LDYgKzE1MCw3IEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlclNpZGViYXJQYW5lbCA9IGZ1bmN0 aW9uKCkKIFdlYkluc3BlY3Rvci5EZWJ1Z2dlclNpZGViYXJQYW5lbC5PZmZzZXRTZWN0aW9uc1N0 eWxlQ2xhc3NOYW1lID0gIm9mZnNldC1zZWN0aW9ucyI7CiBXZWJJbnNwZWN0b3IuRGVidWdnZXJT aWRlYmFyUGFuZWwuRXhjZXB0aW9uSWNvblN0eWxlQ2xhc3NOYW1lID0gImJyZWFrcG9pbnQtZXhj ZXB0aW9uLWljb24iOwogV2ViSW5zcGVjdG9yLkRlYnVnZ2VyU2lkZWJhclBhbmVsLlBhdXNlZEJy ZWFrcG9pbnRJY29uU3R5bGVDbGFzc05hbWUgPSAiYnJlYWtwb2ludC1wYXVzZWQtaWNvbiI7CitX ZWJJbnNwZWN0b3IuRGVidWdnZXJTaWRlYmFyUGFuZWwuR2xvYmFsSWNvblN0eWxlQ2xhc3NOYW1l ID0gImdsb2JhbC1icmVha3BvaW50cy1pY29uIjsKIAogV2ViSW5zcGVjdG9yLkRlYnVnZ2VyU2lk ZWJhclBhbmVsLlNlbGVjdGVkQWxsRXhjZXB0aW9uc0Nvb2tpZUtleSA9ICJkZWJ1Z2dlci1zaWRl YmFyLXBhbmVsLWFsbC1leGNlcHRpb25zLWJyZWFrcG9pbnQiOwogV2ViSW5zcGVjdG9yLkRlYnVn Z2VyU2lkZWJhclBhbmVsLlNlbGVjdGVkQWxsVW5jYXVnaHRFeGNlcHRpb25zQ29va2llS2V5ID0g ImRlYnVnZ2VyLXNpZGViYXItcGFuZWwtYWxsLXVuY2F1Z2h0LWV4Y2VwdGlvbnMtYnJlYWtwb2lu dCI7CkBAIC01MjQsNyArNTI4LDcgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyU2lkZWJhclBhbmVs LnByb3RvdHlwZSA9IHsKIAogICAgIF9icmVha3BvaW50VHJlZU91dGxpbmVDb250ZXh0TWVudVRy ZWVFbGVtZW50OiBmdW5jdGlvbihldmVudCwgdHJlZUVsZW1lbnQpCiAgICAgewotICAgICAgICBj b25zb2xlLmFzc2VydCh0cmVlRWxlbWVudCBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5SZXNvdXJj ZVRyZWVFbGVtZW50IHx8IHRyZWVFbGVtZW50IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlNjcmlw dFRyZWVFbGVtZW50KTsKKyAgICAgICAgY29uc29sZS5hc3NlcnQodHJlZUVsZW1lbnQgaW5zdGFu Y2VvZiBXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlRWxlbWVudCB8fCB0cmVlRWxlbWVudCBpbnN0 YW5jZW9mIFdlYkluc3BlY3Rvci5TY3JpcHRUcmVlRWxlbWVudCB8fCB0cmVlRWxlbWVudC5jb25z dHJ1Y3RvciA9PT0gV2ViSW5zcGVjdG9yLkZvbGRlclRyZWVFbGVtZW50KTsKICAgICAgICAgaWYg KCEodHJlZUVsZW1lbnQgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlRWxlbWVu dCkgJiYgISh0cmVlRWxlbWVudCBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5TY3JpcHRUcmVlRWxl bWVudCkpCiAgICAgICAgICAgICByZXR1cm47CiAKQEAgLTYwMCw3ICs2MDQsNyBAQCBXZWJJbnNw ZWN0b3IuRGVidWdnZXJTaWRlYmFyUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICAgICAgcmV0 dXJuOwogICAgICAgICB9CiAKLSAgICAgICAgaWYgKCEodHJlZUVsZW1lbnQgaW5zdGFuY2VvZiBX ZWJJbnNwZWN0b3IuQnJlYWtwb2ludFRyZWVFbGVtZW50KSkKKyAgICAgICAgaWYgKCEodHJlZUVs ZW1lbnQgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuQnJlYWtwb2ludFRyZWVFbGVtZW50KSB8fCB0 cmVlRWxlbWVudC5wYXJlbnQuY29uc3RydWN0b3IgPT09IFdlYkluc3BlY3Rvci5Gb2xkZXJUcmVl RWxlbWVudCkKICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICAvLyBEZXNlbGVjdCBhbnkg b3RoZXIgdHJlZSBlbGVtZW50cyB0byBwcmV2ZW50IHR3byBzZWxlY3Rpb25zIGluIHRoZSBzaWRl YmFyLgpAQCAtNjI5LDE0ICs2MzMsOSBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJTaWRlYmFyUGFu ZWwucHJvdG90eXBlID0gewogCiAgICAgX2NvbXBhcmVUb3BMZXZlbFRyZWVFbGVtZW50czogZnVu Y3Rpb24oYSwgYikKICAgICB7Ci0gICAgICAgIGlmIChhID09PSB0aGlzLl9hbGxFeGNlcHRpb25z QnJlYWtwb2ludFRyZWVFbGVtZW50KQotICAgICAgICAgICAgcmV0dXJuIC0xOwotICAgICAgICBp ZiAoYiA9PT0gdGhpcy5fYWxsRXhjZXB0aW9uc0JyZWFrcG9pbnRUcmVlRWxlbWVudCkKLSAgICAg ICAgICAgIHJldHVybiAxOwotCi0gICAgICAgIGlmIChhID09PSB0aGlzLl9hbGxVbmNhdWdodEV4 Y2VwdGlvbnNCcmVha3BvaW50VHJlZUVsZW1lbnQpCisgICAgICAgIGlmIChhID09PSB0aGlzLl9n bG9iYWxCcmVha3BvaW50c0ZvbGRlclRyZWVFbGVtZW50KQogICAgICAgICAgICAgcmV0dXJuIC0x OwotICAgICAgICBpZiAoYiA9PT0gdGhpcy5fYWxsVW5jYXVnaHRFeGNlcHRpb25zQnJlYWtwb2lu dFRyZWVFbGVtZW50KQorICAgICAgICBpZiAoYiA9PT0gdGhpcy5fZ2xvYmFsQnJlYWtwb2ludHNG b2xkZXJUcmVlRWxlbWVudCkKICAgICAgICAgICAgIHJldHVybiAxOwogCiAgICAgICAgIHJldHVy biBhLm1haW5UaXRsZS5sb2NhbGVDb21wYXJlKGIubWFpblRpdGxlKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0ZvbGRlclRyZWVFbGVtZW50 LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRm9sZGVyVHJl ZUVsZW1lbnQuanMKaW5kZXggM2Q0NjBhMWExOTI1MzNkNWMxZGFlM2E3Njg5OTBlNDMzMzM3MDBm Mi4uYjg3NGY1MzA2ZDZhY2QxMDI2MjEzNmQwNzkzMmQ4YzZjM2E1NGY2YiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRm9sZGVyVHJlZUVsZW1l bnQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRm9s ZGVyVHJlZUVsZW1lbnQuanMKQEAgLTIzLDkgKzIzLDEyIEBACiAgKiBUSEUgUE9TU0lCSUxJVFkg T0YgU1VDSCBEQU1BR0UuCiAgKi8KIAotV2ViSW5zcGVjdG9yLkZvbGRlclRyZWVFbGVtZW50ID0g ZnVuY3Rpb24odGl0bGUsIHN1YnRpdGxlLCByZXByZXNlbnRlZE9iamVjdCkKK1dlYkluc3BlY3Rv ci5Gb2xkZXJUcmVlRWxlbWVudCA9IGZ1bmN0aW9uKHRpdGxlLCBzdWJ0aXRsZSwgYWRkaXRpb25h bENsYXNzTmFtZXMsIHJlcHJlc2VudGVkT2JqZWN0KQogewotICAgIFdlYkluc3BlY3Rvci5HZW5l cmFsVHJlZUVsZW1lbnQuY2FsbCh0aGlzLCBXZWJJbnNwZWN0b3IuRm9sZGVyVHJlZUVsZW1lbnQu Rm9sZGVySWNvblN0eWxlQ2xhc3NOYW1lLCB0aXRsZSwgc3VidGl0bGUsIHJlcHJlc2VudGVkT2Jq ZWN0LCB0cnVlKTsKKyAgICB2YXIgY2xhc3NOYW1lcyA9IChhZGRpdGlvbmFsQ2xhc3NOYW1lcyAm JiB0eXBlb2YgYWRkaXRpb25hbENsYXNzTmFtZXMgPT09ICJzdHJpbmciID8gW2FkZGl0aW9uYWxD bGFzc05hbWVzXSA6IFtdKTsKKyAgICBjbGFzc05hbWVzLnVuc2hpZnQoV2ViSW5zcGVjdG9yLkZv bGRlclRyZWVFbGVtZW50LkZvbGRlckljb25TdHlsZUNsYXNzTmFtZSk7CisKKyAgICBXZWJJbnNw ZWN0b3IuR2VuZXJhbFRyZWVFbGVtZW50LmNhbGwodGhpcywgY2xhc3NOYW1lcywgdGl0bGUsIHN1 YnRpdGxlLCByZXByZXNlbnRlZE9iamVjdCwgdHJ1ZSk7CiAKICAgICB0aGlzLnNtYWxsID0gdHJ1 ZTsKIH07CkBAIC0zMyw3ICszNiw3IEBAIFdlYkluc3BlY3Rvci5Gb2xkZXJUcmVlRWxlbWVudCA9 IGZ1bmN0aW9uKHRpdGxlLCBzdWJ0aXRsZSwgcmVwcmVzZW50ZWRPYmplY3QpCiBXZWJJbnNwZWN0 b3IuRm9sZGVyVHJlZUVsZW1lbnQuRm9sZGVySWNvblN0eWxlQ2xhc3NOYW1lID0gImZvbGRlci1p Y29uIjsKIAogV2ViSW5zcGVjdG9yLkZvbGRlclRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKLSAg ICBjb25zdHJ1Y3RvcjogV2ViSW5zcGVjdG9yLkZvbGRlclRyZWVFbGVtZW50LAorICAgIGNvbnN0 cnVjdG9yOiBXZWJJbnNwZWN0b3IuRm9sZGVyVHJlZUVsZW1lbnQKIAogICAgIC8vIE5vIE1ldGhv ZHMgb3IgUHJvcGVydGllcwogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlU2lkZWJhclBhbmVsLmpzIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVzb3VyY2VTaWRlYmFyUGFuZWwuanMKaW5k ZXggNWJkYTU1YWRmYTA4NDFlNzgzMjc1MmIyZGM5YzNlMTAxYjllZTg5My4uMTM2NGE3NjMwZmZi M2JiMmJkMzc1N2I4OTU3MGYxNTVlOWEyMTRkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVzb3VyY2VTaWRlYmFyUGFuZWwuanMKKysrIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVzb3VyY2VTaWRlYmFy UGFuZWwuanMKQEAgLTkxMCw3ICs5MTAsNyBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VTaWRlYmFy UGFuZWwucHJvdG90eXBlID0gewogICAgICAgICAgICAgcHJldmlvdXNPbmx5Q2hpbGQuZmxhdHRl bmVkID0gZmFsc2U7CiAgICAgICAgICAgICB0aGlzLl9yZXNvdXJjZXNDb250ZW50VHJlZU91dGxp bmUucmVtb3ZlQ2hpbGQocHJldmlvdXNPbmx5Q2hpbGQpOwogCi0gICAgICAgICAgICB2YXIgZm9s ZGVyRWxlbWVudCA9IG5ldyBXZWJJbnNwZWN0b3IuRm9sZGVyVHJlZUVsZW1lbnQoZm9sZGVyTmFt ZSwgbnVsbCwgbnVsbCk7CisgICAgICAgICAgICB2YXIgZm9sZGVyRWxlbWVudCA9IG5ldyBXZWJJ bnNwZWN0b3IuRm9sZGVyVHJlZUVsZW1lbnQoZm9sZGVyTmFtZSk7CiAgICAgICAgICAgICB0aGlz Ll9yZXNvdXJjZXNDb250ZW50VHJlZU91dGxpbmUuaW5zZXJ0Q2hpbGQoZm9sZGVyRWxlbWVudCwg aW5zZXJ0aW9uSW5kZXhGb3JPYmplY3RJbkxpc3RTb3J0ZWRCeUZ1bmN0aW9uKGZvbGRlckVsZW1l bnQsIHRoaXMuX3Jlc291cmNlc0NvbnRlbnRUcmVlT3V0bGluZS5jaGlsZHJlbiwgdGhpcy5fY29t cGFyZVRyZWVFbGVtZW50cykpOwogCiAgICAgICAgICAgICBmb2xkZXJFbGVtZW50LmFwcGVuZENo aWxkKHByZXZpb3VzT25seUNoaWxkKTsK