143814 2015-04-15 21:18:09 -0700 Web Inspector: Allow toggling the edibility of a DOMTreeOutline 2015-04-16 13:34:50 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck burg commit-queue graouts joepeck jonowells mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1085825 0 joepeck 2015-04-15 21:18:09 -0700 * SUMMARY Allow toggling the edibility of a DOMTreeOutline. A DOMTreeOutline in the console should not be editable. You can "Reveal in DOM Tree" to edit from the DOM tree. ObjectTree's themselves are not editable right now. A DOMTreeContentView should always have editable DOMTreeOutlines. 1085826 1 webkit-bug-importer 2015-04-15 21:18:22 -0700 <rdar://problem/20565653> 1085827 2 250896 joepeck 2015-04-15 21:27:08 -0700 Created attachment 250896 [PATCH] Proposed Fix 1085831 3 joepeck 2015-04-15 21:33:32 -0700 Patch doesn't apply because it relies on an earlier change in very similar code. 1085924 4 250896 burg 2015-04-16 08:20:42 -0700 Comment on attachment 250896 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=250896&action=review Very interesting, I made nearly the exact same change in my branch. (Snapshotted DOM nodes aren't editable either.) It seems you missed DOMTreeElement._canAddAttributes (set in constructor) and disabling draggability (DOM elements are configured in onattach). Once these cases are fixed this patch should be ready to go. > Source/WebInspectorUI/UserInterface/Views/DOMTreeOutline.js:146 > + set editable(x) I would prefer 'value' rather than 'x'. 1086004 5 joepeck 2015-04-16 11:56:34 -0700 (In reply to comment #4) > Comment on attachment 250896 [details] > [PATCH] Proposed Fix > > View in context: > https://bugs.webkit.org/attachment.cgi?id=250896&action=review > > Very interesting, I made nearly the exact same change in my branch. > (Snapshotted DOM nodes aren't editable either.) > > It seems you missed DOMTreeElement._canAddAttributes (set in constructor) > and disabling draggability (DOM elements are configured in onattach). Once > these cases are fixed this patch should be ready to go. Great catches! 1086033 6 joepeck 2015-04-16 13:02:50 -0700 > It seems you missed DOMTreeElement._canAddAttributes (set in constructor) This seems like it should stay unaffected. This essentially distinguishes that this DOMTreeElement is the opening tag of an element, so if it was editable attributes can be added. Perhaps it should be renamed. > and disabling draggability (DOM elements are configured in onattach). Yep! 1086035 7 250943 joepeck 2015-04-16 13:04:16 -0700 Created attachment 250943 [PATCH] Proposed Fix 1086037 8 joepeck 2015-04-16 13:09:41 -0700 > > Source/WebInspectorUI/UserInterface/Views/DOMTreeOutline.js:146 > > + set editable(x) > > I would prefer 'value' rather than 'x'. Oops, I forgot about this. We tend to use x pretty consistently though. Especially for short functions. 1086053 9 250943 burg 2015-04-16 13:26:11 -0700 Comment on attachment 250943 [PATCH] Proposed Fix r=me 1086054 10 joepeck 2015-04-16 13:34:50 -0700 http://trac.webkit.org/changeset/182905 250896 2015-04-15 21:27:08 -0700 2015-04-16 13:04:16 -0700 [PATCH] Proposed Fix editability.patch text/plain 8723 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDNkNDQ1MTkuLmU0NzIyZjIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQxIEBACiAyMDE1LTA0LTE1ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQWxsb3cg dG9nZ2xpbmcgdGhlIGVkaWJpbGl0eSBvZiBhIERPTVRyZWVPdXRsaW5lCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDM4MTQKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBCeSBkZWZhdWx0IGEgRE9NVHJlZU91 dGxpbmUgd2lsbCBub3QgYmUgZWRpdGFibGUsIGJ1dCBpdCB3aWxsCisgICAgICAgIHByb3ZpZGUg YSBzZXR0ZXIgdG8gZW5hYmxlIGVkaXRhYmlsaXR5IGZvciBET01UcmVlQ29udGVudFZpZXdzLgor CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlQ29udGVudFZpZXcuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuRE9NVHJlZUNvbnRlbnRWaWV3KToKKyAgICAgICAgQ29udGVu dCBWaWV3cyBhbHdheXMgaGF2ZSBlZGl0YWJsZSBET00gdHJlZXMuCisKKyAgICAgICAgKiBVc2Vy SW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVFbGVtZW50LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkRPTVRyZWVFbGVtZW50LnByb3RvdHlwZS5nZXQgZWRpdGFibGUpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkRPTVRyZWVFbGVtZW50LnByb3RvdHlwZS5vbmRlbGV0ZSk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuRE9NVHJlZUVsZW1lbnQucHJvdG90eXBlLm9uZW50ZXIpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkRPTVRyZWVFbGVtZW50LnByb3RvdHlwZS5vbmRibGNsaWNrKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5ET01UcmVlRWxlbWVudC5wcm90b3R5cGUuX3BvcHVsYXRlVGFnQ29udGV4 dE1lbnUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTVRyZWVFbGVtZW50LnByb3RvdHlwZS5f cG9wdWxhdGVUZXh0Q29udGV4dE1lbnUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTVRyZWVF bGVtZW50LnByb3RvdHlwZS5fcG9wdWxhdGVOb2RlQ29udGV4dE1lbnUpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkRPTVRyZWVFbGVtZW50LnByb3RvdHlwZS5fc3RhcnRFZGl0aW5nKToKKyAgICAg ICAgRG8gbm90IHByb3ZpZGUgZWRpdGFiaWxpdHkgb3B0aW9ucyBmb3Igc2hhZG93IERPTSBvciBu b24tZWRpdGFibGUgRE9NIHRyZWUuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0RP TVRyZWVPdXRsaW5lLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTVRyZWVPdXRsaW5lKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5ET01UcmVlT3V0bGluZS5wcm90b3R5cGUuZ2V0IGVkaXRh YmxlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5ET01UcmVlT3V0bGluZS5wcm90b3R5cGUuc2V0 IGVkaXRhYmxlKToKKyAgICAgICAgTmV3IHN0YXRlLgorCisgICAgICAgICogVXNlckludGVyZmFj ZS9WaWV3cy9Gb3JtYXR0ZWRWYWx1ZS5jc3M6CisgICAgICAgICguZm9ybWF0dGVkLW5vZGUgPiAu ZG9tLXRyZWUtb3V0bGluZSBsaSk6CisgICAgICAgIE5vZGVzIGluc2lkZSBvYmplY3QgdHJlZXMg d2VyZSBzaG93aW5nIHRleHQgc2VsZWN0aW9uIHdoZW4geW91IHJpZ2h0CisgICAgICAgIGNsaWNr ZWQgdGhlbS4gTm9ybWFsIHNlbGVjdGlvbiBpcyBub3QgcG9zc2libGUuIFNvIGZvcmNlIG5vIHNl bGVjdGlvbi4KKworMjAxNS0wNC0xNSAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUu Y29tPgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IEdpdmUgRE9NIE5vZGVzIGEgQ29udGV4dCBN ZW51IHRvIExvZyBFbGVtZW50IHRvIHRoZSBjb25zb2xlCiAgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDM4MTMKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZUNvbnRlbnRWaWV3LmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZUNvbnRlbnRW aWV3LmpzCmluZGV4IDM4NWRlMDkuLjA5MjU3OGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVDb250ZW50Vmlldy5qcworKysgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlQ29udGVudFZp ZXcuanMKQEAgLTU5LDYgKzU5LDcgQEAgV2ViSW5zcGVjdG9yLkRPTVRyZWVDb250ZW50VmlldyA9 IGZ1bmN0aW9uKHJlcHJlc2VudGVkT2JqZWN0KQogICAgIHRoaXMuX2RvbVRyZWVPdXRsaW5lID0g bmV3IFdlYkluc3BlY3Rvci5ET01UcmVlT3V0bGluZSh0cnVlLCB0cnVlLCB0cnVlKTsKICAgICB0 aGlzLl9kb21UcmVlT3V0bGluZS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5ET01UcmVl T3V0bGluZS5FdmVudC5TZWxlY3RlZE5vZGVDaGFuZ2VkLCB0aGlzLl9zZWxlY3RlZE5vZGVEaWRD aGFuZ2UsIHRoaXMpOwogICAgIHRoaXMuX2RvbVRyZWVPdXRsaW5lLndpcmVUb0RvbUFnZW50KCk7 CisgICAgdGhpcy5fZG9tVHJlZU91dGxpbmUuZWRpdGFibGUgPSB0cnVlOwogICAgIHRoaXMuZWxl bWVudC5hcHBlbmRDaGlsZCh0aGlzLl9kb21UcmVlT3V0bGluZS5lbGVtZW50KTsKIAogICAgIFdl Ykluc3BlY3Rvci5kb21UcmVlTWFuYWdlci5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5E T01UcmVlTWFuYWdlci5FdmVudC5BdHRyaWJ1dGVNb2RpZmllZCwgdGhpcy5fZG9tTm9kZUNoYW5n ZWQsIHRoaXMpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvRE9NVHJlZUVsZW1lbnQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9ET01UcmVlRWxlbWVudC5qcwppbmRleCBkNTcyZDk5Li43MzY3Yzg2IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01U cmVlRWxlbWVudC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9ET01UcmVlRWxlbWVudC5qcwpAQCAtMTU3LDYgKzE1NywxNCBAQCBXZWJJbnNwZWN0b3Iu RE9NVHJlZUVsZW1lbnQgPSBjbGFzcyBET01UcmVlRWxlbWVudCBleHRlbmRzIFdlYkluc3BlY3Rv ci5UcmVlRWxlbQogICAgICAgICB9CiAgICAgfQogCisgICAgZ2V0IGVkaXRhYmxlKCkKKyAgICB7 CisgICAgICAgIGlmICh0aGlzLnJlcHJlc2VudGVkT2JqZWN0LmlzSW5TaGFkb3dUcmVlKCkpCisg ICAgICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICAgICAgcmV0dXJuIHRoaXMudHJlZU91dGxp bmUuZWRpdGFibGU7CisgICAgfQorCiAgICAgZ2V0IGV4cGFuZGVkQ2hpbGRyZW5MaW1pdCgpCiAg ICAgewogICAgICAgICByZXR1cm4gdGhpcy5fZXhwYW5kZWRDaGlsZHJlbkxpbWl0OwpAQCAtNDkw LDcgKzQ5OCw3IEBAIFdlYkluc3BlY3Rvci5ET01UcmVlRWxlbWVudCA9IGNsYXNzIERPTVRyZWVF bGVtZW50IGV4dGVuZHMgV2ViSW5zcGVjdG9yLlRyZWVFbGVtCiAKICAgICBvbmRlbGV0ZSgpCiAg ICAgewotICAgICAgICBpZiAodGhpcy5yZXByZXNlbnRlZE9iamVjdC5pc0luU2hhZG93VHJlZSgp KQorICAgICAgICBpZiAoIXRoaXMuZWRpdGFibGUpCiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7 CiAKICAgICAgICAgdmFyIHN0YXJ0VGFnVHJlZUVsZW1lbnQgPSB0aGlzLnRyZWVPdXRsaW5lLmZp bmRUcmVlRWxlbWVudCh0aGlzLnJlcHJlc2VudGVkT2JqZWN0KTsKQEAgLTUwMyw2ICs1MTEsOSBA QCBXZWJJbnNwZWN0b3IuRE9NVHJlZUVsZW1lbnQgPSBjbGFzcyBET01UcmVlRWxlbWVudCBleHRl bmRzIFdlYkluc3BlY3Rvci5UcmVlRWxlbQogCiAgICAgb25lbnRlcigpCiAgICAgeworICAgICAg ICBpZiAoIXRoaXMuZWRpdGFibGUpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisKICAgICAg ICAgLy8gT24gRW50ZXIgb3IgUmV0dXJuIHN0YXJ0IGVkaXRpbmcgdGhlIGZpcnN0IGF0dHJpYnV0 ZQogICAgICAgICAvLyBvciBjcmVhdGUgYSBuZXcgYXR0cmlidXRlIG9uIHRoZSBzZWxlY3RlZCBl bGVtZW50LgogICAgICAgICBpZiAodGhpcy50cmVlT3V0bGluZS5lZGl0aW5nKQpAQCAtNTI4LDYg KzUzOSw5IEBAIFdlYkluc3BlY3Rvci5ET01UcmVlRWxlbWVudCA9IGNsYXNzIERPTVRyZWVFbGVt ZW50IGV4dGVuZHMgV2ViSW5zcGVjdG9yLlRyZWVFbGVtCiAKICAgICBvbmRibGNsaWNrKGV2ZW50 KQogICAgIHsKKyAgICAgICAgaWYgKCF0aGlzLmVkaXRhYmxlKQorICAgICAgICAgICAgcmV0dXJu IGZhbHNlOworCiAgICAgICAgIGlmICh0aGlzLl9lZGl0aW5nIHx8IHRoaXMuX2VsZW1lbnRDbG9z ZVRhZykKICAgICAgICAgICAgIHJldHVybjsKIApAQCAtNTg2LDEwICs2MDAsMTIgQEAgV2ViSW5z cGVjdG9yLkRPTVRyZWVFbGVtZW50ID0gY2xhc3MgRE9NVHJlZUVsZW1lbnQgZXh0ZW5kcyBXZWJJ bnNwZWN0b3IuVHJlZUVsZW0KICAgICAgICAgICAgIHZhciBhdHRyaWJ1dGUgPSBldmVudC50YXJn ZXQuZW5jbG9zaW5nTm9kZU9yU2VsZldpdGhDbGFzcygiaHRtbC1hdHRyaWJ1dGUiKTsKIAogICAg ICAgICAgICAgLy8gQWRkIGF0dHJpYnV0ZS1yZWxhdGVkIGFjdGlvbnMuCi0gICAgICAgICAgICBj b250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmluZygiQWRkIEF0dHJpYnV0 ZSIpLCB0aGlzLl9hZGROZXdBdHRyaWJ1dGUuYmluZCh0aGlzKSk7Ci0gICAgICAgICAgICBpZiAo YXR0cmlidXRlKQotICAgICAgICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5z cGVjdG9yLlVJU3RyaW5nKCJFZGl0IEF0dHJpYnV0ZSIpLCB0aGlzLl9zdGFydEVkaXRpbmdBdHRy aWJ1dGUuYmluZCh0aGlzLCBhdHRyaWJ1dGUsIGV2ZW50LnRhcmdldCkpOwotICAgICAgICAgICAg Y29udGV4dE1lbnUuYXBwZW5kU2VwYXJhdG9yKCk7CisgICAgICAgICAgICBpZiAodGhpcy5lZGl0 YWJsZSkgeworICAgICAgICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVj dG9yLlVJU3RyaW5nKCJBZGQgQXR0cmlidXRlIiksIHRoaXMuX2FkZE5ld0F0dHJpYnV0ZS5iaW5k KHRoaXMpKTsKKyAgICAgICAgICAgICAgICBpZiAoYXR0cmlidXRlKQorICAgICAgICAgICAgICAg ICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmluZygiRWRpdCBB dHRyaWJ1dGUiKSwgdGhpcy5fc3RhcnRFZGl0aW5nQXR0cmlidXRlLmJpbmQodGhpcywgYXR0cmli dXRlLCBldmVudC50YXJnZXQpKTsKKyAgICAgICAgICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRT ZXBhcmF0b3IoKTsKKyAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgaWYgKFdlYkluc3BlY3Rv ci5jc3NTdHlsZU1hbmFnZXIuY2FuRm9yY2VQc2V1ZG9DbGFzc2VzKCkpIHsKICAgICAgICAgICAg ICAgICB2YXIgcHNldWRvU3ViTWVudSA9IGNvbnRleHRNZW51LmFwcGVuZFN1Yk1lbnVJdGVtKFdl Ykluc3BlY3Rvci5VSVN0cmluZygiRm9yY2VkIFBzZXVkby1DbGFzc2VzIikpOwpAQCAtNjE4LDgg KzYzNCw3IEBAIFdlYkluc3BlY3Rvci5ET01UcmVlRWxlbWVudCA9IGNsYXNzIERPTVRyZWVFbGVt ZW50IGV4dGVuZHMgV2ViSW5zcGVjdG9yLlRyZWVFbGVtCiAKICAgICBfcG9wdWxhdGVUZXh0Q29u dGV4dE1lbnUoY29udGV4dE1lbnUsIHRleHROb2RlKQogICAgIHsKLSAgICAgICAgdmFyIG5vZGUg PSB0aGlzLnJlcHJlc2VudGVkT2JqZWN0OwotICAgICAgICBpZiAoIW5vZGUuaXNJblNoYWRvd1Ry ZWUoKSkKKyAgICAgICAgaWYgKHRoaXMuZWRpdGFibGUpCiAgICAgICAgICAgICBjb250ZXh0TWVu dS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmluZygiRWRpdCBUZXh0IiksIHRoaXMuX3N0 YXJ0RWRpdGluZ1RleHROb2RlLmJpbmQodGhpcywgdGV4dE5vZGUpKTsKIAogICAgICAgICB0aGlz Ll9wb3B1bGF0ZU5vZGVDb250ZXh0TWVudShjb250ZXh0TWVudSk7CkBAIC02MjgsMTEgKzY0Mywx MCBAQCBXZWJJbnNwZWN0b3IuRE9NVHJlZUVsZW1lbnQgPSBjbGFzcyBET01UcmVlRWxlbWVudCBl eHRlbmRzIFdlYkluc3BlY3Rvci5UcmVlRWxlbQogICAgIF9wb3B1bGF0ZU5vZGVDb250ZXh0TWVu dShjb250ZXh0TWVudSkKICAgICB7CiAgICAgICAgIC8vIEFkZCBmcmVlLWZvcm0gbm9kZS1yZWxh dGVkIGFjdGlvbnMuCi0gICAgICAgIHZhciBub2RlID0gdGhpcy5yZXByZXNlbnRlZE9iamVjdDsK LSAgICAgICAgaWYgKCFub2RlLmlzSW5TaGFkb3dUcmVlKCkpCisgICAgICAgIGlmICh0aGlzLmVk aXRhYmxlKQogICAgICAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3Iu VUlTdHJpbmcoIkVkaXQgYXMgSFRNTCIpLCB0aGlzLl9lZGl0QXNIVE1MLmJpbmQodGhpcykpOwog ICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmluZygiQ29w eSBhcyBIVE1MIiksIHRoaXMuX2NvcHlIVE1MLmJpbmQodGhpcykpOwotICAgICAgICBpZiAoIW5v ZGUuaXNJblNoYWRvd1RyZWUoKSkKKyAgICAgICAgaWYgKHRoaXMuZWRpdGFibGUpCiAgICAgICAg ICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmluZygiRGVsZXRl IE5vZGUiKSwgdGhpcy5yZW1vdmUuYmluZCh0aGlzKSk7CiAgICAgfQogCkBAIC02NDEsNyArNjU1 LDcgQEAgV2ViSW5zcGVjdG9yLkRPTVRyZWVFbGVtZW50ID0gY2xhc3MgRE9NVHJlZUVsZW1lbnQg ZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVHJlZUVsZW0KICAgICAgICAgaWYgKHRoaXMudHJlZU91dGxp bmUuc2VsZWN0ZWRET01Ob2RlKCkgIT09IHRoaXMucmVwcmVzZW50ZWRPYmplY3QpCiAgICAgICAg ICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICAgICAgaWYgKHRoaXMucmVwcmVzZW50ZWRPYmplY3Qu aXNJblNoYWRvd1RyZWUoKSkKKyAgICAgICAgaWYgKCF0aGlzLmVkaXRhYmxlKQogICAgICAgICAg ICAgcmV0dXJuIGZhbHNlOwogCiAgICAgICAgIHZhciBsaXN0SXRlbSA9IHRoaXMuX2xpc3RJdGVt Tm9kZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0RPTVRyZWVPdXRsaW5lLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvRE9NVHJlZU91dGxpbmUuanMKaW5kZXggNjUyZDU5Ni4uMjliYzcxNyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZU91 dGxpbmUuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv RE9NVHJlZU91dGxpbmUuanMKQEAgLTU0LDYgKzU0LDcgQEAgV2ViSW5zcGVjdG9yLkRPTVRyZWVP dXRsaW5lID0gY2xhc3MgRE9NVHJlZU91dGxpbmUgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVHJlZU91 dGwKICAgICAgICAgdGhpcy5fcm9vdERPTU5vZGUgPSBudWxsOwogICAgICAgICB0aGlzLl9zZWxl Y3RlZERPTU5vZGUgPSBudWxsOwogCisgICAgICAgIHRoaXMuX2VkaXRhYmxlID0gZmFsc2U7CiAg ICAgICAgIHRoaXMuX2VkaXRpbmcgPSBmYWxzZTsKICAgICAgICAgdGhpcy5fdmlzaWJsZSA9IGZh bHNlOwogCkBAIC0xMzcsNiArMTM4LDE2IEBAIFdlYkluc3BlY3Rvci5ET01UcmVlT3V0bGluZSA9 IGNsYXNzIERPTVRyZWVPdXRsaW5lIGV4dGVuZHMgV2ViSW5zcGVjdG9yLlRyZWVPdXRsCiAgICAg ICAgICAgICB0aGlzLl9zZWxlY3RlZE5vZGVDaGFuZ2VkKCk7CiAgICAgfQogCisgICAgZ2V0IGVk aXRhYmxlKCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl9lZGl0YWJsZTsKKyAgICB9CisK KyAgICBzZXQgZWRpdGFibGUoeCkKKyAgICB7CisgICAgICAgIHRoaXMuX2VkaXRhYmxlID0geDsK KyAgICB9CisKICAgICBnZXQgZWRpdGluZygpCiAgICAgewogICAgICAgICByZXR1cm4gdGhpcy5f ZWRpdGluZzsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0Zvcm1hdHRlZFZhbHVlLmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL0Zvcm1hdHRlZFZhbHVlLmNzcwppbmRleCA2OGRkMjRmLi4wY2UzNGY2IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Gb3Jt YXR0ZWRWYWx1ZS5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvRm9ybWF0dGVkVmFsdWUuY3NzCkBAIC03Miw2ICs3MiwxMCBAQAogICAgIC13ZWJraXQt cGFkZGluZy1zdGFydDogMTJweDsKIH0KIAorLmZvcm1hdHRlZC1ub2RlID4gLmRvbS10cmVlLW91 dGxpbmUgbGkgeworICAgIC13ZWJraXQtdXNlci1zZWxlY3Q6IG5vbmUgIWltcG9ydGFudDsKK30K KwogLmZvcm1hdHRlZC1ub2RlID4gLmRvbS10cmVlLW91dGxpbmUgbGkuaG92ZXJlZDpub3QoLnNl bGVjdGVkKSAuc2VsZWN0aW9uIHsKICAgICBkaXNwbGF5OiBibG9jazsKICAgICBsZWZ0OiAtMXB4 Owo= 250943 2015-04-16 13:04:16 -0700 2015-04-16 13:32:52 -0700 [PATCH] Proposed Fix v2.patch text/plain 9234 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDc0MGJkZmUuLjliODQzZjkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQyIEBACiAyMDE1LTA0LTE2ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQWxsb3cg dG9nZ2xpbmcgdGhlIGVkaWJpbGl0eSBvZiBhIERPTVRyZWVPdXRsaW5lCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDM4MTQKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBCeSBkZWZhdWx0IGEgRE9NVHJlZU91 dGxpbmUgd2lsbCBub3QgYmUgZWRpdGFibGUsIGJ1dCBpdCB3aWxsCisgICAgICAgIHByb3ZpZGUg YSBzZXR0ZXIgdG8gZW5hYmxlIGVkaXRhYmlsaXR5IGZvciBET01UcmVlQ29udGVudFZpZXdzLgor CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlQ29udGVudFZpZXcuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuRE9NVHJlZUNvbnRlbnRWaWV3KToKKyAgICAgICAgQ29udGVu dCBWaWV3cyBhbHdheXMgaGF2ZSBlZGl0YWJsZSBET00gdHJlZXMuCisKKyAgICAgICAgKiBVc2Vy SW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVFbGVtZW50LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkRPTVRyZWVFbGVtZW50LnByb3RvdHlwZS5nZXQgZWRpdGFibGUpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkRPTVRyZWVFbGVtZW50LnByb3RvdHlwZS5vbmF0dGFjaCk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuRE9NVHJlZUVsZW1lbnQucHJvdG90eXBlLm9uZGVsZXRlKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5ET01UcmVlRWxlbWVudC5wcm90b3R5cGUub25lbnRlcik6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuRE9NVHJlZUVsZW1lbnQucHJvdG90eXBlLm9uZGJsY2xpY2spOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLkRPTVRyZWVFbGVtZW50LnByb3RvdHlwZS5fcG9wdWxhdGVUYWdDb250 ZXh0TWVudSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRE9NVHJlZUVsZW1lbnQucHJvdG90eXBl Ll9wb3B1bGF0ZVRleHRDb250ZXh0TWVudSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRE9NVHJl ZUVsZW1lbnQucHJvdG90eXBlLl9wb3B1bGF0ZU5vZGVDb250ZXh0TWVudSk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuRE9NVHJlZUVsZW1lbnQucHJvdG90eXBlLl9zdGFydEVkaXRpbmcpOgorICAg ICAgICBEbyBub3QgcHJvdmlkZSBlZGl0YWJpbGl0eSBvcHRpb25zIGZvciBzaGFkb3cgRE9NIG9y IG5vbi1lZGl0YWJsZSBET00gdHJlZS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3Mv RE9NVHJlZU91dGxpbmUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRE9NVHJlZU91dGxpbmUp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTVRyZWVPdXRsaW5lLnByb3RvdHlwZS5nZXQgZWRp dGFibGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTVRyZWVPdXRsaW5lLnByb3RvdHlwZS5z ZXQgZWRpdGFibGUpOgorICAgICAgICBOZXcgc3RhdGUuCisKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL1ZpZXdzL0Zvcm1hdHRlZFZhbHVlLmNzczoKKyAgICAgICAgKC5mb3JtYXR0ZWQtbm9kZSA+ IC5kb20tdHJlZS1vdXRsaW5lIGxpKToKKyAgICAgICAgTm9kZXMgaW5zaWRlIG9iamVjdCB0cmVl cyB3ZXJlIHNob3dpbmcgdGV4dCBzZWxlY3Rpb24gd2hlbiB5b3UgcmlnaHQKKyAgICAgICAgY2xp Y2tlZCB0aGVtLiBOb3JtYWwgc2VsZWN0aW9uIGlzIG5vdCBwb3NzaWJsZS4gU28gZm9yY2Ugbm8g c2VsZWN0aW9uLgorCisyMDE1LTA0LTE2ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBs ZS5jb20+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogR2l2ZSBET00gTm9kZXMgYSBDb250ZXh0 IE1lbnUgdG8gTG9nIEVsZW1lbnQgdG8gdGhlIGNvbnNvbGUKICAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MzgxMwogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlQ29udGVudFZpZXcuanMg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlQ29udGVu dFZpZXcuanMKaW5kZXggMzg1ZGUwOS4uMDkyNTc4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZUNvbnRlbnRWaWV3LmpzCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVDb250ZW50 Vmlldy5qcwpAQCAtNTksNiArNTksNyBAQCBXZWJJbnNwZWN0b3IuRE9NVHJlZUNvbnRlbnRWaWV3 ID0gZnVuY3Rpb24ocmVwcmVzZW50ZWRPYmplY3QpCiAgICAgdGhpcy5fZG9tVHJlZU91dGxpbmUg PSBuZXcgV2ViSW5zcGVjdG9yLkRPTVRyZWVPdXRsaW5lKHRydWUsIHRydWUsIHRydWUpOwogICAg IHRoaXMuX2RvbVRyZWVPdXRsaW5lLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRPTVRy ZWVPdXRsaW5lLkV2ZW50LlNlbGVjdGVkTm9kZUNoYW5nZWQsIHRoaXMuX3NlbGVjdGVkTm9kZURp ZENoYW5nZSwgdGhpcyk7CiAgICAgdGhpcy5fZG9tVHJlZU91dGxpbmUud2lyZVRvRG9tQWdlbnQo KTsKKyAgICB0aGlzLl9kb21UcmVlT3V0bGluZS5lZGl0YWJsZSA9IHRydWU7CiAgICAgdGhpcy5l bGVtZW50LmFwcGVuZENoaWxkKHRoaXMuX2RvbVRyZWVPdXRsaW5lLmVsZW1lbnQpOwogCiAgICAg V2ViSW5zcGVjdG9yLmRvbVRyZWVNYW5hZ2VyLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9y LkRPTVRyZWVNYW5hZ2VyLkV2ZW50LkF0dHJpYnV0ZU1vZGlmaWVkLCB0aGlzLl9kb21Ob2RlQ2hh bmdlZCwgdGhpcyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9ET01UcmVlRWxlbWVudC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVFbGVtZW50LmpzCmluZGV4IGQ1NzJkOTkuLjhlZTU1OWYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RP TVRyZWVFbGVtZW50LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0RPTVRyZWVFbGVtZW50LmpzCkBAIC0xNTcsNiArMTU3LDE0IEBAIFdlYkluc3BlY3Rv ci5ET01UcmVlRWxlbWVudCA9IGNsYXNzIERPTVRyZWVFbGVtZW50IGV4dGVuZHMgV2ViSW5zcGVj dG9yLlRyZWVFbGVtCiAgICAgICAgIH0KICAgICB9CiAKKyAgICBnZXQgZWRpdGFibGUoKQorICAg IHsKKyAgICAgICAgaWYgKHRoaXMucmVwcmVzZW50ZWRPYmplY3QuaXNJblNoYWRvd1RyZWUoKSkK KyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgICAgICByZXR1cm4gdGhpcy50cmVlT3V0 bGluZS5lZGl0YWJsZTsKKyAgICB9CisKICAgICBnZXQgZXhwYW5kZWRDaGlsZHJlbkxpbWl0KCkK ICAgICB7CiAgICAgICAgIHJldHVybiB0aGlzLl9leHBhbmRlZENoaWxkcmVuTGltaXQ7CkBAIC0y NjgsOCArMjc2LDExIEBAIFdlYkluc3BlY3Rvci5ET01UcmVlRWxlbWVudCA9IGNsYXNzIERPTVRy ZWVFbGVtZW50IGV4dGVuZHMgV2ViSW5zcGVjdG9yLlRyZWVFbGVtCiAgICAgICAgIH0KIAogICAg ICAgICB0aGlzLnVwZGF0ZVRpdGxlKCk7Ci0gICAgICAgIHRoaXMubGlzdEl0ZW1FbGVtZW50LmRy YWdnYWJsZSA9IHRydWU7Ci0gICAgICAgIHRoaXMubGlzdEl0ZW1FbGVtZW50LmFkZEV2ZW50TGlz dGVuZXIoImRyYWdzdGFydCIsIHRoaXMpOworCisgICAgICAgIGlmICh0aGlzLmVkaXRhYmxlKSB7 CisgICAgICAgICAgICB0aGlzLmxpc3RJdGVtRWxlbWVudC5kcmFnZ2FibGUgPSB0cnVlOworICAg ICAgICAgICAgdGhpcy5saXN0SXRlbUVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiZHJhZ3N0YXJ0 IiwgdGhpcyk7CisgICAgICAgIH0KICAgICB9CiAKICAgICBvbnBvcHVsYXRlKCkKQEAgLTQ5MCw3 ICs1MDEsNyBAQCBXZWJJbnNwZWN0b3IuRE9NVHJlZUVsZW1lbnQgPSBjbGFzcyBET01UcmVlRWxl bWVudCBleHRlbmRzIFdlYkluc3BlY3Rvci5UcmVlRWxlbQogCiAgICAgb25kZWxldGUoKQogICAg IHsKLSAgICAgICAgaWYgKHRoaXMucmVwcmVzZW50ZWRPYmplY3QuaXNJblNoYWRvd1RyZWUoKSkK KyAgICAgICAgaWYgKCF0aGlzLmVkaXRhYmxlKQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwog CiAgICAgICAgIHZhciBzdGFydFRhZ1RyZWVFbGVtZW50ID0gdGhpcy50cmVlT3V0bGluZS5maW5k VHJlZUVsZW1lbnQodGhpcy5yZXByZXNlbnRlZE9iamVjdCk7CkBAIC01MDMsNiArNTE0LDkgQEAg V2ViSW5zcGVjdG9yLkRPTVRyZWVFbGVtZW50ID0gY2xhc3MgRE9NVHJlZUVsZW1lbnQgZXh0ZW5k cyBXZWJJbnNwZWN0b3IuVHJlZUVsZW0KIAogICAgIG9uZW50ZXIoKQogICAgIHsKKyAgICAgICAg aWYgKCF0aGlzLmVkaXRhYmxlKQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworCiAgICAgICAg IC8vIE9uIEVudGVyIG9yIFJldHVybiBzdGFydCBlZGl0aW5nIHRoZSBmaXJzdCBhdHRyaWJ1dGUK ICAgICAgICAgLy8gb3IgY3JlYXRlIGEgbmV3IGF0dHJpYnV0ZSBvbiB0aGUgc2VsZWN0ZWQgZWxl bWVudC4KICAgICAgICAgaWYgKHRoaXMudHJlZU91dGxpbmUuZWRpdGluZykKQEAgLTUyOCw2ICs1 NDIsOSBAQCBXZWJJbnNwZWN0b3IuRE9NVHJlZUVsZW1lbnQgPSBjbGFzcyBET01UcmVlRWxlbWVu dCBleHRlbmRzIFdlYkluc3BlY3Rvci5UcmVlRWxlbQogCiAgICAgb25kYmxjbGljayhldmVudCkK ICAgICB7CisgICAgICAgIGlmICghdGhpcy5lZGl0YWJsZSkKKyAgICAgICAgICAgIHJldHVybiBm YWxzZTsKKwogICAgICAgICBpZiAodGhpcy5fZWRpdGluZyB8fCB0aGlzLl9lbGVtZW50Q2xvc2VU YWcpCiAgICAgICAgICAgICByZXR1cm47CiAKQEAgLTU4NiwxMCArNjAzLDEyIEBAIFdlYkluc3Bl Y3Rvci5ET01UcmVlRWxlbWVudCA9IGNsYXNzIERPTVRyZWVFbGVtZW50IGV4dGVuZHMgV2ViSW5z cGVjdG9yLlRyZWVFbGVtCiAgICAgICAgICAgICB2YXIgYXR0cmlidXRlID0gZXZlbnQudGFyZ2V0 LmVuY2xvc2luZ05vZGVPclNlbGZXaXRoQ2xhc3MoImh0bWwtYXR0cmlidXRlIik7CiAKICAgICAg ICAgICAgIC8vIEFkZCBhdHRyaWJ1dGUtcmVsYXRlZCBhY3Rpb25zLgotICAgICAgICAgICAgY29u dGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkFkZCBBdHRyaWJ1dGUi KSwgdGhpcy5fYWRkTmV3QXR0cmlidXRlLmJpbmQodGhpcykpOwotICAgICAgICAgICAgaWYgKGF0 dHJpYnV0ZSkKLSAgICAgICAgICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3Bl Y3Rvci5VSVN0cmluZygiRWRpdCBBdHRyaWJ1dGUiKSwgdGhpcy5fc3RhcnRFZGl0aW5nQXR0cmli dXRlLmJpbmQodGhpcywgYXR0cmlidXRlLCBldmVudC50YXJnZXQpKTsKLSAgICAgICAgICAgIGNv bnRleHRNZW51LmFwcGVuZFNlcGFyYXRvcigpOworICAgICAgICAgICAgaWYgKHRoaXMuZWRpdGFi bGUpIHsKKyAgICAgICAgICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rv ci5VSVN0cmluZygiQWRkIEF0dHJpYnV0ZSIpLCB0aGlzLl9hZGROZXdBdHRyaWJ1dGUuYmluZCh0 aGlzKSk7CisgICAgICAgICAgICAgICAgaWYgKGF0dHJpYnV0ZSkKKyAgICAgICAgICAgICAgICAg ICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkVkaXQgQXR0 cmlidXRlIiksIHRoaXMuX3N0YXJ0RWRpdGluZ0F0dHJpYnV0ZS5iaW5kKHRoaXMsIGF0dHJpYnV0 ZSwgZXZlbnQudGFyZ2V0KSk7CisgICAgICAgICAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kU2Vw YXJhdG9yKCk7CisgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIGlmIChXZWJJbnNwZWN0b3Iu Y3NzU3R5bGVNYW5hZ2VyLmNhbkZvcmNlUHNldWRvQ2xhc3NlcygpKSB7CiAgICAgICAgICAgICAg ICAgdmFyIHBzZXVkb1N1Yk1lbnUgPSBjb250ZXh0TWVudS5hcHBlbmRTdWJNZW51SXRlbShXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoIkZvcmNlZCBQc2V1ZG8tQ2xhc3NlcyIpKTsKQEAgLTYxOCw4ICs2 MzcsNyBAQCBXZWJJbnNwZWN0b3IuRE9NVHJlZUVsZW1lbnQgPSBjbGFzcyBET01UcmVlRWxlbWVu dCBleHRlbmRzIFdlYkluc3BlY3Rvci5UcmVlRWxlbQogCiAgICAgX3BvcHVsYXRlVGV4dENvbnRl eHRNZW51KGNvbnRleHRNZW51LCB0ZXh0Tm9kZSkKICAgICB7Ci0gICAgICAgIHZhciBub2RlID0g dGhpcy5yZXByZXNlbnRlZE9iamVjdDsKLSAgICAgICAgaWYgKCFub2RlLmlzSW5TaGFkb3dUcmVl KCkpCisgICAgICAgIGlmICh0aGlzLmVkaXRhYmxlKQogICAgICAgICAgICAgY29udGV4dE1lbnUu YXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkVkaXQgVGV4dCIpLCB0aGlzLl9zdGFy dEVkaXRpbmdUZXh0Tm9kZS5iaW5kKHRoaXMsIHRleHROb2RlKSk7CiAKICAgICAgICAgdGhpcy5f cG9wdWxhdGVOb2RlQ29udGV4dE1lbnUoY29udGV4dE1lbnUpOwpAQCAtNjI4LDExICs2NDYsMTAg QEAgV2ViSW5zcGVjdG9yLkRPTVRyZWVFbGVtZW50ID0gY2xhc3MgRE9NVHJlZUVsZW1lbnQgZXh0 ZW5kcyBXZWJJbnNwZWN0b3IuVHJlZUVsZW0KICAgICBfcG9wdWxhdGVOb2RlQ29udGV4dE1lbnUo Y29udGV4dE1lbnUpCiAgICAgewogICAgICAgICAvLyBBZGQgZnJlZS1mb3JtIG5vZGUtcmVsYXRl ZCBhY3Rpb25zLgotICAgICAgICB2YXIgbm9kZSA9IHRoaXMucmVwcmVzZW50ZWRPYmplY3Q7Ci0g ICAgICAgIGlmICghbm9kZS5pc0luU2hhZG93VHJlZSgpKQorICAgICAgICBpZiAodGhpcy5lZGl0 YWJsZSkKICAgICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJ U3RyaW5nKCJFZGl0IGFzIEhUTUwiKSwgdGhpcy5fZWRpdEFzSFRNTC5iaW5kKHRoaXMpKTsKICAg ICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkNvcHkg YXMgSFRNTCIpLCB0aGlzLl9jb3B5SFRNTC5iaW5kKHRoaXMpKTsKLSAgICAgICAgaWYgKCFub2Rl LmlzSW5TaGFkb3dUcmVlKCkpCisgICAgICAgIGlmICh0aGlzLmVkaXRhYmxlKQogICAgICAgICAg ICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkRlbGV0ZSBO b2RlIiksIHRoaXMucmVtb3ZlLmJpbmQodGhpcykpOwogICAgIH0KIApAQCAtNjQxLDcgKzY1OCw3 IEBAIFdlYkluc3BlY3Rvci5ET01UcmVlRWxlbWVudCA9IGNsYXNzIERPTVRyZWVFbGVtZW50IGV4 dGVuZHMgV2ViSW5zcGVjdG9yLlRyZWVFbGVtCiAgICAgICAgIGlmICh0aGlzLnRyZWVPdXRsaW5l LnNlbGVjdGVkRE9NTm9kZSgpICE9PSB0aGlzLnJlcHJlc2VudGVkT2JqZWN0KQogICAgICAgICAg ICAgcmV0dXJuIGZhbHNlOwogCi0gICAgICAgIGlmICh0aGlzLnJlcHJlc2VudGVkT2JqZWN0Lmlz SW5TaGFkb3dUcmVlKCkpCisgICAgICAgIGlmICghdGhpcy5lZGl0YWJsZSkKICAgICAgICAgICAg IHJldHVybiBmYWxzZTsKIAogICAgICAgICB2YXIgbGlzdEl0ZW0gPSB0aGlzLl9saXN0SXRlbU5v ZGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9ET01UcmVlT3V0bGluZS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0RPTVRyZWVPdXRsaW5lLmpzCmluZGV4IDY1MmQ1OTYuLjI5YmM3MTcgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVPdXRs aW5lLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RP TVRyZWVPdXRsaW5lLmpzCkBAIC01NCw2ICs1NCw3IEBAIFdlYkluc3BlY3Rvci5ET01UcmVlT3V0 bGluZSA9IGNsYXNzIERPTVRyZWVPdXRsaW5lIGV4dGVuZHMgV2ViSW5zcGVjdG9yLlRyZWVPdXRs CiAgICAgICAgIHRoaXMuX3Jvb3RET01Ob2RlID0gbnVsbDsKICAgICAgICAgdGhpcy5fc2VsZWN0 ZWRET01Ob2RlID0gbnVsbDsKIAorICAgICAgICB0aGlzLl9lZGl0YWJsZSA9IGZhbHNlOwogICAg ICAgICB0aGlzLl9lZGl0aW5nID0gZmFsc2U7CiAgICAgICAgIHRoaXMuX3Zpc2libGUgPSBmYWxz ZTsKIApAQCAtMTM3LDYgKzEzOCwxNiBAQCBXZWJJbnNwZWN0b3IuRE9NVHJlZU91dGxpbmUgPSBj bGFzcyBET01UcmVlT3V0bGluZSBleHRlbmRzIFdlYkluc3BlY3Rvci5UcmVlT3V0bAogICAgICAg ICAgICAgdGhpcy5fc2VsZWN0ZWROb2RlQ2hhbmdlZCgpOwogICAgIH0KIAorICAgIGdldCBlZGl0 YWJsZSgpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fZWRpdGFibGU7CisgICAgfQorCisg ICAgc2V0IGVkaXRhYmxlKHgpCisgICAgeworICAgICAgICB0aGlzLl9lZGl0YWJsZSA9IHg7Cisg ICAgfQorCiAgICAgZ2V0IGVkaXRpbmcoKQogICAgIHsKICAgICAgICAgcmV0dXJuIHRoaXMuX2Vk aXRpbmc7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9Gb3JtYXR0ZWRWYWx1ZS5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9Gb3JtYXR0ZWRWYWx1ZS5jc3MKaW5kZXggNjhkZDI0Zi4uMGNlMzRmNiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRm9ybWF0 dGVkVmFsdWUuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0Zvcm1hdHRlZFZhbHVlLmNzcwpAQCAtNzIsNiArNzIsMTAgQEAKICAgICAtd2Via2l0LXBh ZGRpbmctc3RhcnQ6IDEycHg7CiB9CiAKKy5mb3JtYXR0ZWQtbm9kZSA+IC5kb20tdHJlZS1vdXRs aW5lIGxpIHsKKyAgICAtd2Via2l0LXVzZXItc2VsZWN0OiBub25lICFpbXBvcnRhbnQ7Cit9CisK IC5mb3JtYXR0ZWQtbm9kZSA+IC5kb20tdHJlZS1vdXRsaW5lIGxpLmhvdmVyZWQ6bm90KC5zZWxl Y3RlZCkgLnNlbGVjdGlvbiB7CiAgICAgZGlzcGxheTogYmxvY2s7CiAgICAgbGVmdDogLTFweDsK