148515 2015-08-26 23:20:27 -0700 Web Inspector: Standardize on CSSStyleSheet.Type enum and move more protocol enum conversion to the manager 2015-08-27 10:37:44 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED DoNotImportToRadar P2 Normal --- 1 joepeck joepeck bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1121220 0 joepeck 2015-08-26 23:20:27 -0700 * SUMMARY Standardize on CSSStyleSheet.Type enum and move more protocol enum conversion to the manager. `CSS.CSSRule` protocol types send a `CSS.StyleSheetOrigin` enum to the frontend. So we should be using CSSStyleSheet.Type instead of CSSRule.Type. 1121221 1 260038 joepeck 2015-08-26 23:23:00 -0700 Created attachment 260038 [PATCH] Proposed Fix 1121302 2 260038 bburg 2015-08-27 08:26:49 -0700 Comment on attachment 260038 [PATCH] Proposed Fix r=me 1121350 3 260038 commit-queue 2015-08-27 10:37:40 -0700 Comment on attachment 260038 [PATCH] Proposed Fix Clearing flags on attachment: 260038 Committed r189032: <http://trac.webkit.org/changeset/189032> 1121351 4 commit-queue 2015-08-27 10:37:44 -0700 All reviewed patches have been landed. Closing bug. 260038 2015-08-26 23:23:00 -0700 2015-08-27 10:37:40 -0700 [PATCH] Proposed Fix enum-conversion.patch text/plain 23121 joepeck ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA3OWI2NTRiLi45ZjkzMDViIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTggQEAKIDIwMTUtMDgt MjYgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAorICAgICAgICBXZWIg SW5zcGVjdG9yOiBTdGFuZGFyZGl6ZSBvbiBDU1NTdHlsZVNoZWV0LlR5cGUgZW51bSBhbmQgbW92 ZSBtb3JlIHByb3RvY29sIGVudW0gY29udmVyc2lvbiB0byB0aGUgbWFuYWdlcgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ4NTE1CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvY3NzL21h dGNoZWQtc3R5bGUtcHJvcGVydGllcy5odG1sOgorICAgICAgICAqIGluc3BlY3Rvci9jc3MvcHNl dWRvLWVsZW1lbnQtbWF0Y2hlcy5odG1sOgorICAgICAgICAqIGluc3BlY3Rvci9jc3Mvc2VsZWN0 b3ItZHluYW1pYy1zcGVjaWZpY2l0eS5odG1sOgorICAgICAgICAqIGluc3BlY3Rvci9jc3Mvc2Vs ZWN0b3Itc3BlY2lmaWNpdHkuaHRtbDoKKyAgICAgICAgKiBpbnNwZWN0b3IvY3NzL3N0eWxlc2hl ZXQtd2l0aC1tdXRhdGlvbnMuaHRtbDoKKworMjAxNS0wOC0yNiAgSm9zZXBoIFBlY29yYXJvICA8 cGVjb3Jhcm9AYXBwbGUuY29tPgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFNlcGFyYXRlIGNy ZWF0aW5nIGEgc3R5bGUgc2hlZXQgZnJvbSBhZGRpbmcgYSBuZXcgcnVsZSBpbiB0aGUgcHJvdG9j b2wKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0ODUw MgogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY3NzL21hdGNoZWQtc3R5bGUt cHJvcGVydGllcy5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2Nzcy9tYXRjaGVkLXN0eWxl LXByb3BlcnRpZXMuaHRtbAppbmRleCA2NzgwZWVjLi45ZDgxZTYzIDEwMDY0NAotLS0gYS9MYXlv dXRUZXN0cy9pbnNwZWN0b3IvY3NzL21hdGNoZWQtc3R5bGUtcHJvcGVydGllcy5odG1sCisrKyBi L0xheW91dFRlc3RzL2luc3BlY3Rvci9jc3MvbWF0Y2hlZC1zdHlsZS1wcm9wZXJ0aWVzLmh0bWwK QEAgLTM1LDcgKzM1LDcgQEAgZnVuY3Rpb24gdGVzdCgpIHsKICAgICB7CiAgICAgICAgIGZvciAo dmFyIGkgPSAwOyBpIDwgbm9kZVN0eWxlcy5tYXRjaGVkUnVsZXMubGVuZ3RoOyArK2kpIHsKICAg ICAgICAgICAgIHZhciBydWxlID0gbm9kZVN0eWxlcy5tYXRjaGVkUnVsZXNbaV07Ci0gICAgICAg ICAgICBpZiAocnVsZS50eXBlICE9PSBXZWJJbnNwZWN0b3IuQ1NTUnVsZS5UeXBlLkF1dGhvcikK KyAgICAgICAgICAgIGlmIChydWxlLnR5cGUgIT09IFdlYkluc3BlY3Rvci5DU1NTdHlsZVNoZWV0 LlR5cGUuQXV0aG9yKQogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogCiAgICAgICAgICAgICBm b3IgKHZhciBqID0gMDsgaiA8IHJ1bGUuc3R5bGUucHJvcGVydGllcy5sZW5ndGg7ICsraikgewpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2Nzcy9wc2V1ZG8tZWxlbWVudC1tYXRj aGVzLmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY3NzL3BzZXVkby1lbGVtZW50LW1hdGNo ZXMuaHRtbAppbmRleCA1MDczZjQyLi41MzlhZDIyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9p bnNwZWN0b3IvY3NzL3BzZXVkby1lbGVtZW50LW1hdGNoZXMuaHRtbAorKysgYi9MYXlvdXRUZXN0 cy9pbnNwZWN0b3IvY3NzL3BzZXVkby1lbGVtZW50LW1hdGNoZXMuaHRtbApAQCAtMTIsNyArMTIs NyBAQCBmdW5jdGlvbiB0ZXN0KCkgewogCiAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgbm9k ZVN0eWxlcy5tYXRjaGVkUnVsZXMubGVuZ3RoOyArK2kpIHsKICAgICAgICAgICAgIHZhciBydWxl ID0gbm9kZVN0eWxlcy5tYXRjaGVkUnVsZXNbaV07Ci0gICAgICAgICAgICBpZiAocnVsZS50eXBl ICE9PSBXZWJJbnNwZWN0b3IuQ1NTUnVsZS5UeXBlLlVzZXJBZ2VudCkKKyAgICAgICAgICAgIGlm IChydWxlLnR5cGUgIT09IFdlYkluc3BlY3Rvci5DU1NTdHlsZVNoZWV0LlR5cGUuVXNlckFnZW50 KQogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgaWYgKHJ1bGUuc2VsZWN0 b3JUZXh0LmluZGV4T2YoIjo6LXdlYmtpdC1tZWRpYS10ZXh0LXRyYWNrLWNvbnRhaW5lciIpID09 PSAtMSkKICAgICAgICAgICAgICAgICBjb250aW51ZTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L2luc3BlY3Rvci9jc3Mvc2VsZWN0b3ItZHluYW1pYy1zcGVjaWZpY2l0eS5odG1sIGIvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL2Nzcy9zZWxlY3Rvci1keW5hbWljLXNwZWNpZmljaXR5Lmh0bWwKaW5k ZXggNDg0ZGVhNy4uNzBiYTczZSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2Nz cy9zZWxlY3Rvci1keW5hbWljLXNwZWNpZmljaXR5Lmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW5z cGVjdG9yL2Nzcy9zZWxlY3Rvci1keW5hbWljLXNwZWNpZmljaXR5Lmh0bWwKQEAgLTMzLDcgKzMz LDcgQEAgZnVuY3Rpb24gdGVzdCgpIHsKIAogICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IG5v ZGVTdHlsZXMubWF0Y2hlZFJ1bGVzLmxlbmd0aDsgKytpKSB7CiAgICAgICAgICAgICB2YXIgcnVs ZSA9IG5vZGVTdHlsZXMubWF0Y2hlZFJ1bGVzW2ldOwotICAgICAgICAgICAgaWYgKHJ1bGUudHlw ZSAhPT0gV2ViSW5zcGVjdG9yLkNTU1J1bGUuVHlwZS5BdXRob3IpCisgICAgICAgICAgICBpZiAo cnVsZS50eXBlICE9PSBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVTaGVldC5UeXBlLkF1dGhvcikKICAg ICAgICAgICAgICAgICBjb250aW51ZTsKIAogICAgICAgICAgICAgaWYgKHNlZW5SdWxlcy5zb21l KGZ1bmN0aW9uKHIpIHsgcmV0dXJuIHIuaXNFcXVhbFRvKHJ1bGUpOyB9KSkKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2luc3BlY3Rvci9jc3Mvc2VsZWN0b3Itc3BlY2lmaWNpdHkuaHRtbCBiL0xh eW91dFRlc3RzL2luc3BlY3Rvci9jc3Mvc2VsZWN0b3Itc3BlY2lmaWNpdHkuaHRtbAppbmRleCBh NTllOTUxLi5hNjcxNTE1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY3NzL3Nl bGVjdG9yLXNwZWNpZmljaXR5Lmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2Nzcy9z ZWxlY3Rvci1zcGVjaWZpY2l0eS5odG1sCkBAIC0yNSw3ICsyNSw3IEBAIGZ1bmN0aW9uIHRlc3Qo KSB7CiAgICAgewogICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IG5vZGVTdHlsZXMubWF0Y2hl ZFJ1bGVzLmxlbmd0aDsgKytpKSB7CiAgICAgICAgICAgICB2YXIgcnVsZSA9IG5vZGVTdHlsZXMu bWF0Y2hlZFJ1bGVzW2ldOwotICAgICAgICAgICAgaWYgKHJ1bGUudHlwZSAhPT0gV2ViSW5zcGVj dG9yLkNTU1J1bGUuVHlwZS5BdXRob3IpCisgICAgICAgICAgICBpZiAocnVsZS50eXBlICE9PSBX ZWJJbnNwZWN0b3IuQ1NTU3R5bGVTaGVldC5UeXBlLkF1dGhvcikKICAgICAgICAgICAgICAgICBj b250aW51ZTsKIAogICAgICAgICAgICAgZm9yICh2YXIgc2VsZWN0b3Igb2YgcnVsZS5zZWxlY3Rv cnMpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY3NzL3N0eWxlc2hlZXQtd2l0 aC1tdXRhdGlvbnMuaHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9jc3Mvc3R5bGVzaGVldC13 aXRoLW11dGF0aW9ucy5odG1sCmluZGV4IDhjNzRlZjEuLmJmZjExNDkgMTAwNjQ0Ci0tLSBhL0xh eW91dFRlc3RzL2luc3BlY3Rvci9jc3Mvc3R5bGVzaGVldC13aXRoLW11dGF0aW9ucy5odG1sCisr KyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9jc3Mvc3R5bGVzaGVldC13aXRoLW11dGF0aW9ucy5o dG1sCkBAIC0xNiw3ICsxNiw3IEBAIGZ1bmN0aW9uIHRlc3QoKSB7CiAgICAgewogICAgICAgICBm b3IgKHZhciBpID0gMDsgaSA8IG5vZGVTdHlsZXMubWF0Y2hlZFJ1bGVzLmxlbmd0aDsgKytpKSB7 CiAgICAgICAgICAgICB2YXIgcnVsZSA9IG5vZGVTdHlsZXMubWF0Y2hlZFJ1bGVzW2ldOwotICAg ICAgICAgICAgaWYgKHJ1bGUudHlwZSAhPT0gV2ViSW5zcGVjdG9yLkNTU1J1bGUuVHlwZS5BdXRo b3IpCisgICAgICAgICAgICBpZiAocnVsZS50eXBlICE9PSBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVT aGVldC5UeXBlLkF1dGhvcikKICAgICAgICAgICAgICAgICBjb250aW51ZTsKIAogICAgICAgICAg ICAgZm9yICh2YXIgc2VsZWN0b3Igb2YgcnVsZS5zZWxlY3RvcnMpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5n ZUxvZwppbmRleCA1ZWM0MjgzLi5lZDhiNmQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAg LTEsNSArMSw0MSBAQAogMjAxNS0wOC0yNiAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBw bGUuY29tPgogCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFN0YW5kYXJkaXplIG9uIENTU1N0eWxl U2hlZXQuVHlwZSBlbnVtIGFuZCBtb3ZlIG1vcmUgcHJvdG9jb2wgZW51bSBjb252ZXJzaW9uIHRv IHRoZSBtYW5hZ2VyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNDg1MTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIFVzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvQ1NTU3R5bGVNYW5hZ2VyLmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkNTU1N0eWxlTWFuYWdlci5wcm90b2NvbFN0eWxlU2hlZXRPcmln aW5Ub0VudW0pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNTU1N0eWxlTWFuYWdlci5wcm90b2Nv bE1lZGlhU291cmNlVG9FbnVtKToKKyAgICAgICAgUHJvdG9jb2wgZW51bSB0byBmcm9udGVuZCBl bnVtIGNvbnZlcnNpb24uCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL01vZGVscy9ET01Ob2Rl U3R5bGVzLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTU5vZGVTdHlsZXMucHJvdG90eXBl LnJlZnJlc2guZmV0Y2hlZENvbXB1dGVkU3R5bGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRP TU5vZGVTdHlsZXMucHJvdG90eXBlLnJlZnJlc2gpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRP TU5vZGVTdHlsZXMucHJvdG90eXBlLl9wYXJzZVJ1bGVQYXlsb2FkKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5ET01Ob2RlU3R5bGVzLnByb3RvdHlwZS5fY29sbGVjdFN0eWxlc0luQ2FzY2FkZU9y ZGVyKToKKyAgICAgICAgVXNlIHRoZSBtYW5hZ2VyIHRvIGNvbnZlcnQgZnJvbSBhIHByb3RvY29s IHBheWxvYWQgZW51bSB0byBmcm9udGVuZCBudW0gZm9yIGNzcyB0eXBlcy4KKworICAgICAgICAq IFVzZXJJbnRlcmZhY2UvTW9kZWxzL0NTU1J1bGUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu Q1NTUnVsZS5wcm90b3R5cGUuZ2V0IGVkaXRhYmxlKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNl L1ZpZXdzL0NTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uLmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkNTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5D U1NTdHlsZURlY2xhcmF0aW9uU2VjdGlvbi5wcm90b3R5cGUucmVmcmVzaCk6CisgICAgICAgICog VXNlckludGVyZmFjZS9WaWV3cy9SdWxlc1N0eWxlRGV0YWlsc1BhbmVsLmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlJ1bGVzU3R5bGVEZXRhaWxzUGFuZWwucHJvdG90eXBlLnJlZnJlc2guYXBw ZW5kU3R5bGVTZWN0aW9uKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SdWxlc1N0eWxlRGV0YWls c1BhbmVsLnByb3RvdHlwZS5yZWZyZXNoKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdz L1Zpc3VhbFN0eWxlU2VsZWN0b3JTZWN0aW9uLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlZp c3VhbFN0eWxlU2VsZWN0b3JTZWN0aW9uLnByb3RvdHlwZS51cGRhdGUuY3JlYXRlU2VsZWN0b3JJ dGVtKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZVNlbGVjdG9yU2VjdGlvbi5w cm90b3R5cGUudXBkYXRlLnVuaXF1ZU9yZGVyZWRSdWxlcy5zZXQgcmV0dXJuKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZVNlbGVjdG9yU2VjdGlvbi5wcm90b3R5cGUudXBkYXRl LnVuaXF1ZU9yZGVyZWRSdWxlcyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVT ZWxlY3RvclNlY3Rpb24ucHJvdG90eXBlLnVwZGF0ZSk6CisgICAgICAgICogVXNlckludGVyZmFj ZS9WaWV3cy9WaXN1YWxTdHlsZVNlbGVjdG9yVHJlZUl0ZW0uanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuVmlzdWFsU3R5bGVTZWxlY3RvclRyZWVJdGVtKToKKyAgICAgICAgVXBkYXRlIGVudW0g dXNlLgorCisyMDE1LTA4LTI2ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+ CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogU2VwYXJhdGUgY3JlYXRpbmcgYSBzdHlsZSBzaGVl dCBmcm9tIGFkZGluZyBhIG5ldyBydWxlIGluIHRoZSBwcm90b2NvbAogICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ4NTAyCiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0NTU1N0eWxlTWFu YWdlci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJz L0NTU1N0eWxlTWFuYWdlci5qcwppbmRleCBjN2Q2YjZlLi5iMzJiOTMzIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9DU1NTdHlsZU1h bmFnZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJv bGxlcnMvQ1NTU3R5bGVNYW5hZ2VyLmpzCkBAIC01Niw3ICs1Niw2IEBAIFdlYkluc3BlY3Rvci5D U1NTdHlsZU1hbmFnZXIgPSBjbGFzcyBDU1NTdHlsZU1hbmFnZXIgZXh0ZW5kcyBXZWJJbnNwZWN0 b3IuT2JqZWN0CiAKICAgICBzdGF0aWMgcHJvdG9jb2xTdHlsZVNoZWV0T3JpZ2luVG9FbnVtKG9y aWdpbikKICAgICB7Ci0gICAgICAgIC8vIEZJWE1FOiBTd2l0Y2ggZnJvbSBDU1NSdWxlLlR5cGUg dG8gQ1NTU3R5bGVTaGVldC5UeXBlIGV2ZXJ5d2hlcmUuCiAgICAgICAgIHN3aXRjaCAob3JpZ2lu KSB7CiAgICAgICAgIGNhc2UgQ1NTQWdlbnQuU3R5bGVTaGVldE9yaWdpbi5SZWd1bGFyOgogICAg ICAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5DU1NTdHlsZVNoZWV0LlR5cGUuQXV0aG9yOwpA QCAtNjcsMTEgKzY2LDI4IEBAIFdlYkluc3BlY3Rvci5DU1NTdHlsZU1hbmFnZXIgPSBjbGFzcyBD U1NTdHlsZU1hbmFnZXIgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZWN0CiAgICAgICAgIGNhc2Ug Q1NTQWdlbnQuU3R5bGVTaGVldE9yaWdpbi5JbnNwZWN0b3I6CiAgICAgICAgICAgICByZXR1cm4g V2ViSW5zcGVjdG9yLkNTU1N0eWxlU2hlZXQuVHlwZS5JbnNwZWN0b3I7CiAgICAgICAgIGRlZmF1 bHQ6Ci0gICAgICAgICAgICBjb25zb2xlLmFzc2VydChmYWxzZSwgIlVua25vd24gU3R5bGVTaGVl dE9yaWdpbiIsIG9yaWdpbik7CisgICAgICAgICAgICBjb25zb2xlLmFzc2VydChmYWxzZSwgIlVu a25vd24gQ1NTLlN0eWxlU2hlZXRPcmlnaW4iLCBvcmlnaW4pOwogICAgICAgICAgICAgcmV0dXJu IENTU0FnZW50LlN0eWxlU2hlZXRPcmlnaW4uUmVndWxhcjsKICAgICAgICAgfQogICAgIH0KIAor ICAgIHN0YXRpYyBwcm90b2NvbE1lZGlhU291cmNlVG9FbnVtKHNvdXJjZSkKKyAgICB7CisgICAg ICAgIHN3aXRjaCAoc291cmNlKSB7CisgICAgICAgIGNhc2UgQ1NTQWdlbnQuQ1NTTWVkaWFTb3Vy Y2UuTWVkaWFSdWxlOgorICAgICAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5DU1NNZWRpYS5U eXBlLk1lZGlhUnVsZTsKKyAgICAgICAgY2FzZSBDU1NBZ2VudC5DU1NNZWRpYVNvdXJjZS5JbXBv cnRSdWxlOgorICAgICAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5DU1NNZWRpYS5UeXBlLklt cG9ydFJ1bGU7CisgICAgICAgIGNhc2UgQ1NTQWdlbnQuQ1NTTWVkaWFTb3VyY2UuTGlua2VkU2hl ZXQ6CisgICAgICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLkNTU01lZGlhLlR5cGUuTGlua2Vk U3R5bGVTaGVldDsKKyAgICAgICAgY2FzZSBDU1NBZ2VudC5DU1NNZWRpYVNvdXJjZS5JbmxpbmVT aGVldDoKKyAgICAgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuQ1NTTWVkaWEuVHlwZS5Jbmxp bmVTdHlsZVNoZWV0OworICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgY29uc29sZS5hc3Nl cnQoZmFsc2UsICJVbmtub3duIENTUy5DU1NNZWRpYVNvdXJjZSIsIG9yaWdpbik7CisgICAgICAg ICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLkNTU01lZGlhLlR5cGUuTWVkaWFSdWxlOworICAgICAg ICB9CisgICAgfQorCiAgICAgLy8gUHVibGljCiAKICAgICBnZXQgcHJlZmVycmVkQ29sb3JGb3Jt YXQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9k ZWxzL0NTU1J1bGUuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2Rl bHMvQ1NTUnVsZS5qcwppbmRleCBjN2E4YTU3Li40YTVkOWU0IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvQ1NTUnVsZS5qcworKysgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvQ1NTUnVsZS5qcwpAQCAtNTMs NyArNTMsNyBAQCBXZWJJbnNwZWN0b3IuQ1NTUnVsZSA9IGNsYXNzIENTU1J1bGUgZXh0ZW5kcyBX ZWJJbnNwZWN0b3IuT2JqZWN0CiAKICAgICBnZXQgZWRpdGFibGUoKQogICAgIHsKLSAgICAgICAg cmV0dXJuICEhdGhpcy5faWQgJiYgKHRoaXMuX3R5cGUgPT09IFdlYkluc3BlY3Rvci5DU1NSdWxl LlR5cGUuQXV0aG9yIHx8IHRoaXMuX3R5cGUgPT09IFdlYkluc3BlY3Rvci5DU1NSdWxlLlR5cGUu SW5zcGVjdG9yKTsKKyAgICAgICAgcmV0dXJuICEhdGhpcy5faWQgJiYgKHRoaXMuX3R5cGUgPT09 IFdlYkluc3BlY3Rvci5DU1NTdHlsZVNoZWV0LlR5cGUuQXV0aG9yIHx8IHRoaXMuX3R5cGUgPT09 IFdlYkluc3BlY3Rvci5DU1NTdHlsZVNoZWV0LlR5cGUuSW5zcGVjdG9yKTsKICAgICB9CiAKICAg ICB1cGRhdGUoc291cmNlQ29kZUxvY2F0aW9uLCBzZWxlY3RvclRleHQsIHNlbGVjdG9ycywgbWF0 Y2hlZFNlbGVjdG9ySW5kaWNlcywgc3R5bGUsIG1lZGlhTGlzdCwgZG9udEZpcmVFdmVudHMpCkBA IC0yNDcsMTAgKzI0NywzIEBAIFdlYkluc3BlY3Rvci5DU1NSdWxlLkV2ZW50ID0gewogICAgIENo YW5nZWQ6ICJjc3MtcnVsZS1jaGFuZ2VkIiwKICAgICBTZWxlY3RvckNoYW5nZWQ6ICJjc3MtcnVs ZS1pbnZhbGlkLXNlbGVjdG9yIgogfTsKLQotV2ViSW5zcGVjdG9yLkNTU1J1bGUuVHlwZSA9IHsK LSAgICBBdXRob3I6ICJjc3MtcnVsZS10eXBlLWF1dGhvciIsCi0gICAgVXNlcjogImNzcy1ydWxl LXR5cGUtdXNlciIsCi0gICAgVXNlckFnZW50OiAiY3NzLXJ1bGUtdHlwZS11c2VyLWFnZW50IiwK LSAgICBJbnNwZWN0b3I6ICJjc3MtcnVsZS10eXBlLWluc3BlY3RvciIKLX07CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvRE9NTm9kZVN0eWxl cy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9ET01Ob2Rl U3R5bGVzLmpzCmluZGV4IDk3ZGYxZWUuLmU3ZTAwOTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9ET01Ob2RlU3R5bGVzLmpzCisrKyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9ET01Ob2RlU3R5bGVzLmpz CkBAIC0xNzAsNyArMTcwLDcgQEAgV2ViSW5zcGVjdG9yLkRPTU5vZGVTdHlsZXMgPSBjbGFzcyBE T01Ob2RlU3R5bGVzIGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogICAgICAgICAgICAgICAg ICAgICBpZiAoIXRoaXMuX2luY2x1ZGVVc2VyQWdlbnRSdWxlc09uTmV4dFJlZnJlc2gpIHsKICAg ICAgICAgICAgICAgICAgICAgICAgIC8vIFdlIGNhbiBhc3N1bWUgYWxsIHRoZSBzdHlsZXMgd2l0 aCB0aGUgc2FtZSBrZXkgYXJlIGZyb20gdGhlIHNhbWUgc3R5bGVzaGVldCBhbmQgcnVsZSwgc28g d2Ugb25seSBjaGVjayB0aGUgZmlyc3QuCiAgICAgICAgICAgICAgICAgICAgICAgICB2YXIgZmly c3RTdHlsZSA9IHRoaXMuX3N0eWxlRGVjbGFyYXRpb25zTWFwW2tleV1bMF07Ci0gICAgICAgICAg ICAgICAgICAgICAgICBpZiAoZmlyc3RTdHlsZSAmJiBmaXJzdFN0eWxlLm93bmVyUnVsZSAmJiBm aXJzdFN0eWxlLm93bmVyUnVsZS50eXBlID09PSBXZWJJbnNwZWN0b3IuQ1NTUnVsZS5UeXBlLlVz ZXJBZ2VudCkgeworICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGZpcnN0U3R5bGUgJiYgZmly c3RTdHlsZS5vd25lclJ1bGUgJiYgZmlyc3RTdHlsZS5vd25lclJ1bGUudHlwZSA9PT0gV2ViSW5z cGVjdG9yLkNTU1N0eWxlU2hlZXQuVHlwZS5Vc2VyQWdlbnQpIHsKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAvLyBVc2VyIEFnZW50IHN0eWxlcyBnZXQgZGlmZmVyZW50IGlkZW50aWZpZXJz IGFmdGVyIHNvbWUgZWRpdHMuIFRoaXMgd291bGQgY2F1c2UgdXMgdG8gZmlyZSBhIHNpZ25pZmlj YW50IHJlZnJlc2hlZAogICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8vIGV2ZW50IG1vcmUg dGhhbiBpdCBpcyBoZWxwZnVsLiBBbmQgc2luY2UgdGhlIHVzZXIgYWdlbnQgc3R5bGVzaGVldCBp cyBzdGF0aWMgaXQgc2hvdWxkbid0IG1hdGNoIGRpZmZlcmVudGx5CiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgLy8gYmV0d2VlbiByZWZyZXNoZXMgZm9yIHRoZSBzYW1lIG5vZGUuIFRoaXMg aXNzdWUgaXMgdHJhY2tlZCBieTogaHR0cHM6Ly93ZWJraXQub3JnL2IvMTEwMDU1CkBAIC0xOTMs NyArMTkzLDcgQEAgV2ViSW5zcGVjdG9yLkRPTU5vZGVTdHlsZXMgPSBjbGFzcyBET01Ob2RlU3R5 bGVzIGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogICAgICAgICAgICAgICAgICAgICBpZiAo IXRoaXMuX2luY2x1ZGVVc2VyQWdlbnRSdWxlc09uTmV4dFJlZnJlc2gpIHsKICAgICAgICAgICAg ICAgICAgICAgICAgIC8vIFNlZSBhYm92ZSBmb3Igd2h5IHdlIHNraXAgdXNlciBhZ2VudCBzdHls ZSBydWxlcy4KICAgICAgICAgICAgICAgICAgICAgICAgIHZhciBmaXJzdFN0eWxlID0gdGhpcy5f cHJldmlvdXNTdHlsZURlY2xhcmF0aW9uc01hcFtrZXldWzBdOwotICAgICAgICAgICAgICAgICAg ICAgICAgaWYgKGZpcnN0U3R5bGUgJiYgZmlyc3RTdHlsZS5vd25lclJ1bGUgJiYgZmlyc3RTdHls ZS5vd25lclJ1bGUudHlwZSA9PT0gV2ViSW5zcGVjdG9yLkNTU1J1bGUuVHlwZS5Vc2VyQWdlbnQp CisgICAgICAgICAgICAgICAgICAgICAgICBpZiAoZmlyc3RTdHlsZSAmJiBmaXJzdFN0eWxlLm93 bmVyUnVsZSAmJiBmaXJzdFN0eWxlLm93bmVyUnVsZS50eXBlID09PSBXZWJJbnNwZWN0b3IuQ1NT U3R5bGVTaGVldC5UeXBlLlVzZXJBZ2VudCkKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBj b250aW51ZTsKICAgICAgICAgICAgICAgICAgICAgfQogCkBAIC02OTUsNiArNjk1LDcgQEAgV2Vi SW5zcGVjdG9yLkRPTU5vZGVTdHlsZXMgPSBjbGFzcyBET01Ob2RlU3R5bGVzIGV4dGVuZHMgV2Vi SW5zcGVjdG9yLk9iamVjdAogCiAgICAgICAgIHZhciBzZWxlY3RvclRleHQgPSBwYXlsb2FkLnNl bGVjdG9yTGlzdC50ZXh0OwogICAgICAgICB2YXIgc2VsZWN0b3JzID0gdGhpcy5fcGFyc2VTZWxl Y3Rvckxpc3RQYXlsb2FkKHBheWxvYWQuc2VsZWN0b3JMaXN0KTsKKyAgICAgICAgdmFyIHR5cGUg PSBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVNYW5hZ2VyLnByb3RvY29sU3R5bGVTaGVldE9yaWdpblRv RW51bShwYXlsb2FkLm9yaWdpbik7CiAKICAgICAgICAgdmFyIHNvdXJjZUNvZGVMb2NhdGlvbiA9 IG51bGw7CiAgICAgICAgIHZhciBzb3VyY2VSYW5nZSA9IHBheWxvYWQuc2VsZWN0b3JMaXN0LnJh bmdlOwpAQCAtNzA4LDQyICs3MDksMTAgQEAgV2ViSW5zcGVjdG9yLkRPTU5vZGVTdHlsZXMgPSBj bGFzcyBET01Ob2RlU3R5bGVzIGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogICAgICAgICBp ZiAoc3R5bGVTaGVldCkKICAgICAgICAgICAgIHNvdXJjZUNvZGVMb2NhdGlvbiA9IHN0eWxlU2hl ZXQub2Zmc2V0U291cmNlQ29kZUxvY2F0aW9uKHNvdXJjZUNvZGVMb2NhdGlvbik7CiAKLSAgICAg ICAgdmFyIHR5cGU7Ci0gICAgICAgIHN3aXRjaCAocGF5bG9hZC5vcmlnaW4pIHsKLSAgICAgICAg Y2FzZSAicmVndWxhciI6Ci0gICAgICAgICAgICB0eXBlID0gV2ViSW5zcGVjdG9yLkNTU1J1bGUu VHlwZS5BdXRob3I7Ci0gICAgICAgICAgICBicmVhazsKLSAgICAgICAgY2FzZSAidXNlciI6Ci0g ICAgICAgICAgICB0eXBlID0gV2ViSW5zcGVjdG9yLkNTU1J1bGUuVHlwZS5Vc2VyOwotICAgICAg ICAgICAgYnJlYWs7Ci0gICAgICAgIGNhc2UgInVzZXItYWdlbnQiOgotICAgICAgICAgICAgdHlw ZSA9IFdlYkluc3BlY3Rvci5DU1NSdWxlLlR5cGUuVXNlckFnZW50OwotICAgICAgICAgICAgYnJl YWs7Ci0gICAgICAgIGNhc2UgImluc3BlY3RvciI6Ci0gICAgICAgICAgICB0eXBlID0gV2ViSW5z cGVjdG9yLkNTU1J1bGUuVHlwZS5JbnNwZWN0b3I7Ci0gICAgICAgICAgICBicmVhazsKLSAgICAg ICAgfQotCiAgICAgICAgIHZhciBtZWRpYUxpc3QgPSBbXTsKICAgICAgICAgZm9yICh2YXIgaSA9 IDA7IHBheWxvYWQubWVkaWEgJiYgaSA8IHBheWxvYWQubWVkaWEubGVuZ3RoOyArK2kpIHsKICAg ICAgICAgICAgIHZhciBtZWRpYUl0ZW0gPSBwYXlsb2FkLm1lZGlhW2ldOwotCi0gICAgICAgICAg ICB2YXIgbWVkaWFUeXBlOwotICAgICAgICAgICAgc3dpdGNoIChtZWRpYUl0ZW0uc291cmNlKSB7 Ci0gICAgICAgICAgICBjYXNlICJtZWRpYVJ1bGUiOgotICAgICAgICAgICAgICAgIG1lZGlhVHlw ZSA9IFdlYkluc3BlY3Rvci5DU1NNZWRpYS5UeXBlLk1lZGlhUnVsZTsKLSAgICAgICAgICAgICAg ICBicmVhazsKLSAgICAgICAgICAgIGNhc2UgImltcG9ydFJ1bGUiOgotICAgICAgICAgICAgICAg IG1lZGlhVHlwZSA9IFdlYkluc3BlY3Rvci5DU1NNZWRpYS5UeXBlLkltcG9ydFJ1bGU7Ci0gICAg ICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICBjYXNlICJsaW5rZWRTaGVldCI6Ci0gICAg ICAgICAgICAgICAgbWVkaWFUeXBlID0gV2ViSW5zcGVjdG9yLkNTU01lZGlhLlR5cGUuTGlua2Vk U3R5bGVTaGVldDsKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIGNhc2UgImlu bGluZVNoZWV0IjoKLSAgICAgICAgICAgICAgICBtZWRpYVR5cGUgPSBXZWJJbnNwZWN0b3IuQ1NT TWVkaWEuVHlwZS5JbmxpbmVTdHlsZVNoZWV0OwotICAgICAgICAgICAgICAgIGJyZWFrOwotICAg ICAgICAgICAgfQotCisgICAgICAgICAgICB2YXIgbWVkaWFUeXBlID0gV2ViSW5zcGVjdG9yLkNT U1N0eWxlTWFuYWdlci5wcm90b2NvbE1lZGlhU291cmNlVG9FbnVtKG1lZGlhSXRlbS5zb3VyY2Up OwogICAgICAgICAgICAgdmFyIG1lZGlhVGV4dCA9IG1lZGlhSXRlbS50ZXh0OwogICAgICAgICAg ICAgdmFyIG1lZGlhU291cmNlQ29kZUxvY2F0aW9uID0gdGhpcy5fY3JlYXRlU291cmNlQ29kZUxv Y2F0aW9uKG1lZGlhSXRlbS5zb3VyY2VVUkwsIG1lZGlhSXRlbS5zb3VyY2VMaW5lKTsKICAgICAg ICAgICAgIGlmIChzdHlsZVNoZWV0KQpAQCAtODMxLDEzICs4MDAsMTMgQEAgV2ViSW5zcGVjdG9y LkRPTU5vZGVTdHlsZXMgPSBjbGFzcyBET01Ob2RlU3R5bGVzIGV4dGVuZHMgV2ViSW5zcGVjdG9y Lk9iamVjdAogICAgICAgICAgICAgLy8gT25seSBhcHBlbmQgdG8gdGhlIHJlc3VsdCBhcnJheSBo ZXJlIGZvciBhdXRob3IgYW5kIGluc3BlY3RvciBydWxlcyBzaW5jZSBhdHRyaWJ1dGUKICAgICAg ICAgICAgIC8vIHN0eWxlcyBjb21lIGJldHdlZW4gYXV0aG9yIHJ1bGVzIGFuZCB1c2VyL3VzZXIg YWdlbnQgcnVsZXMuCiAgICAgICAgICAgICBzd2l0Y2ggKHJ1bGUudHlwZSkgewotICAgICAgICAg ICAgY2FzZSBXZWJJbnNwZWN0b3IuQ1NTUnVsZS5UeXBlLkluc3BlY3RvcjoKLSAgICAgICAgICAg IGNhc2UgV2ViSW5zcGVjdG9yLkNTU1J1bGUuVHlwZS5BdXRob3I6CisgICAgICAgICAgICBjYXNl IFdlYkluc3BlY3Rvci5DU1NTdHlsZVNoZWV0LlR5cGUuSW5zcGVjdG9yOgorICAgICAgICAgICAg Y2FzZSBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVTaGVldC5UeXBlLkF1dGhvcjoKICAgICAgICAgICAg ICAgICByZXN1bHQucHVzaChydWxlLnN0eWxlKTsKICAgICAgICAgICAgICAgICBicmVhazsKIAot ICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuQ1NTUnVsZS5UeXBlLlVzZXI6Ci0gICAgICAg ICAgICBjYXNlIFdlYkluc3BlY3Rvci5DU1NSdWxlLlR5cGUuVXNlckFnZW50OgorICAgICAgICAg ICAgY2FzZSBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVTaGVldC5UeXBlLlVzZXI6CisgICAgICAgICAg ICBjYXNlIFdlYkluc3BlY3Rvci5DU1NTdHlsZVNoZWV0LlR5cGUuVXNlckFnZW50OgogICAgICAg ICAgICAgICAgIHVzZXJBbmRVc2VyQWdlbnRTdHlsZXMucHVzaChydWxlLnN0eWxlKTsKICAgICAg ICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9u LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ1NTU3R5bGVE ZWNsYXJhdGlvblNlY3Rpb24uanMKaW5kZXggN2Y5YmNmYS4uOTZkN2M3ZCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ1NTU3R5bGVEZWNsYXJh dGlvblNlY3Rpb24uanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvQ1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24uanMKQEAgLTgwLDEzICs4MCwxMyBAQCBX ZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24gPSBjbGFzcyBDU1NTdHlsZURl Y2xhcmF0aW9uU2VjdGlvbiBleHRlbgogCiAgICAgICAgICAgICBpZiAoc3R5bGUuaW5oZXJpdGVk KQogICAgICAgICAgICAgICAgIGljb25DbGFzc05hbWUgPSBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVE ZWNsYXJhdGlvblNlY3Rpb24uSW5oZXJpdGVkU3R5bGVSdWxlSWNvblN0eWxlQ2xhc3NOYW1lOwot ICAgICAgICAgICAgZWxzZSBpZiAoc3R5bGUub3duZXJSdWxlLnR5cGUgPT09IFdlYkluc3BlY3Rv ci5DU1NSdWxlLlR5cGUuQXV0aG9yKQorICAgICAgICAgICAgZWxzZSBpZiAoc3R5bGUub3duZXJS dWxlLnR5cGUgPT09IFdlYkluc3BlY3Rvci5DU1NTdHlsZVNoZWV0LlR5cGUuQXV0aG9yKQogICAg ICAgICAgICAgICAgIGljb25DbGFzc05hbWUgPSBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJh dGlvblNlY3Rpb24uQXV0aG9yU3R5bGVSdWxlSWNvblN0eWxlQ2xhc3NOYW1lOwotICAgICAgICAg ICAgZWxzZSBpZiAoc3R5bGUub3duZXJSdWxlLnR5cGUgPT09IFdlYkluc3BlY3Rvci5DU1NSdWxl LlR5cGUuVXNlcikKKyAgICAgICAgICAgIGVsc2UgaWYgKHN0eWxlLm93bmVyUnVsZS50eXBlID09 PSBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVTaGVldC5UeXBlLlVzZXIpCiAgICAgICAgICAgICAgICAg aWNvbkNsYXNzTmFtZSA9IFdlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uU2VjdGlvbi5V c2VyU3R5bGVSdWxlSWNvblN0eWxlQ2xhc3NOYW1lOwotICAgICAgICAgICAgZWxzZSBpZiAoc3R5 bGUub3duZXJSdWxlLnR5cGUgPT09IFdlYkluc3BlY3Rvci5DU1NSdWxlLlR5cGUuVXNlckFnZW50 KQorICAgICAgICAgICAgZWxzZSBpZiAoc3R5bGUub3duZXJSdWxlLnR5cGUgPT09IFdlYkluc3Bl Y3Rvci5DU1NTdHlsZVNoZWV0LlR5cGUuVXNlckFnZW50KQogICAgICAgICAgICAgICAgIGljb25D bGFzc05hbWUgPSBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24uVXNlckFn ZW50U3R5bGVSdWxlSWNvblN0eWxlQ2xhc3NOYW1lOwotICAgICAgICAgICAgZWxzZSBpZiAoc3R5 bGUub3duZXJSdWxlLnR5cGUgPT09IFdlYkluc3BlY3Rvci5DU1NSdWxlLlR5cGUuSW5zcGVjdG9y KQorICAgICAgICAgICAgZWxzZSBpZiAoc3R5bGUub3duZXJSdWxlLnR5cGUgPT09IFdlYkluc3Bl Y3Rvci5DU1NTdHlsZVNoZWV0LlR5cGUuSW5zcGVjdG9yKQogICAgICAgICAgICAgICAgIGljb25D bGFzc05hbWUgPSBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24uSW5zcGVj dG9yU3R5bGVSdWxlSWNvblN0eWxlQ2xhc3NOYW1lOwogICAgICAgICAgICAgYnJlYWs7CiAKQEAg LTIzNCwxOSArMjM0LDE5IEBAIFdlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uU2VjdGlv biA9IGNsYXNzIENTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uIGV4dGVuCiAgICAgICAgICAgICB9 IGVsc2UgewogICAgICAgICAgICAgICAgIHZhciBvcmlnaW5TdHJpbmc7CiAgICAgICAgICAgICAg ICAgc3dpdGNoICh0aGlzLl9zdHlsZS5vd25lclJ1bGUudHlwZSkgewotICAgICAgICAgICAgICAg IGNhc2UgV2ViSW5zcGVjdG9yLkNTU1J1bGUuVHlwZS5BdXRob3I6CisgICAgICAgICAgICAgICAg Y2FzZSBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVTaGVldC5UeXBlLkF1dGhvcjoKICAgICAgICAgICAg ICAgICAgICAgb3JpZ2luU3RyaW5nID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJBdXRob3IgU3R5 bGVzaGVldCIpOwogICAgICAgICAgICAgICAgICAgICBicmVhazsKIAotICAgICAgICAgICAgICAg IGNhc2UgV2ViSW5zcGVjdG9yLkNTU1J1bGUuVHlwZS5Vc2VyOgorICAgICAgICAgICAgICAgIGNh c2UgV2ViSW5zcGVjdG9yLkNTU1N0eWxlU2hlZXQuVHlwZS5Vc2VyOgogICAgICAgICAgICAgICAg ICAgICBvcmlnaW5TdHJpbmcgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlVzZXIgU3R5bGVzaGVl dCIpOwogICAgICAgICAgICAgICAgICAgICBicmVhazsKIAotICAgICAgICAgICAgICAgIGNhc2Ug V2ViSW5zcGVjdG9yLkNTU1J1bGUuVHlwZS5Vc2VyQWdlbnQ6CisgICAgICAgICAgICAgICAgY2Fz ZSBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVTaGVldC5UeXBlLlVzZXJBZ2VudDoKICAgICAgICAgICAg ICAgICAgICAgb3JpZ2luU3RyaW5nID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJVc2VyIEFnZW50 IFN0eWxlc2hlZXQiKTsKICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CiAKLSAgICAgICAgICAg ICAgICBjYXNlIFdlYkluc3BlY3Rvci5DU1NSdWxlLlR5cGUuSW5zcGVjdG9yOgorICAgICAgICAg ICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLkNTU1N0eWxlU2hlZXQuVHlwZS5JbnNwZWN0b3I6CiAg ICAgICAgICAgICAgICAgICAgIG9yaWdpblN0cmluZyA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygi V2ViIEluc3BlY3RvciIpOwogICAgICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAg ICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9SdWxlc1N0eWxlRGV0YWlsc1BhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvUnVsZXNTdHlsZURldGFpbHNQYW5lbC5qcwppbmRleCBiM2MxMTBi Li41ZmYwMGM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9SdWxlc1N0eWxlRGV0YWlsc1BhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1J1bGVzU3R5bGVEZXRhaWxzUGFuZWwuanMKQEAgLTE2 NCw3ICsxNjQsNyBAQCBXZWJJbnNwZWN0b3IuUnVsZXNTdHlsZURldGFpbHNQYW5lbCA9IGNsYXNz IFJ1bGVzU3R5bGVEZXRhaWxzUGFuZWwgZXh0ZW5kcyBXZWJJbgogICAgICAgICAgICAgfSBlbHNl CiAgICAgICAgICAgICAgICAgc2VjdGlvbi5yZWZyZXNoKCk7CiAKLSAgICAgICAgICAgIGlmICh0 aGlzLl9mb2N1c05leHROZXdJbnNwZWN0b3JSdWxlICYmIHN0eWxlLm93bmVyUnVsZSAmJiBzdHls ZS5vd25lclJ1bGUudHlwZSA9PT0gV2ViSW5zcGVjdG9yLkNTU1J1bGUuVHlwZS5JbnNwZWN0b3Ip IHsKKyAgICAgICAgICAgIGlmICh0aGlzLl9mb2N1c05leHROZXdJbnNwZWN0b3JSdWxlICYmIHN0 eWxlLm93bmVyUnVsZSAmJiBzdHlsZS5vd25lclJ1bGUudHlwZSA9PT0gV2ViSW5zcGVjdG9yLkNT U1N0eWxlU2hlZXQuVHlwZS5JbnNwZWN0b3IpIHsKICAgICAgICAgICAgICAgICB0aGlzLl9wcmV2 aW91c0ZvY3VzZWRTZWN0aW9uID0gc2VjdGlvbjsKICAgICAgICAgICAgICAgICBkZWxldGUgdGhp cy5fZm9jdXNOZXh0TmV3SW5zcGVjdG9yUnVsZTsKICAgICAgICAgICAgIH0KQEAgLTI4Miw3ICsy ODIsNyBAQCBXZWJJbnNwZWN0b3IuUnVsZXNTdHlsZURldGFpbHNQYW5lbCA9IGNsYXNzIFJ1bGVz U3R5bGVEZXRhaWxzUGFuZWwgZXh0ZW5kcyBXZWJJbgogICAgICAgICB0aGlzLl9ydWxlTWVkaWFB bmRJbmhlcnRpY2FuY2VMaXN0ID0gW107CiAgICAgICAgIHZhciBvcmRlcmVkU3R5bGVzID0gdW5p cXVlT3JkZXJlZFN0eWxlcyh0aGlzLm5vZGVTdHlsZXMub3JkZXJlZFN0eWxlcyk7CiAgICAgICAg IGZvciAodmFyIHN0eWxlIG9mIG9yZGVyZWRTdHlsZXMpIHsKLSAgICAgICAgICAgIHZhciBpc1Vz ZXJBZ2VudFN0eWxlID0gc3R5bGUub3duZXJSdWxlICYmIHN0eWxlLm93bmVyUnVsZS50eXBlID09 PSBXZWJJbnNwZWN0b3IuQ1NTUnVsZS5UeXBlLlVzZXJBZ2VudDsKKyAgICAgICAgICAgIHZhciBp c1VzZXJBZ2VudFN0eWxlID0gc3R5bGUub3duZXJSdWxlICYmIHN0eWxlLm93bmVyUnVsZS50eXBl ID09PSBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVTaGVldC5UeXBlLlVzZXJBZ2VudDsKICAgICAgICAg ICAgIGluc2VydEFsbE1hdGNoaW5nUHNldWRvU3R5bGVzLmNhbGwodGhpcywgaXNVc2VyQWdlbnRT dHlsZSB8fCBzdHlsZS5pbmVyaGl0ZWQpOwogCiAgICAgICAgICAgICBpbnNlcnRNZWRpYU9ySW5o ZXJpdGFuY2VMYWJlbC5jYWxsKHRoaXMsIHN0eWxlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlU2VsZWN0b3JTZWN0aW9u LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5 bGVTZWxlY3RvclNlY3Rpb24uanMKaW5kZXggYzUwMzllNi4uOTlmYWNjYyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVTZWxl Y3RvclNlY3Rpb24uanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvVmlzdWFsU3R5bGVTZWxlY3RvclNlY3Rpb24uanMKQEAgLTEwMSw3ICsxMDEsNyBAQCBX ZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVTZWxlY3RvclNlY3Rpb24gPSBjbGFzcyBWaXN1YWxTdHls ZVNlbGVjdG9yU2VjdGlvbiBleHRlbgogICAgICAgICAgICAgc2VsZWN0b3IuYWRkRXZlbnRMaXN0 ZW5lcihXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVTZWxlY3RvclRyZWVJdGVtLkV2ZW50LkNoZWNr Ym94Q2hhbmdlZCwgdGhpcy5fdHJlZUVsZW1lbnRDaGVja2JveFRvZ2dsZWQsIHRoaXMpOwogICAg ICAgICAgICAgdGhpcy5fc2VsZWN0b3JzLmFwcGVuZENoaWxkKHNlbGVjdG9yKTsKIAotICAgICAg ICAgICAgaWYgKHRoaXMuX2ZvY3VzTmV4dE5ld0luc3BlY3RvclJ1bGUgJiYgc3R5bGUub3duZXJS dWxlICYmIHN0eWxlLm93bmVyUnVsZS50eXBlID09PSBXZWJJbnNwZWN0b3IuQ1NTUnVsZS5UeXBl Lkluc3BlY3RvcikgeworICAgICAgICAgICAgaWYgKHRoaXMuX2ZvY3VzTmV4dE5ld0luc3BlY3Rv clJ1bGUgJiYgc3R5bGUub3duZXJSdWxlICYmIHN0eWxlLm93bmVyUnVsZS50eXBlID09PSBXZWJJ bnNwZWN0b3IuQ1NTU3R5bGVTaGVldC5UeXBlLkluc3BlY3RvcikgewogICAgICAgICAgICAgICAg IHNlbGVjdG9yLnNlbGVjdCh0cnVlKTsKICAgICAgICAgICAgICAgICBzZWxlY3Rvci5lbGVtZW50 LnNjcm9sbEludG9WaWV3KCk7CiAgICAgICAgICAgICAgICAgdGhpcy5fbm9kZVN0eWxlc1tXZWJJ bnNwZWN0b3IuVmlzdWFsU3R5bGVTZWxlY3RvclNlY3Rpb24uTGFzdFNlbGVjdGVkUnVsZVN5bWJv bF0gPSBzdHlsZTsKQEAgLTE2Niw3ICsxNjYsNyBAQCBXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVT ZWxlY3RvclNlY3Rpb24gPSBjbGFzcyBWaXN1YWxTdHlsZVNlbGVjdG9yU2VjdGlvbiBleHRlbgog CiAgICAgICAgIC8vIE1hdGNoZWQgUnVsZXMKICAgICAgICAgZm9yIChsZXQgcnVsZSBvZiB1bmlx dWVPcmRlcmVkUnVsZXModGhpcy5fbm9kZVN0eWxlcy5tYXRjaGVkUnVsZXMpKSB7Ci0gICAgICAg ICAgICBpZiAocnVsZS50eXBlID09PSBXZWJJbnNwZWN0b3IuQ1NTUnVsZS5UeXBlLlVzZXJBZ2Vu dCkgeworICAgICAgICAgICAgaWYgKHJ1bGUudHlwZSA9PT0gV2ViSW5zcGVjdG9yLkNTU1N0eWxl U2hlZXQuVHlwZS5Vc2VyQWdlbnQpIHsKICAgICAgICAgICAgICAgICBpbnNlcnRBbGxNYXRjaGlu Z1BzZXVkb1J1bGVzLmNhbGwodGhpcywgdHJ1ZSk7CiAgICAgICAgICAgICAgICAgY29udGludWU7 CiAgICAgICAgICAgICB9CkBAIC0xOTAsNyArMTkwLDcgQEAgV2ViSW5zcGVjdG9yLlZpc3VhbFN0 eWxlU2VsZWN0b3JTZWN0aW9uID0gY2xhc3MgVmlzdWFsU3R5bGVTZWxlY3RvclNlY3Rpb24gZXh0 ZW4KICAgICAgICAgICAgIHRoaXMuX3NlbGVjdG9ycy5hcHBlbmRDaGlsZChkaXZpZGVyKTsKIAog ICAgICAgICAgICAgZm9yIChsZXQgcnVsZSBvZiB1bmlxdWVPcmRlcmVkUnVsZXMoaW5oZXJpdGVk Lm1hdGNoZWRSdWxlcykpIHsKLSAgICAgICAgICAgICAgICBpZiAocnVsZS50eXBlID09PSBXZWJJ bnNwZWN0b3IuQ1NTUnVsZS5UeXBlLlVzZXJBZ2VudCkKKyAgICAgICAgICAgICAgICBpZiAocnVs ZS50eXBlID09PSBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVTaGVldC5UeXBlLlVzZXJBZ2VudCkKICAg ICAgICAgICAgICAgICAgICAgY29udGludWU7CiAKICAgICAgICAgICAgICAgICBjcmVhdGVTZWxl Y3Rvckl0ZW0uY2FsbCh0aGlzLCBydWxlLnN0eWxlLCBydWxlLnNlbGVjdG9yVGV4dCwgcnVsZS5t ZWRpYVRleHQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvVmlzdWFsU3R5bGVTZWxlY3RvclRyZWVJdGVtLmpzIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVTZWxlY3RvclRyZWVJdGVtLmpz CmluZGV4IDNmZDE3ODMuLmMwZDkwMzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlU2VsZWN0b3JUcmVlSXRlbS5qcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZVNl bGVjdG9yVHJlZUl0ZW0uanMKQEAgLTM0LDEzICszNCwxMyBAQCBXZWJJbnNwZWN0b3IuVmlzdWFs U3R5bGVTZWxlY3RvclRyZWVJdGVtID0gY2xhc3MgVmlzdWFsU3R5bGVTZWxlY3RvclRyZWVJdGVt IGV4dAogCiAgICAgICAgICAgICBpZiAoc3R5bGUuaW5oZXJpdGVkKQogICAgICAgICAgICAgICAg IGljb25DbGFzc05hbWUgPSBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24u SW5oZXJpdGVkU3R5bGVSdWxlSWNvblN0eWxlQ2xhc3NOYW1lOwotICAgICAgICAgICAgZWxzZSBp ZiAoc3R5bGUub3duZXJSdWxlLnR5cGUgPT09IFdlYkluc3BlY3Rvci5DU1NSdWxlLlR5cGUuQXV0 aG9yKQorICAgICAgICAgICAgZWxzZSBpZiAoc3R5bGUub3duZXJSdWxlLnR5cGUgPT09IFdlYklu c3BlY3Rvci5DU1NTdHlsZVNoZWV0LlR5cGUuQXV0aG9yKQogICAgICAgICAgICAgICAgIGljb25D bGFzc05hbWUgPSBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24uQXV0aG9y U3R5bGVSdWxlSWNvblN0eWxlQ2xhc3NOYW1lOwotICAgICAgICAgICAgZWxzZSBpZiAoc3R5bGUu b3duZXJSdWxlLnR5cGUgPT09IFdlYkluc3BlY3Rvci5DU1NSdWxlLlR5cGUuVXNlcikKKyAgICAg ICAgICAgIGVsc2UgaWYgKHN0eWxlLm93bmVyUnVsZS50eXBlID09PSBXZWJJbnNwZWN0b3IuQ1NT U3R5bGVTaGVldC5UeXBlLlVzZXIpCiAgICAgICAgICAgICAgICAgaWNvbkNsYXNzTmFtZSA9IFdl Ykluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uU2VjdGlvbi5Vc2VyU3R5bGVSdWxlSWNvblN0 eWxlQ2xhc3NOYW1lOwotICAgICAgICAgICAgZWxzZSBpZiAoc3R5bGUub3duZXJSdWxlLnR5cGUg PT09IFdlYkluc3BlY3Rvci5DU1NSdWxlLlR5cGUuVXNlckFnZW50KQorICAgICAgICAgICAgZWxz ZSBpZiAoc3R5bGUub3duZXJSdWxlLnR5cGUgPT09IFdlYkluc3BlY3Rvci5DU1NTdHlsZVNoZWV0 LlR5cGUuVXNlckFnZW50KQogICAgICAgICAgICAgICAgIGljb25DbGFzc05hbWUgPSBXZWJJbnNw ZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24uVXNlckFnZW50U3R5bGVSdWxlSWNvblN0 eWxlQ2xhc3NOYW1lOwotICAgICAgICAgICAgZWxzZSBpZiAoc3R5bGUub3duZXJSdWxlLnR5cGUg PT09IFdlYkluc3BlY3Rvci5DU1NSdWxlLlR5cGUuSW5zcGVjdG9yKQorICAgICAgICAgICAgZWxz ZSBpZiAoc3R5bGUub3duZXJSdWxlLnR5cGUgPT09IFdlYkluc3BlY3Rvci5DU1NTdHlsZVNoZWV0 LlR5cGUuSW5zcGVjdG9yKQogICAgICAgICAgICAgICAgIGljb25DbGFzc05hbWUgPSBXZWJJbnNw ZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24uSW5zcGVjdG9yU3R5bGVSdWxlSWNvblN0 eWxlQ2xhc3NOYW1lOwogICAgICAgICAgICAgYnJlYWs7CiAK