73323 2011-11-29 07:54:03 -0800 Web Inspector: [refactoring] do not clone nodes that contain linkified URLs 2011-11-30 08:02:51 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 caseq caseq apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 510767 0 caseq 2011-11-29 07:54:03 -0800 Avoid cloning nodes containing linkified URLs in StylesSidebatrPane. This is an intermediate step to use JS properties instead of "preferred_panel" and "line_number" attributes on linkified URLs. 510770 1 116970 caseq 2011-11-29 07:56:31 -0800 Created attachment 116970 Patch 510773 2 116970 apavlov 2011-11-29 08:04:53 -0800 Comment on attachment 116970 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=116970&action=review Looks good > Source/WebCore/inspector/front-end/StylesSidebarPane.js:1132 > + this.identifier = identifier ; at the end lost 510774 3 116971 caseq 2011-11-29 08:06:32 -0800 Created attachment 116971 Patch 510779 4 116970 pfeldman 2011-11-29 08:09:33 -0800 Comment on attachment 116970 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=116970&action=review > Source/WebCore/inspector/front-end/StylesSidebarPane.js:-925 > - function linkifyUncopyable(url, line) Lets fix linkify uncopyable first. 510805 5 116977 caseq 2011-11-29 08:46:30 -0800 Created attachment 116977 Patch 510971 6 116970 pfeldman 2011-11-29 11:57:33 -0800 Comment on attachment 116970 Patch Cleaning r? that I have set accidentally. 511528 7 116977 pfeldman 2011-11-30 01:52:25 -0800 Comment on attachment 116977 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=116977&action=review > Source/WebCore/inspector/front-end/StylesSidebarPane.js:-935 > - if (this.styleRule.sourceURL) Is there a reason behind the change of behavior? > Source/WebCore/inspector/front-end/StylesSidebarPane.js:1124 > + _updateRuleOrigin: function(text) You don't need to update the origin. Extracting a method that would create a DOM elements link for given section is sufficient for getting rid of the clone. 511719 8 117186 caseq 2011-11-30 07:03:59 -0800 Created attachment 117186 Patch 511723 9 117188 caseq 2011-11-30 07:14:12 -0800 Created attachment 117188 Patch 511726 10 caseq 2011-11-30 07:15:56 -0800 - dropped StylePropertiesSection.identifier - dropped updateOrigintText() - dropped url extraction from styleRule.rule 511751 11 caseq 2011-11-30 08:02:51 -0800 Committed r101518: <http://trac.webkit.org/changeset/101518> 116970 2011-11-29 07:56:31 -0800 2011-11-29 11:57:33 -0800 Patch bug-73323-20111129195629.patch text/plain 7249 caseq U3VidmVyc2lvbiBSZXZpc2lvbjogMTAxMzY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTQyMGI0ZTczYmIwYTIz MGFlNTE3N2M2MmNkOTY4ZmJkZjUzNjNhOC4uZGYzYjE2OWE5Y2FhOWI2NjZjMjIxZmZiNWU1Yjk1 M2YwYWFkNWJjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIzIEBACiAyMDExLTExLTI5ICBBbmRy ZXkgS29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogW3JlZmFjdG9yaW5nXSBkbyBub3QgY2xvbmUgbm9kZXMgdGhhdCBjb250YWluIGxpbmtpZmll ZCBVUkxzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03 MzMyMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5TdHlsZVByb3BlcnRpZXNTZWN0aW9uKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5T dHlsZVByb3BlcnRpZXNTZWN0aW9uLnByb3RvdHlwZS5fdXBkYXRlUnVsZU9yaWdpbik6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbi5wcm90b3R5cGUuX2NyZWF0 ZVJ1bGVPcmlnaW5Ob2RlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnRpZXNT ZWN0aW9uLnByb3RvdHlwZS5lZGl0aW5nU2VsZWN0b3JDb21taXR0ZWQuc3VjY2Vzc0NhbGxiYWNr KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnRpZXNTZWN0aW9uLnByb3RvdHlw ZS5lZGl0aW5nU2VsZWN0b3JDb21taXR0ZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbXB1 dGVkU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbi5wcm90b3R5cGUucmVidWlsZENvbXB1dGVkVHJhY2Up OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkJsYW5rU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbi5wcm90 b3R5cGUuZWRpdGluZ1NlbGVjdG9yQ29tbWl0dGVkLnN1Y2Nlc3NDYWxsYmFjayk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuQmxhbmtTdHlsZVByb3BlcnRpZXNTZWN0aW9uLnByb3RvdHlwZS5lZGl0 aW5nU2VsZWN0b3JDb21taXR0ZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkJsYW5rU3R5bGVQ cm9wZXJ0aWVzU2VjdGlvbi5wcm90b3R5cGUuX21ha2VOb3JtYWwpOgorCisyMDExLTExLTI5ICBB bmRyZXkgS29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgV2ViIEluc3Bl Y3RvcjogcmVtb3ZlIHVzYWdlIG9mIGlubmVySFRNTCBmcm9tIGluc3BlY3RvciBmcm9udC1lbmQK ICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTczMzA1CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lk ZWJhclBhbmUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1Np ZGViYXJQYW5lLmpzCmluZGV4IDQwNmVmM2U0YmFkZDI5OTVmNGRmYzEzYTZjNTZjY2RkYWIxOTE3 ZjEuLmZmODRkZjZiOTVmNmUyNjI3MjZkOGQyYWQ4M2Y5MGRkNzUwODUxZTcgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lkZWJhclBhbmUuanMK KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFu ZS5qcwpAQCAtOTIyLDMyICs5MjIsMTggQEAgV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydGllc1Nl Y3Rpb24gPSBmdW5jdGlvbihwYXJlbnRQYW5lLCBzdHlsZVJ1bGUsIGVkaXRhYmxlLAogICAgIGlm ICh0aGlzLnJ1bGUpCiAgICAgICAgIHRoaXMudGl0bGVFbGVtZW50LmFkZFN0eWxlQ2xhc3MoInN0 eWxlcy1zZWxlY3RvciIpOwogCi0gICAgZnVuY3Rpb24gbGlua2lmeVVuY29weWFibGUodXJsLCBs aW5lKQotICAgIHsKLSAgICAgICAgdmFyIGxpbmsgPSBXZWJJbnNwZWN0b3IubGlua2lmeVJlc291 cmNlQXNOb2RlKHVybCwgbGluZSk7Ci0gICAgICAgIHJldHVybiBsaW5rOwotICAgIH0KLQogICAg IHRoaXMuX3NlbGVjdG9yUmVmRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIp OwogICAgIHRoaXMuX3NlbGVjdG9yUmVmRWxlbWVudC5jbGFzc05hbWUgPSAic3VidGl0bGUiOwog Ci0gICAgdmFyIHN1YnRpdGxlID0gIiI7Ci0gICAgaWYgKHRoaXMuc3R5bGVSdWxlLnNvdXJjZVVS TCkKLSAgICAgICAgdGhpcy5fc2VsZWN0b3JSZWZFbGVtZW50LmFwcGVuZENoaWxkKGxpbmtpZnlV bmNvcHlhYmxlKHRoaXMuc3R5bGVSdWxlLnNvdXJjZVVSTCwgdGhpcy5ydWxlLnNvdXJjZUxpbmUp KTsKLSAgICBlbHNlIGlmIChpc1VzZXJBZ2VudCkKLSAgICAgICAgc3VidGl0bGUgPSBXZWJJbnNw ZWN0b3IuVUlTdHJpbmcoInVzZXIgYWdlbnQgc3R5bGVzaGVldCIpOworICAgIHZhciBvcmlnaW4g PSAiIjsKKyAgICBpZiAoaXNVc2VyQWdlbnQpCisgICAgICAgIG9yaWdpbiA9IFdlYkluc3BlY3Rv ci5VSVN0cmluZygidXNlciBhZ2VudCBzdHlsZXNoZWV0Iik7CiAgICAgZWxzZSBpZiAoaXNVc2Vy KQotICAgICAgICBzdWJ0aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygidXNlciBzdHlsZXNo ZWV0Iik7CisgICAgICAgIG9yaWdpbiA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygidXNlciBzdHls ZXNoZWV0Iik7CiAgICAgZWxzZSBpZiAoaXNWaWFJbnNwZWN0b3IpCi0gICAgICAgIHN1YnRpdGxl ID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJ2aWEgaW5zcGVjdG9yIik7Ci0gICAgZWxzZSBpZiAo dGhpcy5ydWxlICYmIHRoaXMucnVsZS5zb3VyY2VVUkwpCi0gICAgICAgIHRoaXMuX3NlbGVjdG9y UmVmRWxlbWVudC5hcHBlbmRDaGlsZChsaW5raWZ5VW5jb3B5YWJsZSh0aGlzLnJ1bGUuc291cmNl VVJMLCB0aGlzLnJ1bGUuc291cmNlTGluZSkpOwotCi0gICAgdGhpcy5pZGVudGlmaWVyID0gc3R5 bGVSdWxlLnNlbGVjdG9yVGV4dDsKLSAgICBpZiAoc3VidGl0bGUpIHsKLSAgICAgICAgdGhpcy5f c2VsZWN0b3JSZWZFbGVtZW50LnRleHRDb250ZW50ID0gc3VidGl0bGU7Ci0gICAgICAgIHRoaXMu aWRlbnRpZmllciArPSAiOiIgKyBzdWJ0aXRsZTsKLSAgICB9CisgICAgICAgIG9yaWdpbiA9IFdl Ykluc3BlY3Rvci5VSVN0cmluZygidmlhIGluc3BlY3RvciIpOworCisgICAgdGhpcy5fdXBkYXRl UnVsZU9yaWdpbihvcmlnaW4pOwogCiAgICAgc2VsZWN0b3JDb250YWluZXIuYXBwZW5kQ2hpbGQo dGhpcy5fc2VsZWN0b3JSZWZFbGVtZW50KTsKICAgICB0aGlzLnRpdGxlRWxlbWVudC5hcHBlbmRD aGlsZChzZWxlY3RvckNvbnRhaW5lcik7CkBAIC0xMTM1LDYgKzExMjEsMjYgQEAgV2ViSW5zcGVj dG9yLlN0eWxlUHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4g aXRlbTsKICAgICB9LAogCisgICAgX3VwZGF0ZVJ1bGVPcmlnaW46IGZ1bmN0aW9uKHRleHQpCisg ICAgeworICAgICAgICB0aGlzLl9ydWxlT3JpZ2luVGV4dCA9IHRleHQ7CisgICAgICAgIHRoaXMu X3NlbGVjdG9yUmVmRWxlbWVudC5yZW1vdmVDaGlsZHJlbigpOworICAgICAgICB0aGlzLl9zZWxl Y3RvclJlZkVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fY3JlYXRlUnVsZU9yaWdpbk5vZGUoKSk7 CisgICAgICAgIHZhciBpZGVudGlmaWVyID0gdGhpcy5zdHlsZVJ1bGUuc2VsZWN0b3JUZXh0Owor ICAgICAgICBpZiAodGV4dCkKKyAgICAgICAgICAgIGlkZW50aWZpZXIgKz0gIjoiICsgdGV4dDsK KyAgICAgICAgdGhpcy5pZGVudGlmaWVyID0gaWRlbnRpZmllcgorICAgIH0sCisKKyAgICBfY3Jl YXRlUnVsZU9yaWdpbk5vZGU6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIGlmICh0aGlzLnN0 eWxlUnVsZS5zb3VyY2VVUkwpCisgICAgICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLmxpbmtp ZnlSZXNvdXJjZUFzTm9kZSh0aGlzLnN0eWxlUnVsZS5zb3VyY2VVUkwsIHRoaXMucnVsZS5zb3Vy Y2VMaW5lKTsKKyAgICAgICAgZWxzZSBpZiAodGhpcy5ydWxlICYmIHRoaXMucnVsZS5zb3VyY2VV UkwpCisgICAgICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLmxpbmtpZnlSZXNvdXJjZUFzTm9k ZSh0aGlzLnJ1bGUuc291cmNlVVJMLCB0aGlzLnJ1bGUuc291cmNlTGluZSk7CisgICAgICAgIHJl dHVybiBkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZSh0aGlzLl9ydWxlT3JpZ2luVGV4dCk7CisgICAg fSwKKwogICAgIF9kZWJ1Z1Nob3dTdHlsZTogZnVuY3Rpb24oZXZlbnQpCiAgICAgewogICAgICAg ICB2YXIgYm91bmRIYW5kbGVyOwpAQCAtMTI2MCw5ICsxMjY2LDcgQEAgV2ViSW5zcGVjdG9yLlN0 eWxlUHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlID0gewogICAgICAgICAgICAgdGhpcy5ydWxl ID0gbmV3UnVsZTsKICAgICAgICAgICAgIHRoaXMuc3R5bGVSdWxlID0geyBzZWN0aW9uOiB0aGlz LCBzdHlsZTogbmV3UnVsZS5zdHlsZSwgc2VsZWN0b3JUZXh0OiBuZXdSdWxlLnNlbGVjdG9yVGV4 dCwgbWVkaWE6IG5ld1J1bGUubWVkaWEsIHNvdXJjZVVSTDogbmV3UnVsZS5zb3VyY2VVUkwsIHJ1 bGU6IG5ld1J1bGUgfTsKIAotICAgICAgICAgICAgdmFyIG9sZElkZW50aWZpZXIgPSB0aGlzLmlk ZW50aWZpZXI7Ci0gICAgICAgICAgICB0aGlzLmlkZW50aWZpZXIgPSBuZXdSdWxlLnNlbGVjdG9y VGV4dCArICI6IiArIHRoaXMuX3NlbGVjdG9yUmVmRWxlbWVudC50ZXh0Q29udGVudDsKLQorICAg ICAgICAgICAgdGhpcy5fdXBkYXRlUnVsZU9yaWdpbih0aGlzLl9ydWxlT3JpZ2luVGV4dCk7CiAg ICAgICAgICAgICB0aGlzLnBhbmUudXBkYXRlKCk7CiAKICAgICAgICAgICAgIHRoaXMuX21vdmVF ZGl0b3JGcm9tU2VsZWN0b3IobW92ZURpcmVjdGlvbik7CkBAIC0xMzY4LDkgKzEzNzIsNyBAQCBX ZWJJbnNwZWN0b3IuQ29tcHV0ZWRTdHlsZVByb3BlcnRpZXNTZWN0aW9uLnByb3RvdHlwZSA9IHsK ICAgICAgICAgICAgICAgICAgICAgZnJhZ21lbnQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRl VGV4dE5vZGUoIiAtICIgKyBwcm9wZXJ0eS52YWx1ZSArICIgIikpOwogICAgICAgICAgICAgICAg ICAgICB2YXIgc3VidGl0bGUgPSBmcmFnbWVudC5jcmVhdGVDaGlsZCgic3BhbiIpOwogICAgICAg ICAgICAgICAgICAgICBzdWJ0aXRsZS5zdHlsZS5mbG9hdCA9ICJyaWdodCI7Ci0gICAgICAgICAg ICAgICAgICAgIHZhciBzZWxlY3RvclJlZiA9IHNlY3Rpb24uX3NlbGVjdG9yUmVmRWxlbWVudC5j bG9uZU5vZGUodHJ1ZSk7Ci0gICAgICAgICAgICAgICAgICAgIGZvciAodmFyIG4gPSAwOyBuIDwg c2VsZWN0b3JSZWYuY2hpbGROb2Rlcy5sZW5ndGg7ICsrbikKLSAgICAgICAgICAgICAgICAgICAg ICAgIHN1YnRpdGxlLmFwcGVuZENoaWxkKHNlbGVjdG9yUmVmLmNoaWxkTm9kZXNbbl0pOworICAg ICAgICAgICAgICAgICAgICBzdWJ0aXRsZS5hcHBlbmRDaGlsZChzZWN0aW9uLl9jcmVhdGVSdWxl T3JpZ2luTm9kZSgpKTsKICAgICAgICAgICAgICAgICAgICAgdmFyIGNoaWxkRWxlbWVudCA9IG5l dyBUcmVlRWxlbWVudChmcmFnbWVudCwgbnVsbCwgZmFsc2UpOwogICAgICAgICAgICAgICAgICAg ICB0cmVlRWxlbWVudC5hcHBlbmRDaGlsZChjaGlsZEVsZW1lbnQpOwogICAgICAgICAgICAgICAg ICAgICBpZiAoc2VjdGlvbi5pc1Byb3BlcnR5T3ZlcmxvYWRlZChwcm9wZXJ0eS5uYW1lKSkKQEAg LTE0MjMsMTQgKzE0MjUsMTMgQEAgV2ViSW5zcGVjdG9yLkJsYW5rU3R5bGVQcm9wZXJ0aWVzU2Vj dGlvbi5wcm90b3R5cGUgPSB7CiAgICAgICAgIGZ1bmN0aW9uIHN1Y2Nlc3NDYWxsYmFjayhuZXdS dWxlLCBkb2VzU2VsZWN0b3JBZmZlY3RTZWxlY3RlZE5vZGUpCiAgICAgICAgIHsKICAgICAgICAg ICAgIHZhciBzdHlsZVJ1bGUgPSB7IHNlY3Rpb246IHRoaXMsIHN0eWxlOiBuZXdSdWxlLnN0eWxl LCBzZWxlY3RvclRleHQ6IG5ld1J1bGUuc2VsZWN0b3JUZXh0LCBzb3VyY2VVUkw6IG5ld1J1bGUu c291cmNlVVJMLCBydWxlOiBuZXdSdWxlIH07Ci0gICAgICAgICAgICB0aGlzLm1ha2VOb3JtYWwo c3R5bGVSdWxlKTsKKyAgICAgICAgICAgIHRoaXMuX21ha2VOb3JtYWwoc3R5bGVSdWxlKTsKIAog ICAgICAgICAgICAgaWYgKCFkb2VzU2VsZWN0b3JBZmZlY3RTZWxlY3RlZE5vZGUpIHsKICAgICAg ICAgICAgICAgICB0aGlzLm5vQWZmZWN0ID0gdHJ1ZTsKICAgICAgICAgICAgICAgICB0aGlzLmVs ZW1lbnQuYWRkU3R5bGVDbGFzcygibm8tYWZmZWN0Iik7CiAgICAgICAgICAgICB9CiAKLSAgICAg ICAgICAgIHRoaXMuX3NlbGVjdG9yUmVmRWxlbWVudC50ZXh0Q29udGVudCA9IFdlYkluc3BlY3Rv ci5VSVN0cmluZygidmlhIGluc3BlY3RvciIpOwogICAgICAgICAgICAgdGhpcy5leHBhbmQoKTsK ICAgICAgICAgICAgIGlmICh0aGlzLmVsZW1lbnQucGFyZW50RWxlbWVudCkgLy8gTWlnaHQgaGF2 ZSBiZWVuIGRldGFjaGVkIGFscmVhZHkuCiAgICAgICAgICAgICAgICAgdGhpcy5fbW92ZUVkaXRv ckZyb21TZWxlY3Rvcihtb3ZlRGlyZWN0aW9uKTsKQEAgLTE0NDksMTIgKzE0NTAsMTIgQEAgV2Vi SW5zcGVjdG9yLkJsYW5rU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbi5wcm90b3R5cGUgPSB7CiAgICAg ICAgIHRoaXMucGFuZS5yZW1vdmVTZWN0aW9uKHRoaXMpOwogICAgIH0sCiAKLSAgICBtYWtlTm9y bWFsOiBmdW5jdGlvbihzdHlsZVJ1bGUpCisgICAgX21ha2VOb3JtYWw6IGZ1bmN0aW9uKHN0eWxl UnVsZSkKICAgICB7CiAgICAgICAgIHRoaXMuZWxlbWVudC5yZW1vdmVTdHlsZUNsYXNzKCJibGFu ay1zZWN0aW9uIik7CiAgICAgICAgIHRoaXMuc3R5bGVSdWxlID0gc3R5bGVSdWxlOwogICAgICAg ICB0aGlzLnJ1bGUgPSBzdHlsZVJ1bGUucnVsZTsKLSAgICAgICAgdGhpcy5pZGVudGlmaWVyID0g c3R5bGVSdWxlLnNlbGVjdG9yVGV4dCArICI6dmlhIGluc3BlY3RvciI7CisgICAgICAgIHRoaXMu X3VwZGF0ZVJ1bGVPcmlnaW4oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJ2aWEgaW5zcGVjdG9yIikp OwogCiAgICAgICAgIC8vIEZJWE1FOiByZXBsYWNlIHRoaXMgaW5zdGFuY2UgYnkgYSBub3JtYWwg V2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydGllc1NlY3Rpb24uCiAgICAgICAgIHRoaXMuX25vcm1h bCA9IHRydWU7Cg== 116971 2011-11-29 08:06:32 -0800 2011-11-29 08:46:22 -0800 Patch bug-73323-20111129200630.patch text/plain 7250 caseq U3VidmVyc2lvbiBSZXZpc2lvbjogMTAxMzY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTQyMGI0ZTczYmIwYTIz MGFlNTE3N2M2MmNkOTY4ZmJkZjUzNjNhOC4uZGYzYjE2OWE5Y2FhOWI2NjZjMjIxZmZiNWU1Yjk1 M2YwYWFkNWJjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIzIEBACiAyMDExLTExLTI5ICBBbmRy ZXkgS29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogW3JlZmFjdG9yaW5nXSBkbyBub3QgY2xvbmUgbm9kZXMgdGhhdCBjb250YWluIGxpbmtpZmll ZCBVUkxzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03 MzMyMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5TdHlsZVByb3BlcnRpZXNTZWN0aW9uKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5T dHlsZVByb3BlcnRpZXNTZWN0aW9uLnByb3RvdHlwZS5fdXBkYXRlUnVsZU9yaWdpbik6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbi5wcm90b3R5cGUuX2NyZWF0 ZVJ1bGVPcmlnaW5Ob2RlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnRpZXNT ZWN0aW9uLnByb3RvdHlwZS5lZGl0aW5nU2VsZWN0b3JDb21taXR0ZWQuc3VjY2Vzc0NhbGxiYWNr KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnRpZXNTZWN0aW9uLnByb3RvdHlw ZS5lZGl0aW5nU2VsZWN0b3JDb21taXR0ZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbXB1 dGVkU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbi5wcm90b3R5cGUucmVidWlsZENvbXB1dGVkVHJhY2Up OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkJsYW5rU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbi5wcm90 b3R5cGUuZWRpdGluZ1NlbGVjdG9yQ29tbWl0dGVkLnN1Y2Nlc3NDYWxsYmFjayk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuQmxhbmtTdHlsZVByb3BlcnRpZXNTZWN0aW9uLnByb3RvdHlwZS5lZGl0 aW5nU2VsZWN0b3JDb21taXR0ZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkJsYW5rU3R5bGVQ cm9wZXJ0aWVzU2VjdGlvbi5wcm90b3R5cGUuX21ha2VOb3JtYWwpOgorCisyMDExLTExLTI5ICBB bmRyZXkgS29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgV2ViIEluc3Bl Y3RvcjogcmVtb3ZlIHVzYWdlIG9mIGlubmVySFRNTCBmcm9tIGluc3BlY3RvciBmcm9udC1lbmQK ICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTczMzA1CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lk ZWJhclBhbmUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1Np ZGViYXJQYW5lLmpzCmluZGV4IDQwNmVmM2U0YmFkZDI5OTVmNGRmYzEzYTZjNTZjY2RkYWIxOTE3 ZjEuLjY1Y2ZmYzU4NjllOTgxZWE0MmM5YzA3NTJhYTVkNWM3MjY3YmNkZjAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lkZWJhclBhbmUuanMK KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFu ZS5qcwpAQCAtOTIyLDMyICs5MjIsMTggQEAgV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydGllc1Nl Y3Rpb24gPSBmdW5jdGlvbihwYXJlbnRQYW5lLCBzdHlsZVJ1bGUsIGVkaXRhYmxlLAogICAgIGlm ICh0aGlzLnJ1bGUpCiAgICAgICAgIHRoaXMudGl0bGVFbGVtZW50LmFkZFN0eWxlQ2xhc3MoInN0 eWxlcy1zZWxlY3RvciIpOwogCi0gICAgZnVuY3Rpb24gbGlua2lmeVVuY29weWFibGUodXJsLCBs aW5lKQotICAgIHsKLSAgICAgICAgdmFyIGxpbmsgPSBXZWJJbnNwZWN0b3IubGlua2lmeVJlc291 cmNlQXNOb2RlKHVybCwgbGluZSk7Ci0gICAgICAgIHJldHVybiBsaW5rOwotICAgIH0KLQogICAg IHRoaXMuX3NlbGVjdG9yUmVmRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIp OwogICAgIHRoaXMuX3NlbGVjdG9yUmVmRWxlbWVudC5jbGFzc05hbWUgPSAic3VidGl0bGUiOwog Ci0gICAgdmFyIHN1YnRpdGxlID0gIiI7Ci0gICAgaWYgKHRoaXMuc3R5bGVSdWxlLnNvdXJjZVVS TCkKLSAgICAgICAgdGhpcy5fc2VsZWN0b3JSZWZFbGVtZW50LmFwcGVuZENoaWxkKGxpbmtpZnlV bmNvcHlhYmxlKHRoaXMuc3R5bGVSdWxlLnNvdXJjZVVSTCwgdGhpcy5ydWxlLnNvdXJjZUxpbmUp KTsKLSAgICBlbHNlIGlmIChpc1VzZXJBZ2VudCkKLSAgICAgICAgc3VidGl0bGUgPSBXZWJJbnNw ZWN0b3IuVUlTdHJpbmcoInVzZXIgYWdlbnQgc3R5bGVzaGVldCIpOworICAgIHZhciBvcmlnaW4g PSAiIjsKKyAgICBpZiAoaXNVc2VyQWdlbnQpCisgICAgICAgIG9yaWdpbiA9IFdlYkluc3BlY3Rv ci5VSVN0cmluZygidXNlciBhZ2VudCBzdHlsZXNoZWV0Iik7CiAgICAgZWxzZSBpZiAoaXNVc2Vy KQotICAgICAgICBzdWJ0aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygidXNlciBzdHlsZXNo ZWV0Iik7CisgICAgICAgIG9yaWdpbiA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygidXNlciBzdHls ZXNoZWV0Iik7CiAgICAgZWxzZSBpZiAoaXNWaWFJbnNwZWN0b3IpCi0gICAgICAgIHN1YnRpdGxl ID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJ2aWEgaW5zcGVjdG9yIik7Ci0gICAgZWxzZSBpZiAo dGhpcy5ydWxlICYmIHRoaXMucnVsZS5zb3VyY2VVUkwpCi0gICAgICAgIHRoaXMuX3NlbGVjdG9y UmVmRWxlbWVudC5hcHBlbmRDaGlsZChsaW5raWZ5VW5jb3B5YWJsZSh0aGlzLnJ1bGUuc291cmNl VVJMLCB0aGlzLnJ1bGUuc291cmNlTGluZSkpOwotCi0gICAgdGhpcy5pZGVudGlmaWVyID0gc3R5 bGVSdWxlLnNlbGVjdG9yVGV4dDsKLSAgICBpZiAoc3VidGl0bGUpIHsKLSAgICAgICAgdGhpcy5f c2VsZWN0b3JSZWZFbGVtZW50LnRleHRDb250ZW50ID0gc3VidGl0bGU7Ci0gICAgICAgIHRoaXMu aWRlbnRpZmllciArPSAiOiIgKyBzdWJ0aXRsZTsKLSAgICB9CisgICAgICAgIG9yaWdpbiA9IFdl Ykluc3BlY3Rvci5VSVN0cmluZygidmlhIGluc3BlY3RvciIpOworCisgICAgdGhpcy5fdXBkYXRl UnVsZU9yaWdpbihvcmlnaW4pOwogCiAgICAgc2VsZWN0b3JDb250YWluZXIuYXBwZW5kQ2hpbGQo dGhpcy5fc2VsZWN0b3JSZWZFbGVtZW50KTsKICAgICB0aGlzLnRpdGxlRWxlbWVudC5hcHBlbmRD aGlsZChzZWxlY3RvckNvbnRhaW5lcik7CkBAIC0xMTM1LDYgKzExMjEsMjYgQEAgV2ViSW5zcGVj dG9yLlN0eWxlUHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4g aXRlbTsKICAgICB9LAogCisgICAgX3VwZGF0ZVJ1bGVPcmlnaW46IGZ1bmN0aW9uKHRleHQpCisg ICAgeworICAgICAgICB0aGlzLl9ydWxlT3JpZ2luVGV4dCA9IHRleHQ7CisgICAgICAgIHRoaXMu X3NlbGVjdG9yUmVmRWxlbWVudC5yZW1vdmVDaGlsZHJlbigpOworICAgICAgICB0aGlzLl9zZWxl Y3RvclJlZkVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fY3JlYXRlUnVsZU9yaWdpbk5vZGUoKSk7 CisgICAgICAgIHZhciBpZGVudGlmaWVyID0gdGhpcy5zdHlsZVJ1bGUuc2VsZWN0b3JUZXh0Owor ICAgICAgICBpZiAodGV4dCkKKyAgICAgICAgICAgIGlkZW50aWZpZXIgKz0gIjoiICsgdGV4dDsK KyAgICAgICAgdGhpcy5pZGVudGlmaWVyID0gaWRlbnRpZmllcjsKKyAgICB9LAorCisgICAgX2Ny ZWF0ZVJ1bGVPcmlnaW5Ob2RlOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICBpZiAodGhpcy5z dHlsZVJ1bGUuc291cmNlVVJMKQorICAgICAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5saW5r aWZ5UmVzb3VyY2VBc05vZGUodGhpcy5zdHlsZVJ1bGUuc291cmNlVVJMLCB0aGlzLnJ1bGUuc291 cmNlTGluZSk7CisgICAgICAgIGVsc2UgaWYgKHRoaXMucnVsZSAmJiB0aGlzLnJ1bGUuc291cmNl VVJMKQorICAgICAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5saW5raWZ5UmVzb3VyY2VBc05v ZGUodGhpcy5ydWxlLnNvdXJjZVVSTCwgdGhpcy5ydWxlLnNvdXJjZUxpbmUpOworICAgICAgICBy ZXR1cm4gZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUodGhpcy5fcnVsZU9yaWdpblRleHQpOworICAg IH0sCisKICAgICBfZGVidWdTaG93U3R5bGU6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKICAgICAg ICAgdmFyIGJvdW5kSGFuZGxlcjsKQEAgLTEyNjAsOSArMTI2Niw3IEBAIFdlYkluc3BlY3Rvci5T dHlsZVByb3BlcnRpZXNTZWN0aW9uLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHRoaXMucnVs ZSA9IG5ld1J1bGU7CiAgICAgICAgICAgICB0aGlzLnN0eWxlUnVsZSA9IHsgc2VjdGlvbjogdGhp cywgc3R5bGU6IG5ld1J1bGUuc3R5bGUsIHNlbGVjdG9yVGV4dDogbmV3UnVsZS5zZWxlY3RvclRl eHQsIG1lZGlhOiBuZXdSdWxlLm1lZGlhLCBzb3VyY2VVUkw6IG5ld1J1bGUuc291cmNlVVJMLCBy dWxlOiBuZXdSdWxlIH07CiAKLSAgICAgICAgICAgIHZhciBvbGRJZGVudGlmaWVyID0gdGhpcy5p ZGVudGlmaWVyOwotICAgICAgICAgICAgdGhpcy5pZGVudGlmaWVyID0gbmV3UnVsZS5zZWxlY3Rv clRleHQgKyAiOiIgKyB0aGlzLl9zZWxlY3RvclJlZkVsZW1lbnQudGV4dENvbnRlbnQ7Ci0KKyAg ICAgICAgICAgIHRoaXMuX3VwZGF0ZVJ1bGVPcmlnaW4odGhpcy5fcnVsZU9yaWdpblRleHQpOwog ICAgICAgICAgICAgdGhpcy5wYW5lLnVwZGF0ZSgpOwogCiAgICAgICAgICAgICB0aGlzLl9tb3Zl RWRpdG9yRnJvbVNlbGVjdG9yKG1vdmVEaXJlY3Rpb24pOwpAQCAtMTM2OCw5ICsxMzcyLDcgQEAg V2ViSW5zcGVjdG9yLkNvbXB1dGVkU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbi5wcm90b3R5cGUgPSB7 CiAgICAgICAgICAgICAgICAgICAgIGZyYWdtZW50LmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0 ZVRleHROb2RlKCIgLSAiICsgcHJvcGVydHkudmFsdWUgKyAiICIpKTsKICAgICAgICAgICAgICAg ICAgICAgdmFyIHN1YnRpdGxlID0gZnJhZ21lbnQuY3JlYXRlQ2hpbGQoInNwYW4iKTsKICAgICAg ICAgICAgICAgICAgICAgc3VidGl0bGUuc3R5bGUuZmxvYXQgPSAicmlnaHQiOwotICAgICAgICAg ICAgICAgICAgICB2YXIgc2VsZWN0b3JSZWYgPSBzZWN0aW9uLl9zZWxlY3RvclJlZkVsZW1lbnQu Y2xvbmVOb2RlKHRydWUpOwotICAgICAgICAgICAgICAgICAgICBmb3IgKHZhciBuID0gMDsgbiA8 IHNlbGVjdG9yUmVmLmNoaWxkTm9kZXMubGVuZ3RoOyArK24pCi0gICAgICAgICAgICAgICAgICAg ICAgICBzdWJ0aXRsZS5hcHBlbmRDaGlsZChzZWxlY3RvclJlZi5jaGlsZE5vZGVzW25dKTsKKyAg ICAgICAgICAgICAgICAgICAgc3VidGl0bGUuYXBwZW5kQ2hpbGQoc2VjdGlvbi5fY3JlYXRlUnVs ZU9yaWdpbk5vZGUoKSk7CiAgICAgICAgICAgICAgICAgICAgIHZhciBjaGlsZEVsZW1lbnQgPSBu ZXcgVHJlZUVsZW1lbnQoZnJhZ21lbnQsIG51bGwsIGZhbHNlKTsKICAgICAgICAgICAgICAgICAg ICAgdHJlZUVsZW1lbnQuYXBwZW5kQ2hpbGQoY2hpbGRFbGVtZW50KTsKICAgICAgICAgICAgICAg ICAgICAgaWYgKHNlY3Rpb24uaXNQcm9wZXJ0eU92ZXJsb2FkZWQocHJvcGVydHkubmFtZSkpCkBA IC0xNDIzLDE0ICsxNDI1LDEzIEBAIFdlYkluc3BlY3Rvci5CbGFua1N0eWxlUHJvcGVydGllc1Nl Y3Rpb24ucHJvdG90eXBlID0gewogICAgICAgICBmdW5jdGlvbiBzdWNjZXNzQ2FsbGJhY2sobmV3 UnVsZSwgZG9lc1NlbGVjdG9yQWZmZWN0U2VsZWN0ZWROb2RlKQogICAgICAgICB7CiAgICAgICAg ICAgICB2YXIgc3R5bGVSdWxlID0geyBzZWN0aW9uOiB0aGlzLCBzdHlsZTogbmV3UnVsZS5zdHls ZSwgc2VsZWN0b3JUZXh0OiBuZXdSdWxlLnNlbGVjdG9yVGV4dCwgc291cmNlVVJMOiBuZXdSdWxl LnNvdXJjZVVSTCwgcnVsZTogbmV3UnVsZSB9OwotICAgICAgICAgICAgdGhpcy5tYWtlTm9ybWFs KHN0eWxlUnVsZSk7CisgICAgICAgICAgICB0aGlzLl9tYWtlTm9ybWFsKHN0eWxlUnVsZSk7CiAK ICAgICAgICAgICAgIGlmICghZG9lc1NlbGVjdG9yQWZmZWN0U2VsZWN0ZWROb2RlKSB7CiAgICAg ICAgICAgICAgICAgdGhpcy5ub0FmZmVjdCA9IHRydWU7CiAgICAgICAgICAgICAgICAgdGhpcy5l bGVtZW50LmFkZFN0eWxlQ2xhc3MoIm5vLWFmZmVjdCIpOwogICAgICAgICAgICAgfQogCi0gICAg ICAgICAgICB0aGlzLl9zZWxlY3RvclJlZkVsZW1lbnQudGV4dENvbnRlbnQgPSBXZWJJbnNwZWN0 b3IuVUlTdHJpbmcoInZpYSBpbnNwZWN0b3IiKTsKICAgICAgICAgICAgIHRoaXMuZXhwYW5kKCk7 CiAgICAgICAgICAgICBpZiAodGhpcy5lbGVtZW50LnBhcmVudEVsZW1lbnQpIC8vIE1pZ2h0IGhh dmUgYmVlbiBkZXRhY2hlZCBhbHJlYWR5LgogICAgICAgICAgICAgICAgIHRoaXMuX21vdmVFZGl0 b3JGcm9tU2VsZWN0b3IobW92ZURpcmVjdGlvbik7CkBAIC0xNDQ5LDEyICsxNDUwLDEyIEBAIFdl Ykluc3BlY3Rvci5CbGFua1N0eWxlUHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlID0gewogICAg ICAgICB0aGlzLnBhbmUucmVtb3ZlU2VjdGlvbih0aGlzKTsKICAgICB9LAogCi0gICAgbWFrZU5v cm1hbDogZnVuY3Rpb24oc3R5bGVSdWxlKQorICAgIF9tYWtlTm9ybWFsOiBmdW5jdGlvbihzdHls ZVJ1bGUpCiAgICAgewogICAgICAgICB0aGlzLmVsZW1lbnQucmVtb3ZlU3R5bGVDbGFzcygiYmxh bmstc2VjdGlvbiIpOwogICAgICAgICB0aGlzLnN0eWxlUnVsZSA9IHN0eWxlUnVsZTsKICAgICAg ICAgdGhpcy5ydWxlID0gc3R5bGVSdWxlLnJ1bGU7Ci0gICAgICAgIHRoaXMuaWRlbnRpZmllciA9 IHN0eWxlUnVsZS5zZWxlY3RvclRleHQgKyAiOnZpYSBpbnNwZWN0b3IiOworICAgICAgICB0aGlz Ll91cGRhdGVSdWxlT3JpZ2luKFdlYkluc3BlY3Rvci5VSVN0cmluZygidmlhIGluc3BlY3RvciIp KTsKIAogICAgICAgICAvLyBGSVhNRTogcmVwbGFjZSB0aGlzIGluc3RhbmNlIGJ5IGEgbm9ybWFs IFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnRpZXNTZWN0aW9uLgogICAgICAgICB0aGlzLl9ub3Jt YWwgPSB0cnVlOwo= 116977 2011-11-29 08:46:30 -0800 2011-11-30 07:03:48 -0800 Patch bug-73323-20111129204628.patch text/plain 8192 caseq U3VidmVyc2lvbiBSZXZpc2lvbjogMTAxMzY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTQyMGI0ZTczYmIwYTIz MGFlNTE3N2M2MmNkOTY4ZmJkZjUzNjNhOC4uZGYzYjE2OWE5Y2FhOWI2NjZjMjIxZmZiNWU1Yjk1 M2YwYWFkNWJjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIzIEBACiAyMDExLTExLTI5ICBBbmRy ZXkgS29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogW3JlZmFjdG9yaW5nXSBkbyBub3QgY2xvbmUgbm9kZXMgdGhhdCBjb250YWluIGxpbmtpZmll ZCBVUkxzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03 MzMyMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5TdHlsZVByb3BlcnRpZXNTZWN0aW9uKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5T dHlsZVByb3BlcnRpZXNTZWN0aW9uLnByb3RvdHlwZS5fdXBkYXRlUnVsZU9yaWdpbik6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbi5wcm90b3R5cGUuX2NyZWF0 ZVJ1bGVPcmlnaW5Ob2RlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnRpZXNT ZWN0aW9uLnByb3RvdHlwZS5lZGl0aW5nU2VsZWN0b3JDb21taXR0ZWQuc3VjY2Vzc0NhbGxiYWNr KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnRpZXNTZWN0aW9uLnByb3RvdHlw ZS5lZGl0aW5nU2VsZWN0b3JDb21taXR0ZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbXB1 dGVkU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbi5wcm90b3R5cGUucmVidWlsZENvbXB1dGVkVHJhY2Up OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkJsYW5rU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbi5wcm90 b3R5cGUuZWRpdGluZ1NlbGVjdG9yQ29tbWl0dGVkLnN1Y2Nlc3NDYWxsYmFjayk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuQmxhbmtTdHlsZVByb3BlcnRpZXNTZWN0aW9uLnByb3RvdHlwZS5lZGl0 aW5nU2VsZWN0b3JDb21taXR0ZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkJsYW5rU3R5bGVQ cm9wZXJ0aWVzU2VjdGlvbi5wcm90b3R5cGUuX21ha2VOb3JtYWwpOgorCisyMDExLTExLTI5ICBB bmRyZXkgS29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgV2ViIEluc3Bl Y3RvcjogcmVtb3ZlIHVzYWdlIG9mIGlubmVySFRNTCBmcm9tIGluc3BlY3RvciBmcm9udC1lbmQK ICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTczMzA1CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lk ZWJhclBhbmUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1Np ZGViYXJQYW5lLmpzCmluZGV4IDQwNmVmM2U0YmFkZDI5OTVmNGRmYzEzYTZjNTZjY2RkYWIxOTE3 ZjEuLjgzNDJlZmE4MGUyMzEzNTc4NGE1NzY4MmMwYmZmMzY1MDZkY2MxMmMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lkZWJhclBhbmUuanMK KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFu ZS5qcwpAQCAtOTIyLDMyICs5MjIsMTggQEAgV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydGllc1Nl Y3Rpb24gPSBmdW5jdGlvbihwYXJlbnRQYW5lLCBzdHlsZVJ1bGUsIGVkaXRhYmxlLAogICAgIGlm ICh0aGlzLnJ1bGUpCiAgICAgICAgIHRoaXMudGl0bGVFbGVtZW50LmFkZFN0eWxlQ2xhc3MoInN0 eWxlcy1zZWxlY3RvciIpOwogCi0gICAgZnVuY3Rpb24gbGlua2lmeVVuY29weWFibGUodXJsLCBs aW5lKQotICAgIHsKLSAgICAgICAgdmFyIGxpbmsgPSBXZWJJbnNwZWN0b3IubGlua2lmeVJlc291 cmNlQXNOb2RlKHVybCwgbGluZSk7Ci0gICAgICAgIHJldHVybiBsaW5rOwotICAgIH0KLQogICAg IHRoaXMuX3NlbGVjdG9yUmVmRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIp OwogICAgIHRoaXMuX3NlbGVjdG9yUmVmRWxlbWVudC5jbGFzc05hbWUgPSAic3VidGl0bGUiOwog Ci0gICAgdmFyIHN1YnRpdGxlID0gIiI7Ci0gICAgaWYgKHRoaXMuc3R5bGVSdWxlLnNvdXJjZVVS TCkKLSAgICAgICAgdGhpcy5fc2VsZWN0b3JSZWZFbGVtZW50LmFwcGVuZENoaWxkKGxpbmtpZnlV bmNvcHlhYmxlKHRoaXMuc3R5bGVSdWxlLnNvdXJjZVVSTCwgdGhpcy5ydWxlLnNvdXJjZUxpbmUp KTsKLSAgICBlbHNlIGlmIChpc1VzZXJBZ2VudCkKLSAgICAgICAgc3VidGl0bGUgPSBXZWJJbnNw ZWN0b3IuVUlTdHJpbmcoInVzZXIgYWdlbnQgc3R5bGVzaGVldCIpOworICAgIHZhciBvcmlnaW4g PSAiIjsKKyAgICBpZiAoaXNVc2VyQWdlbnQpCisgICAgICAgIG9yaWdpbiA9IFdlYkluc3BlY3Rv ci5VSVN0cmluZygidXNlciBhZ2VudCBzdHlsZXNoZWV0Iik7CiAgICAgZWxzZSBpZiAoaXNVc2Vy KQotICAgICAgICBzdWJ0aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygidXNlciBzdHlsZXNo ZWV0Iik7CisgICAgICAgIG9yaWdpbiA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygidXNlciBzdHls ZXNoZWV0Iik7CiAgICAgZWxzZSBpZiAoaXNWaWFJbnNwZWN0b3IpCi0gICAgICAgIHN1YnRpdGxl ID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJ2aWEgaW5zcGVjdG9yIik7Ci0gICAgZWxzZSBpZiAo dGhpcy5ydWxlICYmIHRoaXMucnVsZS5zb3VyY2VVUkwpCi0gICAgICAgIHRoaXMuX3NlbGVjdG9y UmVmRWxlbWVudC5hcHBlbmRDaGlsZChsaW5raWZ5VW5jb3B5YWJsZSh0aGlzLnJ1bGUuc291cmNl VVJMLCB0aGlzLnJ1bGUuc291cmNlTGluZSkpOwotCi0gICAgdGhpcy5pZGVudGlmaWVyID0gc3R5 bGVSdWxlLnNlbGVjdG9yVGV4dDsKLSAgICBpZiAoc3VidGl0bGUpIHsKLSAgICAgICAgdGhpcy5f c2VsZWN0b3JSZWZFbGVtZW50LnRleHRDb250ZW50ID0gc3VidGl0bGU7Ci0gICAgICAgIHRoaXMu aWRlbnRpZmllciArPSAiOiIgKyBzdWJ0aXRsZTsKLSAgICB9CisgICAgICAgIG9yaWdpbiA9IFdl Ykluc3BlY3Rvci5VSVN0cmluZygidmlhIGluc3BlY3RvciIpOworCisgICAgdGhpcy5fdXBkYXRl UnVsZU9yaWdpbihvcmlnaW4pOwogCiAgICAgc2VsZWN0b3JDb250YWluZXIuYXBwZW5kQ2hpbGQo dGhpcy5fc2VsZWN0b3JSZWZFbGVtZW50KTsKICAgICB0aGlzLnRpdGxlRWxlbWVudC5hcHBlbmRD aGlsZChzZWxlY3RvckNvbnRhaW5lcik7CkBAIC0xMTM1LDYgKzExMjEsMzUgQEAgV2ViSW5zcGVj dG9yLlN0eWxlUHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4g aXRlbTsKICAgICB9LAogCisgICAgX3VwZGF0ZVJ1bGVPcmlnaW46IGZ1bmN0aW9uKHRleHQpCisg ICAgeworICAgICAgICB0aGlzLl9ydWxlT3JpZ2luVGV4dCA9IHRleHQ7CisgICAgICAgIHRoaXMu X3NlbGVjdG9yUmVmRWxlbWVudC5yZW1vdmVDaGlsZHJlbigpOworICAgICAgICB0aGlzLl9zZWxl Y3RvclJlZkVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fY3JlYXRlUnVsZU9yaWdpbk5vZGUoKSk7 CisgICAgICAgIHZhciBpZGVudGlmaWVyID0gdGhpcy5zdHlsZVJ1bGUuc2VsZWN0b3JUZXh0Owor ICAgICAgICBpZiAodGV4dCkKKyAgICAgICAgICAgIGlkZW50aWZpZXIgKz0gIjoiICsgdGV4dDsK KyAgICAgICAgdGhpcy5pZGVudGlmaWVyID0gaWRlbnRpZmllcjsKKyAgICB9LAorCisgICAgX2Ny ZWF0ZVJ1bGVPcmlnaW5Ob2RlOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICBmdW5jdGlvbiBs aW5raWZ5VW5jb3B5YWJsZSh1cmwsIGxpbmUpCisgICAgICAgIHsKKyAgICAgICAgICAgIHZhciBs aW5rID0gV2ViSW5zcGVjdG9yLmxpbmtpZnlSZXNvdXJjZUFzTm9kZSh1cmwsIGxpbmUpOworICAg ICAgICAgICAgbGluay5jbGFzc0xpc3QuYWRkKCJ3ZWJraXQtaHRtbC1yZXNvdXJjZS1saW5rIik7 CisgICAgICAgICAgICBsaW5rLnNldEF0dHJpYnV0ZSgiZGF0YS11bmNvcHlhYmxlIiwgbGluay50 ZXh0Q29udGVudCk7CisgICAgICAgICAgICBsaW5rLnRleHRDb250ZW50ID0gIiI7CisgICAgICAg ICAgICByZXR1cm4gbGluazsKKyAgICAgICAgfQorCisgICAgICAgIGlmICh0aGlzLnN0eWxlUnVs ZS5zb3VyY2VVUkwpCisgICAgICAgICAgICByZXR1cm4gbGlua2lmeVVuY29weWFibGUodGhpcy5z dHlsZVJ1bGUuc291cmNlVVJMLCB0aGlzLnJ1bGUuc291cmNlTGluZSk7CisgICAgICAgIGVsc2Ug aWYgKHRoaXMucnVsZSAmJiB0aGlzLnJ1bGUuc291cmNlVVJMKQorICAgICAgICAgICAgcmV0dXJu IGxpbmtpZnlVbmNvcHlhYmxlKHRoaXMucnVsZS5zb3VyY2VVUkwsIHRoaXMucnVsZS5zb3VyY2VM aW5lKTsKKyAgICAgICAgcmV0dXJuIGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKHRoaXMuX3J1bGVP cmlnaW5UZXh0KTsKKyAgICB9LAorCiAgICAgX2RlYnVnU2hvd1N0eWxlOiBmdW5jdGlvbihldmVu dCkKICAgICB7CiAgICAgICAgIHZhciBib3VuZEhhbmRsZXI7CkBAIC0xMjYwLDkgKzEyNzUsNyBA QCBXZWJJbnNwZWN0b3IuU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbi5wcm90b3R5cGUgPSB7CiAgICAg ICAgICAgICB0aGlzLnJ1bGUgPSBuZXdSdWxlOwogICAgICAgICAgICAgdGhpcy5zdHlsZVJ1bGUg PSB7IHNlY3Rpb246IHRoaXMsIHN0eWxlOiBuZXdSdWxlLnN0eWxlLCBzZWxlY3RvclRleHQ6IG5l d1J1bGUuc2VsZWN0b3JUZXh0LCBtZWRpYTogbmV3UnVsZS5tZWRpYSwgc291cmNlVVJMOiBuZXdS dWxlLnNvdXJjZVVSTCwgcnVsZTogbmV3UnVsZSB9OwogCi0gICAgICAgICAgICB2YXIgb2xkSWRl bnRpZmllciA9IHRoaXMuaWRlbnRpZmllcjsKLSAgICAgICAgICAgIHRoaXMuaWRlbnRpZmllciA9 IG5ld1J1bGUuc2VsZWN0b3JUZXh0ICsgIjoiICsgdGhpcy5fc2VsZWN0b3JSZWZFbGVtZW50LnRl eHRDb250ZW50OwotCisgICAgICAgICAgICB0aGlzLl91cGRhdGVSdWxlT3JpZ2luKHRoaXMuX3J1 bGVPcmlnaW5UZXh0KTsKICAgICAgICAgICAgIHRoaXMucGFuZS51cGRhdGUoKTsKIAogICAgICAg ICAgICAgdGhpcy5fbW92ZUVkaXRvckZyb21TZWxlY3Rvcihtb3ZlRGlyZWN0aW9uKTsKQEAgLTEz NjgsOSArMTM4MSw3IEBAIFdlYkluc3BlY3Rvci5Db21wdXRlZFN0eWxlUHJvcGVydGllc1NlY3Rp b24ucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgICAgICBmcmFnbWVudC5hcHBlbmRDaGls ZChkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZSgiIC0gIiArIHByb3BlcnR5LnZhbHVlICsgIiAiKSk7 CiAgICAgICAgICAgICAgICAgICAgIHZhciBzdWJ0aXRsZSA9IGZyYWdtZW50LmNyZWF0ZUNoaWxk KCJzcGFuIik7CiAgICAgICAgICAgICAgICAgICAgIHN1YnRpdGxlLnN0eWxlLmZsb2F0ID0gInJp Z2h0IjsKLSAgICAgICAgICAgICAgICAgICAgdmFyIHNlbGVjdG9yUmVmID0gc2VjdGlvbi5fc2Vs ZWN0b3JSZWZFbGVtZW50LmNsb25lTm9kZSh0cnVlKTsKLSAgICAgICAgICAgICAgICAgICAgZm9y ICh2YXIgbiA9IDA7IG4gPCBzZWxlY3RvclJlZi5jaGlsZE5vZGVzLmxlbmd0aDsgKytuKQotICAg ICAgICAgICAgICAgICAgICAgICAgc3VidGl0bGUuYXBwZW5kQ2hpbGQoc2VsZWN0b3JSZWYuY2hp bGROb2Rlc1tuXSk7CisgICAgICAgICAgICAgICAgICAgIHN1YnRpdGxlLmFwcGVuZENoaWxkKHNl Y3Rpb24uX2NyZWF0ZVJ1bGVPcmlnaW5Ob2RlKCkpOwogICAgICAgICAgICAgICAgICAgICB2YXIg Y2hpbGRFbGVtZW50ID0gbmV3IFRyZWVFbGVtZW50KGZyYWdtZW50LCBudWxsLCBmYWxzZSk7CiAg ICAgICAgICAgICAgICAgICAgIHRyZWVFbGVtZW50LmFwcGVuZENoaWxkKGNoaWxkRWxlbWVudCk7 CiAgICAgICAgICAgICAgICAgICAgIGlmIChzZWN0aW9uLmlzUHJvcGVydHlPdmVybG9hZGVkKHBy b3BlcnR5Lm5hbWUpKQpAQCAtMTQyMywxNCArMTQzNCwxMyBAQCBXZWJJbnNwZWN0b3IuQmxhbmtT dHlsZVByb3BlcnRpZXNTZWN0aW9uLnByb3RvdHlwZSA9IHsKICAgICAgICAgZnVuY3Rpb24gc3Vj Y2Vzc0NhbGxiYWNrKG5ld1J1bGUsIGRvZXNTZWxlY3RvckFmZmVjdFNlbGVjdGVkTm9kZSkKICAg ICAgICAgewogICAgICAgICAgICAgdmFyIHN0eWxlUnVsZSA9IHsgc2VjdGlvbjogdGhpcywgc3R5 bGU6IG5ld1J1bGUuc3R5bGUsIHNlbGVjdG9yVGV4dDogbmV3UnVsZS5zZWxlY3RvclRleHQsIHNv dXJjZVVSTDogbmV3UnVsZS5zb3VyY2VVUkwsIHJ1bGU6IG5ld1J1bGUgfTsKLSAgICAgICAgICAg IHRoaXMubWFrZU5vcm1hbChzdHlsZVJ1bGUpOworICAgICAgICAgICAgdGhpcy5fbWFrZU5vcm1h bChzdHlsZVJ1bGUpOwogCiAgICAgICAgICAgICBpZiAoIWRvZXNTZWxlY3RvckFmZmVjdFNlbGVj dGVkTm9kZSkgewogICAgICAgICAgICAgICAgIHRoaXMubm9BZmZlY3QgPSB0cnVlOwogICAgICAg ICAgICAgICAgIHRoaXMuZWxlbWVudC5hZGRTdHlsZUNsYXNzKCJuby1hZmZlY3QiKTsKICAgICAg ICAgICAgIH0KIAotICAgICAgICAgICAgdGhpcy5fc2VsZWN0b3JSZWZFbGVtZW50LnRleHRDb250 ZW50ID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJ2aWEgaW5zcGVjdG9yIik7CiAgICAgICAgICAg ICB0aGlzLmV4cGFuZCgpOwogICAgICAgICAgICAgaWYgKHRoaXMuZWxlbWVudC5wYXJlbnRFbGVt ZW50KSAvLyBNaWdodCBoYXZlIGJlZW4gZGV0YWNoZWQgYWxyZWFkeS4KICAgICAgICAgICAgICAg ICB0aGlzLl9tb3ZlRWRpdG9yRnJvbVNlbGVjdG9yKG1vdmVEaXJlY3Rpb24pOwpAQCAtMTQ0OSwx MiArMTQ1OSwxMiBAQCBXZWJJbnNwZWN0b3IuQmxhbmtTdHlsZVByb3BlcnRpZXNTZWN0aW9uLnBy b3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5wYW5lLnJlbW92ZVNlY3Rpb24odGhpcyk7CiAgICAg fSwKIAotICAgIG1ha2VOb3JtYWw6IGZ1bmN0aW9uKHN0eWxlUnVsZSkKKyAgICBfbWFrZU5vcm1h bDogZnVuY3Rpb24oc3R5bGVSdWxlKQogICAgIHsKICAgICAgICAgdGhpcy5lbGVtZW50LnJlbW92 ZVN0eWxlQ2xhc3MoImJsYW5rLXNlY3Rpb24iKTsKICAgICAgICAgdGhpcy5zdHlsZVJ1bGUgPSBz dHlsZVJ1bGU7CiAgICAgICAgIHRoaXMucnVsZSA9IHN0eWxlUnVsZS5ydWxlOwotICAgICAgICB0 aGlzLmlkZW50aWZpZXIgPSBzdHlsZVJ1bGUuc2VsZWN0b3JUZXh0ICsgIjp2aWEgaW5zcGVjdG9y IjsKKyAgICAgICAgdGhpcy5fdXBkYXRlUnVsZU9yaWdpbihXZWJJbnNwZWN0b3IuVUlTdHJpbmco InZpYSBpbnNwZWN0b3IiKSk7CiAKICAgICAgICAgLy8gRklYTUU6IHJlcGxhY2UgdGhpcyBpbnN0 YW5jZSBieSBhIG5vcm1hbCBXZWJJbnNwZWN0b3IuU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbi4KICAg ICAgICAgdGhpcy5fbm9ybWFsID0gdHJ1ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvZWxlbWVudHNQYW5lbC5jc3MgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL2VsZW1lbnRzUGFuZWwuY3NzCmluZGV4IDBmYzk0YTUwMDIzMzY4ZmY2 NTFmOGMyMWIzNDczYjczOGRkY2Q0MGEuLjM2YWU5ZjNlNWNiYzM0NmI4ZGQ2Yzk3MzA4NDVlZmIy OTBjZDY3Y2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv ZWxlbWVudHNQYW5lbC5jc3MKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9lbGVtZW50c1BhbmVsLmNzcwpAQCAtMjcyLDYgKzI3MiwxNSBAQAogICAgIGNvbG9yOiBpbmhl cml0OwogfQogCisuc3R5bGVzLXNlY3Rpb24gYVtkYXRhLXVuY29weWFibGVdIHsKKyAgICBkaXNw bGF5OiBpbmxpbmUtYmxvY2s7Cit9CisKKy5zdHlsZXMtc2VjdGlvbiBhW2RhdGEtdW5jb3B5YWJs ZV06OmJlZm9yZSB7CisgICAgY29udGVudDogYXR0cihkYXRhLXVuY29weWFibGUpOworICAgIHRl eHQtZGVjb3JhdGlvbjogdW5kZXJsaW5lOworfQorCiAuc3R5bGVzLXNlY3Rpb24gLnByb3BlcnRp ZXMgewogICAgIGRpc3BsYXk6IG5vbmU7CiAgICAgbWFyZ2luOiAwOwo= 117186 2011-11-30 07:03:59 -0800 2011-11-30 07:14:03 -0800 Patch bug-73323-20111130190357.patch text/plain 9759 caseq U3VidmVyc2lvbiBSZXZpc2lvbjogMTAxNDY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWMyYjAyMWQ1YTBmYzll Zjk1NTBhNThjM2ExZGZmZjI5NDZkNWVhNi4uMDFjY2I4ZTVkOTQ3N2VlNjEzNDI1NjdhMTM2YzQ4 OWI1NzY2NTVlZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDExLTExLTMwICBBbmRy ZXkgS29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogW3JlZmFjdG9yaW5nXSBkbyBub3QgY2xvbmUgbm9kZXMgdGhhdCBjb250YWluIGxpbmtpZmll ZCBVUkxzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03 MzMyMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5TdHlsZVByb3BlcnRpZXNTZWN0aW9uKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5T dHlsZVByb3BlcnRpZXNTZWN0aW9uLnByb3RvdHlwZS5fY3JlYXRlUnVsZU9yaWdpbk5vZGUpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlLmVk aXRpbmdTZWxlY3RvckNvbW1pdHRlZC5zdWNjZXNzQ2FsbGJhY2spOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlN0eWxlUHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlLmVkaXRpbmdTZWxlY3RvckNv bW1pdHRlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29tcHV0ZWRTdHlsZVByb3BlcnRpZXNT ZWN0aW9uLnByb3RvdHlwZS5yZWJ1aWxkQ29tcHV0ZWRUcmFjZSk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuQmxhbmtTdHlsZVByb3BlcnRpZXNTZWN0aW9uLnByb3RvdHlwZS5tYWtlTm9ybWFsKToK KyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2VsZW1lbnRzUGFuZWwuY3NzOgorICAgICAg ICAoLnN0eWxlcy1zZWN0aW9uIGFbZGF0YS11bmNvcHlhYmxlXSk6CisgICAgICAgICguc3R5bGVz LXNlY3Rpb24gYVtkYXRhLXVuY29weWFibGVdOjpiZWZvcmUpOgorCiAyMDExLTExLTMwICBKYWNr eSBKaWFuZyAgPHpoYWppYW5nQHJpbS5jb20+CiAKICAgICAgICAgVXBzdHJlYW0gQmxhY2tCZXJy eSBwb3J0aW5nIG9mIFdlYkNvcmUvZWRpdGluZy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lkZWJhclBhbmUuanMgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQYW5lLmpzCmluZGV4IDc4OTkwM2Mx ZWRlODRkYzc4Njg0ZGQyZjdkOTdhNmJmM2Q5Y2ZmOTUuLjIyZmYzOGE1NjMyZTMyZmRjNDE1MGRj ZDdjZjg2MWZlY2I2Njg5MDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvU3R5bGVzU2lkZWJhclBhbmUuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qcwpAQCAtOTA3LDQ2ICs5MDcsMTggQEAg V2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydGllc1NlY3Rpb24gPSBmdW5jdGlvbihwYXJlbnRQYW5l LCBzdHlsZVJ1bGUsIGVkaXRhYmxlLAogICAgIHRoaXMuZWRpdGFibGUgPSBlZGl0YWJsZTsKICAg ICB0aGlzLmlzSW5oZXJpdGVkID0gaXNJbmhlcml0ZWQ7CiAKLSAgICAvLyBQcmV2ZW50IGVkaXRp bmcgdGhlIHVzZXIgYWdlbnQgYW5kIHVzZXIgcnVsZXMuCi0gICAgdmFyIGlzVXNlckFnZW50ID0g dGhpcy5ydWxlICYmIHRoaXMucnVsZS5pc1VzZXJBZ2VudDsKLSAgICB2YXIgaXNVc2VyID0gdGhp cy5ydWxlICYmIHRoaXMucnVsZS5pc1VzZXI7Ci0gICAgdmFyIGlzVmlhSW5zcGVjdG9yID0gdGhp cy5ydWxlICYmIHRoaXMucnVsZS5pc1ZpYUluc3BlY3RvcjsKLQotICAgIGlmIChpc1VzZXJBZ2Vu dCB8fCBpc1VzZXIpCi0gICAgICAgIHRoaXMuZWRpdGFibGUgPSBmYWxzZTsKLQotICAgIHRoaXMu X3VzZWRQcm9wZXJ0aWVzID0gc3R5bGVSdWxlLnVzZWRQcm9wZXJ0aWVzOwotCi0gICAgaWYgKHRo aXMucnVsZSkKKyAgICBpZiAodGhpcy5ydWxlKSB7CisgICAgICAgIC8vIFByZXZlbnQgZWRpdGlu ZyB0aGUgdXNlciBhZ2VudCBhbmQgdXNlciBydWxlcy4KKyAgICAgICAgaWYgKHRoaXMucnVsZS5p c1VzZXJBZ2VudCB8fCB0aGlzLnJ1bGUuaXNVc2VyKQorICAgICAgICAgICAgdGhpcy5lZGl0YWJs ZSA9IGZhbHNlOwogICAgICAgICB0aGlzLnRpdGxlRWxlbWVudC5hZGRTdHlsZUNsYXNzKCJzdHls ZXMtc2VsZWN0b3IiKTsKLQotICAgIGZ1bmN0aW9uIGxpbmtpZnlVbmNvcHlhYmxlKHVybCwgbGlu ZSkKLSAgICB7Ci0gICAgICAgIHZhciBsaW5rID0gV2ViSW5zcGVjdG9yLmxpbmtpZnlSZXNvdXJj ZUFzTm9kZSh1cmwsIGxpbmUpOwotICAgICAgICByZXR1cm4gbGluazsKICAgICB9CiAKKyAgICB0 aGlzLl91c2VkUHJvcGVydGllcyA9IHN0eWxlUnVsZS51c2VkUHJvcGVydGllczsKKwogICAgIHRo aXMuX3NlbGVjdG9yUmVmRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwog ICAgIHRoaXMuX3NlbGVjdG9yUmVmRWxlbWVudC5jbGFzc05hbWUgPSAic3VidGl0bGUiOwotCi0g ICAgdmFyIHN1YnRpdGxlID0gIiI7Ci0gICAgaWYgKHRoaXMuc3R5bGVSdWxlLnNvdXJjZVVSTCkK LSAgICAgICAgdGhpcy5fc2VsZWN0b3JSZWZFbGVtZW50LmFwcGVuZENoaWxkKGxpbmtpZnlVbmNv cHlhYmxlKHRoaXMuc3R5bGVSdWxlLnNvdXJjZVVSTCwgdGhpcy5ydWxlLnNvdXJjZUxpbmUpKTsK LSAgICBlbHNlIGlmIChpc1VzZXJBZ2VudCkKLSAgICAgICAgc3VidGl0bGUgPSBXZWJJbnNwZWN0 b3IuVUlTdHJpbmcoInVzZXIgYWdlbnQgc3R5bGVzaGVldCIpOwotICAgIGVsc2UgaWYgKGlzVXNl cikKLSAgICAgICAgc3VidGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoInVzZXIgc3R5bGVz aGVldCIpOwotICAgIGVsc2UgaWYgKGlzVmlhSW5zcGVjdG9yKQotICAgICAgICBzdWJ0aXRsZSA9 IFdlYkluc3BlY3Rvci5VSVN0cmluZygidmlhIGluc3BlY3RvciIpOwotICAgIGVsc2UgaWYgKHRo aXMucnVsZSAmJiB0aGlzLnJ1bGUuc291cmNlVVJMKQotICAgICAgICB0aGlzLl9zZWxlY3RvclJl ZkVsZW1lbnQuYXBwZW5kQ2hpbGQobGlua2lmeVVuY29weWFibGUodGhpcy5ydWxlLnNvdXJjZVVS TCwgdGhpcy5ydWxlLnNvdXJjZUxpbmUpKTsKLQotICAgIHRoaXMuaWRlbnRpZmllciA9IHN0eWxl UnVsZS5zZWxlY3RvclRleHQ7Ci0gICAgaWYgKHN1YnRpdGxlKSB7Ci0gICAgICAgIHRoaXMuX3Nl bGVjdG9yUmVmRWxlbWVudC50ZXh0Q29udGVudCA9IHN1YnRpdGxlOwotICAgICAgICB0aGlzLmlk ZW50aWZpZXIgKz0gIjoiICsgc3VidGl0bGU7Ci0gICAgfQotCisgICAgdGhpcy5fc2VsZWN0b3JS ZWZFbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuX2NyZWF0ZVJ1bGVPcmlnaW5Ob2RlKCkpOwogICAg IHNlbGVjdG9yQ29udGFpbmVyLmFwcGVuZENoaWxkKHRoaXMuX3NlbGVjdG9yUmVmRWxlbWVudCk7 CiAgICAgdGhpcy50aXRsZUVsZW1lbnQuYXBwZW5kQ2hpbGQoc2VsZWN0b3JDb250YWluZXIpOwog CkBAIC0xMTMzLDYgKzExMDUsMzYgQEAgV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydGllc1NlY3Rp b24ucHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4gaXRlbTsKICAgICB9LAogCisgICAgX2Ny ZWF0ZVJ1bGVPcmlnaW5Ob2RlOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICBmdW5jdGlvbiBs aW5raWZ5VW5jb3B5YWJsZSh1cmwsIGxpbmUpCisgICAgICAgIHsKKyAgICAgICAgICAgIHZhciBs aW5rID0gV2ViSW5zcGVjdG9yLmxpbmtpZnlSZXNvdXJjZUFzTm9kZSh1cmwsIGxpbmUpOworICAg ICAgICAgICAgbGluay5jbGFzc0xpc3QuYWRkKCJ3ZWJraXQtaHRtbC1yZXNvdXJjZS1saW5rIik7 CisgICAgICAgICAgICBsaW5rLnNldEF0dHJpYnV0ZSgiZGF0YS11bmNvcHlhYmxlIiwgbGluay50 ZXh0Q29udGVudCk7CisgICAgICAgICAgICBsaW5rLnRleHRDb250ZW50ID0gIiI7CisgICAgICAg ICAgICByZXR1cm4gbGluazsKKyAgICAgICAgfQorCisgICAgICAgIGlmICh0aGlzLnN0eWxlUnVs ZS5zb3VyY2VVUkwpCisgICAgICAgICAgICByZXR1cm4gbGlua2lmeVVuY29weWFibGUodGhpcy5z dHlsZVJ1bGUuc291cmNlVVJMLCB0aGlzLnJ1bGUuc291cmNlTGluZSk7CisKKyAgICAgICAgaWYg KCF0aGlzLnJ1bGUpIAorICAgICAgICAgICAgcmV0dXJuIGRvY3VtZW50LmNyZWF0ZVRleHROb2Rl KCIiKTsKKworICAgICAgICBpZiAodGhpcy5ydWxlLnNvdXJjZVVSTCkKKyAgICAgICAgICAgIHJl dHVybiBsaW5raWZ5VW5jb3B5YWJsZSh0aGlzLnJ1bGUuc291cmNlVVJMLCB0aGlzLnJ1bGUuc291 cmNlTGluZSk7CisKKyAgICAgICAgdmFyIG9yaWdpbiA9ICIiOworICAgICAgICBpZiAodGhpcy5y dWxlLmlzVXNlckFnZW50KQorICAgICAgICAgICAgb3JpZ2luID0gV2ViSW5zcGVjdG9yLlVJU3Ry aW5nKCJ1c2VyIGFnZW50IHN0eWxlc2hlZXQiKTsKKyAgICAgICAgZWxzZSBpZiAodGhpcy5ydWxl LmlzVXNlcikKKyAgICAgICAgICAgIG9yaWdpbiA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygidXNl ciBzdHlsZXNoZWV0Iik7CisgICAgICAgIGVsc2UgaWYgKHRoaXMucnVsZS5pc1ZpYUluc3BlY3Rv cikKKyAgICAgICAgICAgIG9yaWdpbiA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygidmlhIGluc3Bl Y3RvciIpOworICAgICAgICByZXR1cm4gZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUob3JpZ2luKTsK KyAgICB9LAorCiAgICAgX2hhbmRsZUVtcHR5U3BhY2VEb3VibGVDbGljazogZnVuY3Rpb24oZXZl bnQpCiAgICAgewogICAgICAgICBpZiAoZXZlbnQudGFyZ2V0Lmhhc1N0eWxlQ2xhc3MoImhlYWRl ciIpIHx8IHRoaXMuZWxlbWVudC5oYXNTdHlsZUNsYXNzKCJyZWFkLW9ubHkiKSB8fCBldmVudC50 YXJnZXQuZW5jbG9zaW5nTm9kZU9yU2VsZldpdGhDbGFzcygibWVkaWEiKSkgewpAQCAtMTIyNSw5 ICsxMjI3LDYgQEAgV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBl ID0gewogICAgICAgICAgICAgdGhpcy5ydWxlID0gbmV3UnVsZTsKICAgICAgICAgICAgIHRoaXMu c3R5bGVSdWxlID0geyBzZWN0aW9uOiB0aGlzLCBzdHlsZTogbmV3UnVsZS5zdHlsZSwgc2VsZWN0 b3JUZXh0OiBuZXdSdWxlLnNlbGVjdG9yVGV4dCwgbWVkaWE6IG5ld1J1bGUubWVkaWEsIHNvdXJj ZVVSTDogbmV3UnVsZS5zb3VyY2VVUkwsIHJ1bGU6IG5ld1J1bGUgfTsKIAotICAgICAgICAgICAg dmFyIG9sZElkZW50aWZpZXIgPSB0aGlzLmlkZW50aWZpZXI7Ci0gICAgICAgICAgICB0aGlzLmlk ZW50aWZpZXIgPSBuZXdSdWxlLnNlbGVjdG9yVGV4dCArICI6IiArIHRoaXMuX3NlbGVjdG9yUmVm RWxlbWVudC50ZXh0Q29udGVudDsKLQogICAgICAgICAgICAgdGhpcy5wYW5lLnVwZGF0ZSgpOwog CiAgICAgICAgICAgICB0aGlzLl9tb3ZlRWRpdG9yRnJvbVNlbGVjdG9yKG1vdmVEaXJlY3Rpb24p OwpAQCAtMTMzMyw5ICsxMzMyLDcgQEAgV2ViSW5zcGVjdG9yLkNvbXB1dGVkU3R5bGVQcm9wZXJ0 aWVzU2VjdGlvbi5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgICAgIGZyYWdtZW50LmFw cGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKCIgLSAiICsgcHJvcGVydHkudmFsdWUg KyAiICIpKTsKICAgICAgICAgICAgICAgICAgICAgdmFyIHN1YnRpdGxlID0gZnJhZ21lbnQuY3Jl YXRlQ2hpbGQoInNwYW4iKTsKICAgICAgICAgICAgICAgICAgICAgc3VidGl0bGUuc3R5bGUuZmxv YXQgPSAicmlnaHQiOwotICAgICAgICAgICAgICAgICAgICB2YXIgc2VsZWN0b3JSZWYgPSBzZWN0 aW9uLl9zZWxlY3RvclJlZkVsZW1lbnQuY2xvbmVOb2RlKHRydWUpOwotICAgICAgICAgICAgICAg ICAgICBmb3IgKHZhciBuID0gMDsgbiA8IHNlbGVjdG9yUmVmLmNoaWxkTm9kZXMubGVuZ3RoOyAr K24pCi0gICAgICAgICAgICAgICAgICAgICAgICBzdWJ0aXRsZS5hcHBlbmRDaGlsZChzZWxlY3Rv clJlZi5jaGlsZE5vZGVzW25dKTsKKyAgICAgICAgICAgICAgICAgICAgc3VidGl0bGUuYXBwZW5k Q2hpbGQoc2VjdGlvbi5fY3JlYXRlUnVsZU9yaWdpbk5vZGUoKSk7CiAgICAgICAgICAgICAgICAg ICAgIHZhciBjaGlsZEVsZW1lbnQgPSBuZXcgVHJlZUVsZW1lbnQoZnJhZ21lbnQsIG51bGwsIGZh bHNlKTsKICAgICAgICAgICAgICAgICAgICAgdHJlZUVsZW1lbnQuYXBwZW5kQ2hpbGQoY2hpbGRF bGVtZW50KTsKICAgICAgICAgICAgICAgICAgICAgaWYgKHNlY3Rpb24uaXNQcm9wZXJ0eU92ZXJs b2FkZWQocHJvcGVydHkubmFtZSkpCkBAIC0xNDE5LDcgKzE0MTYsNiBAQCBXZWJJbnNwZWN0b3Iu QmxhbmtTdHlsZVByb3BlcnRpZXNTZWN0aW9uLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5l bGVtZW50LnJlbW92ZVN0eWxlQ2xhc3MoImJsYW5rLXNlY3Rpb24iKTsKICAgICAgICAgdGhpcy5z dHlsZVJ1bGUgPSBzdHlsZVJ1bGU7CiAgICAgICAgIHRoaXMucnVsZSA9IHN0eWxlUnVsZS5ydWxl OwotICAgICAgICB0aGlzLmlkZW50aWZpZXIgPSBzdHlsZVJ1bGUuc2VsZWN0b3JUZXh0ICsgIjp2 aWEgaW5zcGVjdG9yIjsKIAogICAgICAgICAvLyBGSVhNRTogcmVwbGFjZSB0aGlzIGluc3RhbmNl IGJ5IGEgbm9ybWFsIFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnRpZXNTZWN0aW9uLgogICAgICAg ICB0aGlzLl9ub3JtYWwgPSB0cnVlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9lbGVtZW50c1BhbmVsLmNzcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvZWxlbWVudHNQYW5lbC5jc3MKaW5kZXggMGZjOTRhNTAwMjMzNjhmZjY1MWY4 YzIxYjM0NzNiNzM4ZGRjZDQwYS4uMzZhZTlmM2U1Y2JjMzQ2YjhkZDZjOTczMDg0NWVmYjI5MGNk NjdjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9lbGVt ZW50c1BhbmVsLmNzcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2Vs ZW1lbnRzUGFuZWwuY3NzCkBAIC0yNzIsNiArMjcyLDE1IEBACiAgICAgY29sb3I6IGluaGVyaXQ7 CiB9CiAKKy5zdHlsZXMtc2VjdGlvbiBhW2RhdGEtdW5jb3B5YWJsZV0geworICAgIGRpc3BsYXk6 IGlubGluZS1ibG9jazsKK30KKworLnN0eWxlcy1zZWN0aW9uIGFbZGF0YS11bmNvcHlhYmxlXTo6 YmVmb3JlIHsKKyAgICBjb250ZW50OiBhdHRyKGRhdGEtdW5jb3B5YWJsZSk7CisgICAgdGV4dC1k ZWNvcmF0aW9uOiB1bmRlcmxpbmU7Cit9CisKIC5zdHlsZXMtc2VjdGlvbiAucHJvcGVydGllcyB7 CiAgICAgZGlzcGxheTogbm9uZTsKICAgICBtYXJnaW46IDA7CmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggY2U0YjRjODRkNTdl Y2RlYmU4MTJjYzQ3Y2VlZWU3YzljMTlhY2YyOS4uZDc2MGFmYTVkNjE5M2ZiNGIyODExNmU4Yzdh MTA5ZDQzMzUwNjYzYSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xh eW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDExLTExLTMwICBBbmRyZXkg S29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3Rvcjog W3JlZmFjdG9yaW5nXSBkbyBub3QgY2xvbmUgbm9kZXMgdGhhdCBjb250YWluIGxpbmtpZmllZCBV UkxzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MzMy MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaHR0 cC90ZXN0cy9pbnNwZWN0b3IvZWxlbWVudHMtdGVzdC5qczoKKyAgICAgICAgKGluaXRpYWxpemVf RWxlbWVudFRlc3QuSW5zcGVjdG9yVGVzdC5kdW1wU2VsZWN0ZWRFbGVtZW50U3R5bGVzKToKKwog MjAxMS0xMS0zMCAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+CiAKICAg ICAgICAgVW5yZXZpZXdlZCwgc2tpcCBmYWlsaW5nIHBsYWNlaG9sZGVyIHRlc3RzIG9uIEdUSyBh bmQgYmFzZWxpbmVzCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rv ci9lbGVtZW50cy10ZXN0LmpzIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvZWxl bWVudHMtdGVzdC5qcwppbmRleCBjZjBlNTk5ZTU0OWYzNjAyYTE4ZTBmOGRlMGQyODZlODY0YjY2 ZDFkLi4wYWU0NzBmMDBmOGIxNDk1MTRlMDQ0YTg4OWFjZjY4MmFhOWQ3MDQ5IDEwMDY0NAotLS0g YS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9lbGVtZW50cy10ZXN0LmpzCisrKyBi L0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2VsZW1lbnRzLXRlc3QuanMKQEAgLTEx Miw2ICsxMTIsMTUgQEAgSW5zcGVjdG9yVGVzdC5zZWxlY3ROb2RlQW5kV2FpdEZvclN0eWxlcyA9 IGZ1bmN0aW9uKGlkVmFsdWUsIGNhbGxiYWNrKQogCiBJbnNwZWN0b3JUZXN0LmR1bXBTZWxlY3Rl ZEVsZW1lbnRTdHlsZXMgPSBmdW5jdGlvbihleGNsdWRlQ29tcHV0ZWQsIGV4Y2x1ZGVNYXRjaGVk LCBvbWl0TG9uZ2hhbmRzKQogeworICAgIGZ1bmN0aW9uIGV4dHJhY3RUZXh0KGVsZW1lbnQpCisg ICAgeworICAgICAgICB2YXIgdGV4dCA9IGVsZW1lbnQudGV4dENvbnRlbnQ7CisgICAgICAgIGlm ICh0ZXh0KQorICAgICAgICAgICAgcmV0dXJuIHRleHQ7CisgICAgICAgIGVsZW1lbnQgPSBlbGVt ZW50LnF1ZXJ5U2VsZWN0b3IoIltkYXRhLXVuY29weWFibGVdIik7CisgICAgICAgIHJldHVybiBl bGVtZW50ID8gZWxlbWVudC5nZXRBdHRyaWJ1dGUoImRhdGEtdW5jb3B5YWJsZSIpIDogIiI7Cisg ICAgfQorCiAgICAgdmFyIHN0eWxlU2VjdGlvbnMgPSBXZWJJbnNwZWN0b3IucGFuZWxzLmVsZW1l bnRzLnNpZGViYXJQYW5lcy5zdHlsZXMuc2VjdGlvbnM7CiAgICAgZm9yICh2YXIgcHNldWRvSWQg aW4gc3R5bGVTZWN0aW9ucykgewogICAgICAgICB2YXIgcHNldWRvTmFtZSA9IFdlYkluc3BlY3Rv ci5TdHlsZXNTaWRlYmFyUGFuZS5Qc2V1ZG9JZE5hbWVzW3BzZXVkb0lkXTsKQEAgLTEzMiw3ICsx NDEsNyBAQCBJbnNwZWN0b3JUZXN0LmR1bXBTZWxlY3RlZEVsZW1lbnRTdHlsZXMgPSBmdW5jdGlv bihleGNsdWRlQ29tcHV0ZWQsIGV4Y2x1ZGVNYXRjaAogICAgICAgICAgICAgICAgIGlmIChjaGFp bkVudHJ5LmNoaWxkcmVuWzJdKQogICAgICAgICAgICAgICAgICAgICBlbnRyeUxpbmUgKz0gIiAi ICsgY2hhaW5FbnRyeS5jaGlsZHJlblsxXS50ZXh0Q29udGVudDsKICAgICAgICAgICAgICAgICBp ZiAoY2hhaW5FbnRyeS5jaGlsZHJlbi5sZW5ndGggPiAxKQotICAgICAgICAgICAgICAgICAgICBl bnRyeUxpbmUgKz0gIiAoIiArIGNoYWluRW50cnkubGFzdENoaWxkLnRleHRDb250ZW50ICsgIiki OworICAgICAgICAgICAgICAgICAgICBlbnRyeUxpbmUgKz0gIiAoIiArIGV4dHJhY3RUZXh0KGNo YWluRW50cnkubGFzdENoaWxkKSArICIpIjsKICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0 LmFkZFJlc3VsdChlbnRyeUxpbmUpOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgc2VjdGlv bi5leHBhbmQoKTsK 117188 2011-11-30 07:14:12 -0800 2011-11-30 07:22:09 -0800 Patch bug-73323-20111130191410.patch text/plain 9639 caseq U3VidmVyc2lvbiBSZXZpc2lvbjogMTAxNDY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWMyYjAyMWQ1YTBmYzll Zjk1NTBhNThjM2ExZGZmZjI5NDZkNWVhNi4uMDFjY2I4ZTVkOTQ3N2VlNjEzNDI1NjdhMTM2YzQ4 OWI1NzY2NTVlZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDExLTExLTMwICBBbmRy ZXkgS29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogW3JlZmFjdG9yaW5nXSBkbyBub3QgY2xvbmUgbm9kZXMgdGhhdCBjb250YWluIGxpbmtpZmll ZCBVUkxzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03 MzMyMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5TdHlsZVByb3BlcnRpZXNTZWN0aW9uKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5T dHlsZVByb3BlcnRpZXNTZWN0aW9uLnByb3RvdHlwZS5fY3JlYXRlUnVsZU9yaWdpbk5vZGUpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlLmVk aXRpbmdTZWxlY3RvckNvbW1pdHRlZC5zdWNjZXNzQ2FsbGJhY2spOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlN0eWxlUHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlLmVkaXRpbmdTZWxlY3RvckNv bW1pdHRlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29tcHV0ZWRTdHlsZVByb3BlcnRpZXNT ZWN0aW9uLnByb3RvdHlwZS5yZWJ1aWxkQ29tcHV0ZWRUcmFjZSk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuQmxhbmtTdHlsZVByb3BlcnRpZXNTZWN0aW9uLnByb3RvdHlwZS5tYWtlTm9ybWFsKToK KyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2VsZW1lbnRzUGFuZWwuY3NzOgorICAgICAg ICAoLnN0eWxlcy1zZWN0aW9uIGFbZGF0YS11bmNvcHlhYmxlXSk6CisgICAgICAgICguc3R5bGVz LXNlY3Rpb24gYVtkYXRhLXVuY29weWFibGVdOjpiZWZvcmUpOgorCiAyMDExLTExLTMwICBKYWNr eSBKaWFuZyAgPHpoYWppYW5nQHJpbS5jb20+CiAKICAgICAgICAgVXBzdHJlYW0gQmxhY2tCZXJy eSBwb3J0aW5nIG9mIFdlYkNvcmUvZWRpdGluZy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lkZWJhclBhbmUuanMgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQYW5lLmpzCmluZGV4IDc4OTkwM2Mx ZWRlODRkYzc4Njg0ZGQyZjdkOTdhNmJmM2Q5Y2ZmOTUuLjBjMjMzODMwOWQwYTNjMDk4ZDY5NWNl MmJhNDdhZGMwNTNiMGFhNzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvU3R5bGVzU2lkZWJhclBhbmUuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qcwpAQCAtOTA3LDQ2ICs5MDcsMTggQEAg V2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydGllc1NlY3Rpb24gPSBmdW5jdGlvbihwYXJlbnRQYW5l LCBzdHlsZVJ1bGUsIGVkaXRhYmxlLAogICAgIHRoaXMuZWRpdGFibGUgPSBlZGl0YWJsZTsKICAg ICB0aGlzLmlzSW5oZXJpdGVkID0gaXNJbmhlcml0ZWQ7CiAKLSAgICAvLyBQcmV2ZW50IGVkaXRp bmcgdGhlIHVzZXIgYWdlbnQgYW5kIHVzZXIgcnVsZXMuCi0gICAgdmFyIGlzVXNlckFnZW50ID0g dGhpcy5ydWxlICYmIHRoaXMucnVsZS5pc1VzZXJBZ2VudDsKLSAgICB2YXIgaXNVc2VyID0gdGhp cy5ydWxlICYmIHRoaXMucnVsZS5pc1VzZXI7Ci0gICAgdmFyIGlzVmlhSW5zcGVjdG9yID0gdGhp cy5ydWxlICYmIHRoaXMucnVsZS5pc1ZpYUluc3BlY3RvcjsKLQotICAgIGlmIChpc1VzZXJBZ2Vu dCB8fCBpc1VzZXIpCi0gICAgICAgIHRoaXMuZWRpdGFibGUgPSBmYWxzZTsKLQotICAgIHRoaXMu X3VzZWRQcm9wZXJ0aWVzID0gc3R5bGVSdWxlLnVzZWRQcm9wZXJ0aWVzOwotCi0gICAgaWYgKHRo aXMucnVsZSkKKyAgICBpZiAodGhpcy5ydWxlKSB7CisgICAgICAgIC8vIFByZXZlbnQgZWRpdGlu ZyB0aGUgdXNlciBhZ2VudCBhbmQgdXNlciBydWxlcy4KKyAgICAgICAgaWYgKHRoaXMucnVsZS5p c1VzZXJBZ2VudCB8fCB0aGlzLnJ1bGUuaXNVc2VyKQorICAgICAgICAgICAgdGhpcy5lZGl0YWJs ZSA9IGZhbHNlOwogICAgICAgICB0aGlzLnRpdGxlRWxlbWVudC5hZGRTdHlsZUNsYXNzKCJzdHls ZXMtc2VsZWN0b3IiKTsKLQotICAgIGZ1bmN0aW9uIGxpbmtpZnlVbmNvcHlhYmxlKHVybCwgbGlu ZSkKLSAgICB7Ci0gICAgICAgIHZhciBsaW5rID0gV2ViSW5zcGVjdG9yLmxpbmtpZnlSZXNvdXJj ZUFzTm9kZSh1cmwsIGxpbmUpOwotICAgICAgICByZXR1cm4gbGluazsKICAgICB9CiAKKyAgICB0 aGlzLl91c2VkUHJvcGVydGllcyA9IHN0eWxlUnVsZS51c2VkUHJvcGVydGllczsKKwogICAgIHRo aXMuX3NlbGVjdG9yUmVmRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwog ICAgIHRoaXMuX3NlbGVjdG9yUmVmRWxlbWVudC5jbGFzc05hbWUgPSAic3VidGl0bGUiOwotCi0g ICAgdmFyIHN1YnRpdGxlID0gIiI7Ci0gICAgaWYgKHRoaXMuc3R5bGVSdWxlLnNvdXJjZVVSTCkK LSAgICAgICAgdGhpcy5fc2VsZWN0b3JSZWZFbGVtZW50LmFwcGVuZENoaWxkKGxpbmtpZnlVbmNv cHlhYmxlKHRoaXMuc3R5bGVSdWxlLnNvdXJjZVVSTCwgdGhpcy5ydWxlLnNvdXJjZUxpbmUpKTsK LSAgICBlbHNlIGlmIChpc1VzZXJBZ2VudCkKLSAgICAgICAgc3VidGl0bGUgPSBXZWJJbnNwZWN0 b3IuVUlTdHJpbmcoInVzZXIgYWdlbnQgc3R5bGVzaGVldCIpOwotICAgIGVsc2UgaWYgKGlzVXNl cikKLSAgICAgICAgc3VidGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoInVzZXIgc3R5bGVz aGVldCIpOwotICAgIGVsc2UgaWYgKGlzVmlhSW5zcGVjdG9yKQotICAgICAgICBzdWJ0aXRsZSA9 IFdlYkluc3BlY3Rvci5VSVN0cmluZygidmlhIGluc3BlY3RvciIpOwotICAgIGVsc2UgaWYgKHRo aXMucnVsZSAmJiB0aGlzLnJ1bGUuc291cmNlVVJMKQotICAgICAgICB0aGlzLl9zZWxlY3RvclJl ZkVsZW1lbnQuYXBwZW5kQ2hpbGQobGlua2lmeVVuY29weWFibGUodGhpcy5ydWxlLnNvdXJjZVVS TCwgdGhpcy5ydWxlLnNvdXJjZUxpbmUpKTsKLQotICAgIHRoaXMuaWRlbnRpZmllciA9IHN0eWxl UnVsZS5zZWxlY3RvclRleHQ7Ci0gICAgaWYgKHN1YnRpdGxlKSB7Ci0gICAgICAgIHRoaXMuX3Nl bGVjdG9yUmVmRWxlbWVudC50ZXh0Q29udGVudCA9IHN1YnRpdGxlOwotICAgICAgICB0aGlzLmlk ZW50aWZpZXIgKz0gIjoiICsgc3VidGl0bGU7Ci0gICAgfQotCisgICAgdGhpcy5fc2VsZWN0b3JS ZWZFbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuX2NyZWF0ZVJ1bGVPcmlnaW5Ob2RlKCkpOwogICAg IHNlbGVjdG9yQ29udGFpbmVyLmFwcGVuZENoaWxkKHRoaXMuX3NlbGVjdG9yUmVmRWxlbWVudCk7 CiAgICAgdGhpcy50aXRsZUVsZW1lbnQuYXBwZW5kQ2hpbGQoc2VsZWN0b3JDb250YWluZXIpOwog CkBAIC0xMTMzLDYgKzExMDUsMzIgQEAgV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydGllc1NlY3Rp b24ucHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4gaXRlbTsKICAgICB9LAogCisgICAgX2Ny ZWF0ZVJ1bGVPcmlnaW5Ob2RlOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICBmdW5jdGlvbiBs aW5raWZ5VW5jb3B5YWJsZSh1cmwsIGxpbmUpCisgICAgICAgIHsKKyAgICAgICAgICAgIHZhciBs aW5rID0gV2ViSW5zcGVjdG9yLmxpbmtpZnlSZXNvdXJjZUFzTm9kZSh1cmwsIGxpbmUpOworICAg ICAgICAgICAgbGluay5jbGFzc0xpc3QuYWRkKCJ3ZWJraXQtaHRtbC1yZXNvdXJjZS1saW5rIik7 CisgICAgICAgICAgICBsaW5rLnNldEF0dHJpYnV0ZSgiZGF0YS11bmNvcHlhYmxlIiwgbGluay50 ZXh0Q29udGVudCk7CisgICAgICAgICAgICBsaW5rLnRleHRDb250ZW50ID0gIiI7CisgICAgICAg ICAgICByZXR1cm4gbGluazsKKyAgICAgICAgfQorCisgICAgICAgIGlmICh0aGlzLnN0eWxlUnVs ZS5zb3VyY2VVUkwpCisgICAgICAgICAgICByZXR1cm4gbGlua2lmeVVuY29weWFibGUodGhpcy5z dHlsZVJ1bGUuc291cmNlVVJMLCB0aGlzLnJ1bGUuc291cmNlTGluZSk7CisgICAgICAgIGlmICgh dGhpcy5ydWxlKSAKKyAgICAgICAgICAgIHJldHVybiBkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZSgi Iik7CisKKyAgICAgICAgdmFyIG9yaWdpbiA9ICIiOworICAgICAgICBpZiAodGhpcy5ydWxlLmlz VXNlckFnZW50KQorICAgICAgICAgICAgb3JpZ2luID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJ1 c2VyIGFnZW50IHN0eWxlc2hlZXQiKTsKKyAgICAgICAgZWxzZSBpZiAodGhpcy5ydWxlLmlzVXNl cikKKyAgICAgICAgICAgIG9yaWdpbiA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygidXNlciBzdHls ZXNoZWV0Iik7CisgICAgICAgIGVsc2UgaWYgKHRoaXMucnVsZS5pc1ZpYUluc3BlY3RvcikKKyAg ICAgICAgICAgIG9yaWdpbiA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygidmlhIGluc3BlY3RvciIp OworICAgICAgICByZXR1cm4gZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUob3JpZ2luKTsKKyAgICB9 LAorCiAgICAgX2hhbmRsZUVtcHR5U3BhY2VEb3VibGVDbGljazogZnVuY3Rpb24oZXZlbnQpCiAg ICAgewogICAgICAgICBpZiAoZXZlbnQudGFyZ2V0Lmhhc1N0eWxlQ2xhc3MoImhlYWRlciIpIHx8 IHRoaXMuZWxlbWVudC5oYXNTdHlsZUNsYXNzKCJyZWFkLW9ubHkiKSB8fCBldmVudC50YXJnZXQu ZW5jbG9zaW5nTm9kZU9yU2VsZldpdGhDbGFzcygibWVkaWEiKSkgewpAQCAtMTIyNSw5ICsxMjIz LDYgQEAgV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlID0gewog ICAgICAgICAgICAgdGhpcy5ydWxlID0gbmV3UnVsZTsKICAgICAgICAgICAgIHRoaXMuc3R5bGVS dWxlID0geyBzZWN0aW9uOiB0aGlzLCBzdHlsZTogbmV3UnVsZS5zdHlsZSwgc2VsZWN0b3JUZXh0 OiBuZXdSdWxlLnNlbGVjdG9yVGV4dCwgbWVkaWE6IG5ld1J1bGUubWVkaWEsIHNvdXJjZVVSTDog bmV3UnVsZS5zb3VyY2VVUkwsIHJ1bGU6IG5ld1J1bGUgfTsKIAotICAgICAgICAgICAgdmFyIG9s ZElkZW50aWZpZXIgPSB0aGlzLmlkZW50aWZpZXI7Ci0gICAgICAgICAgICB0aGlzLmlkZW50aWZp ZXIgPSBuZXdSdWxlLnNlbGVjdG9yVGV4dCArICI6IiArIHRoaXMuX3NlbGVjdG9yUmVmRWxlbWVu dC50ZXh0Q29udGVudDsKLQogICAgICAgICAgICAgdGhpcy5wYW5lLnVwZGF0ZSgpOwogCiAgICAg ICAgICAgICB0aGlzLl9tb3ZlRWRpdG9yRnJvbVNlbGVjdG9yKG1vdmVEaXJlY3Rpb24pOwpAQCAt MTMzMyw5ICsxMzI4LDcgQEAgV2ViSW5zcGVjdG9yLkNvbXB1dGVkU3R5bGVQcm9wZXJ0aWVzU2Vj dGlvbi5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgICAgIGZyYWdtZW50LmFwcGVuZENo aWxkKGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKCIgLSAiICsgcHJvcGVydHkudmFsdWUgKyAiICIp KTsKICAgICAgICAgICAgICAgICAgICAgdmFyIHN1YnRpdGxlID0gZnJhZ21lbnQuY3JlYXRlQ2hp bGQoInNwYW4iKTsKICAgICAgICAgICAgICAgICAgICAgc3VidGl0bGUuc3R5bGUuZmxvYXQgPSAi cmlnaHQiOwotICAgICAgICAgICAgICAgICAgICB2YXIgc2VsZWN0b3JSZWYgPSBzZWN0aW9uLl9z ZWxlY3RvclJlZkVsZW1lbnQuY2xvbmVOb2RlKHRydWUpOwotICAgICAgICAgICAgICAgICAgICBm b3IgKHZhciBuID0gMDsgbiA8IHNlbGVjdG9yUmVmLmNoaWxkTm9kZXMubGVuZ3RoOyArK24pCi0g ICAgICAgICAgICAgICAgICAgICAgICBzdWJ0aXRsZS5hcHBlbmRDaGlsZChzZWxlY3RvclJlZi5j aGlsZE5vZGVzW25dKTsKKyAgICAgICAgICAgICAgICAgICAgc3VidGl0bGUuYXBwZW5kQ2hpbGQo c2VjdGlvbi5fY3JlYXRlUnVsZU9yaWdpbk5vZGUoKSk7CiAgICAgICAgICAgICAgICAgICAgIHZh ciBjaGlsZEVsZW1lbnQgPSBuZXcgVHJlZUVsZW1lbnQoZnJhZ21lbnQsIG51bGwsIGZhbHNlKTsK ICAgICAgICAgICAgICAgICAgICAgdHJlZUVsZW1lbnQuYXBwZW5kQ2hpbGQoY2hpbGRFbGVtZW50 KTsKICAgICAgICAgICAgICAgICAgICAgaWYgKHNlY3Rpb24uaXNQcm9wZXJ0eU92ZXJsb2FkZWQo cHJvcGVydHkubmFtZSkpCkBAIC0xNDE5LDcgKzE0MTIsNiBAQCBXZWJJbnNwZWN0b3IuQmxhbmtT dHlsZVByb3BlcnRpZXNTZWN0aW9uLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5lbGVtZW50 LnJlbW92ZVN0eWxlQ2xhc3MoImJsYW5rLXNlY3Rpb24iKTsKICAgICAgICAgdGhpcy5zdHlsZVJ1 bGUgPSBzdHlsZVJ1bGU7CiAgICAgICAgIHRoaXMucnVsZSA9IHN0eWxlUnVsZS5ydWxlOwotICAg ICAgICB0aGlzLmlkZW50aWZpZXIgPSBzdHlsZVJ1bGUuc2VsZWN0b3JUZXh0ICsgIjp2aWEgaW5z cGVjdG9yIjsKIAogICAgICAgICAvLyBGSVhNRTogcmVwbGFjZSB0aGlzIGluc3RhbmNlIGJ5IGEg bm9ybWFsIFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnRpZXNTZWN0aW9uLgogICAgICAgICB0aGlz Ll9ub3JtYWwgPSB0cnVlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9lbGVtZW50c1BhbmVsLmNzcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvZWxlbWVudHNQYW5lbC5jc3MKaW5kZXggMGZjOTRhNTAwMjMzNjhmZjY1MWY4YzIxYjM0 NzNiNzM4ZGRjZDQwYS4uMzZhZTlmM2U1Y2JjMzQ2YjhkZDZjOTczMDg0NWVmYjI5MGNkNjdjYiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9lbGVtZW50c1Bh bmVsLmNzcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2VsZW1lbnRz UGFuZWwuY3NzCkBAIC0yNzIsNiArMjcyLDE1IEBACiAgICAgY29sb3I6IGluaGVyaXQ7CiB9CiAK Ky5zdHlsZXMtc2VjdGlvbiBhW2RhdGEtdW5jb3B5YWJsZV0geworICAgIGRpc3BsYXk6IGlubGlu ZS1ibG9jazsKK30KKworLnN0eWxlcy1zZWN0aW9uIGFbZGF0YS11bmNvcHlhYmxlXTo6YmVmb3Jl IHsKKyAgICBjb250ZW50OiBhdHRyKGRhdGEtdW5jb3B5YWJsZSk7CisgICAgdGV4dC1kZWNvcmF0 aW9uOiB1bmRlcmxpbmU7Cit9CisKIC5zdHlsZXMtc2VjdGlvbiAucHJvcGVydGllcyB7CiAgICAg ZGlzcGxheTogbm9uZTsKICAgICBtYXJnaW46IDA7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggY2U0YjRjODRkNTdlY2RlYmU4 MTJjYzQ3Y2VlZWU3YzljMTlhY2YyOS4uZDc2MGFmYTVkNjE5M2ZiNGIyODExNmU4YzdhMTA5ZDQz MzUwNjYzYSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRl c3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDExLTExLTMwICBBbmRyZXkgS29zeWFr b3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogW3JlZmFj dG9yaW5nXSBkbyBub3QgY2xvbmUgbm9kZXMgdGhhdCBjb250YWluIGxpbmtpZmllZCBVUkxzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MzMyMworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaHR0cC90ZXN0 cy9pbnNwZWN0b3IvZWxlbWVudHMtdGVzdC5qczoKKyAgICAgICAgKGluaXRpYWxpemVfRWxlbWVu dFRlc3QuSW5zcGVjdG9yVGVzdC5kdW1wU2VsZWN0ZWRFbGVtZW50U3R5bGVzKToKKwogMjAxMS0x MS0zMCAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+CiAKICAgICAgICAg VW5yZXZpZXdlZCwgc2tpcCBmYWlsaW5nIHBsYWNlaG9sZGVyIHRlc3RzIG9uIEdUSyBhbmQgYmFz ZWxpbmVzCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9lbGVt ZW50cy10ZXN0LmpzIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvZWxlbWVudHMt dGVzdC5qcwppbmRleCBjZjBlNTk5ZTU0OWYzNjAyYTE4ZTBmOGRlMGQyODZlODY0YjY2ZDFkLi4w YWU0NzBmMDBmOGIxNDk1MTRlMDQ0YTg4OWFjZjY4MmFhOWQ3MDQ5IDEwMDY0NAotLS0gYS9MYXlv dXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9lbGVtZW50cy10ZXN0LmpzCisrKyBiL0xheW91 dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2VsZW1lbnRzLXRlc3QuanMKQEAgLTExMiw2ICsx MTIsMTUgQEAgSW5zcGVjdG9yVGVzdC5zZWxlY3ROb2RlQW5kV2FpdEZvclN0eWxlcyA9IGZ1bmN0 aW9uKGlkVmFsdWUsIGNhbGxiYWNrKQogCiBJbnNwZWN0b3JUZXN0LmR1bXBTZWxlY3RlZEVsZW1l bnRTdHlsZXMgPSBmdW5jdGlvbihleGNsdWRlQ29tcHV0ZWQsIGV4Y2x1ZGVNYXRjaGVkLCBvbWl0 TG9uZ2hhbmRzKQogeworICAgIGZ1bmN0aW9uIGV4dHJhY3RUZXh0KGVsZW1lbnQpCisgICAgewor ICAgICAgICB2YXIgdGV4dCA9IGVsZW1lbnQudGV4dENvbnRlbnQ7CisgICAgICAgIGlmICh0ZXh0 KQorICAgICAgICAgICAgcmV0dXJuIHRleHQ7CisgICAgICAgIGVsZW1lbnQgPSBlbGVtZW50LnF1 ZXJ5U2VsZWN0b3IoIltkYXRhLXVuY29weWFibGVdIik7CisgICAgICAgIHJldHVybiBlbGVtZW50 ID8gZWxlbWVudC5nZXRBdHRyaWJ1dGUoImRhdGEtdW5jb3B5YWJsZSIpIDogIiI7CisgICAgfQor CiAgICAgdmFyIHN0eWxlU2VjdGlvbnMgPSBXZWJJbnNwZWN0b3IucGFuZWxzLmVsZW1lbnRzLnNp ZGViYXJQYW5lcy5zdHlsZXMuc2VjdGlvbnM7CiAgICAgZm9yICh2YXIgcHNldWRvSWQgaW4gc3R5 bGVTZWN0aW9ucykgewogICAgICAgICB2YXIgcHNldWRvTmFtZSA9IFdlYkluc3BlY3Rvci5TdHls ZXNTaWRlYmFyUGFuZS5Qc2V1ZG9JZE5hbWVzW3BzZXVkb0lkXTsKQEAgLTEzMiw3ICsxNDEsNyBA QCBJbnNwZWN0b3JUZXN0LmR1bXBTZWxlY3RlZEVsZW1lbnRTdHlsZXMgPSBmdW5jdGlvbihleGNs dWRlQ29tcHV0ZWQsIGV4Y2x1ZGVNYXRjaAogICAgICAgICAgICAgICAgIGlmIChjaGFpbkVudHJ5 LmNoaWxkcmVuWzJdKQogICAgICAgICAgICAgICAgICAgICBlbnRyeUxpbmUgKz0gIiAiICsgY2hh aW5FbnRyeS5jaGlsZHJlblsxXS50ZXh0Q29udGVudDsKICAgICAgICAgICAgICAgICBpZiAoY2hh aW5FbnRyeS5jaGlsZHJlbi5sZW5ndGggPiAxKQotICAgICAgICAgICAgICAgICAgICBlbnRyeUxp bmUgKz0gIiAoIiArIGNoYWluRW50cnkubGFzdENoaWxkLnRleHRDb250ZW50ICsgIikiOworICAg ICAgICAgICAgICAgICAgICBlbnRyeUxpbmUgKz0gIiAoIiArIGV4dHJhY3RUZXh0KGNoYWluRW50 cnkubGFzdENoaWxkKSArICIpIjsKICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJl c3VsdChlbnRyeUxpbmUpOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgc2VjdGlvbi5leHBh bmQoKTsK