56096 2011-03-10 06:08:46 -0800 Web Inspector: Get rid of has/add/removeStyleClass() methods on Element.prototype - Step 1 2011-03-11 01:08:00 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 apavlov apavlov apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 365123 0 apavlov 2011-03-10 06:08:46 -0800 According to the scheme in bug 55758, this step makes use of element.classList methods in utilities.js and narrows down the class addition to single classes per element.addStyleClass() invocation 365133 1 85317 apavlov 2011-03-10 06:47:30 -0800 Created attachment 85317 [PATCH] Suggested solution 365159 2 85317 yurys 2011-03-10 07:32:22 -0800 Comment on attachment 85317 [PATCH] Suggested solution View in context: https://bugs.webkit.org/attachment.cgi?id=85317&action=review Looks like there are several places to fix: $ grep \.addStyleClass\(\"[^\"]\\+\ [^\"]\\+\" Source/WebCore/inspector/front-end/* Source/WebCore/inspector/front-end/BreakpointsSidebarPane.js: this.categoriesElement.addStyleClass("properties-tree event-listener-breakpoints"); Source/WebCore/inspector/front-end/DetailedHeapshotView.js: retainmentView.element.addStyleClass("view retaining-paths-view"); Source/WebCore/inspector/front-end/ResourcesPanel.js: this.sidebarElement.addStyleClass("outline-disclosure filter-all children small"); > Source/WebCore/inspector/front-end/ResourcesPanel.js:789 > + var classes = this._iconClass.split(" "); I'd rather fix callers. > Source/WebCore/inspector/front-end/SidebarTreeElement.js:183 > + var classNames = this.className.split(" "); I'd rather fix callers. 365242 3 85340 apavlov 2011-03-10 09:19:46 -0800 Created attachment 85340 [PATCH] Comments addressed 365865 4 apavlov 2011-03-11 01:08:00 -0800 Committing to http://svn.webkit.org/repository/webkit/trunk ... M Source/WebCore/ChangeLog M Source/WebCore/inspector/front-end/BreakpointsSidebarPane.js M Source/WebCore/inspector/front-end/DetailedHeapshotView.js M Source/WebCore/inspector/front-end/ResourcesPanel.js M Source/WebCore/inspector/front-end/utilities.js Committed r80831 85317 2011-03-10 06:47:30 -0800 2011-03-10 09:19:46 -0800 [PATCH] Suggested solution step1classlist.patch text/plain 5228 apavlov Y29tbWl0IDUxMzJjN2FjY2ZjZjVjYTAyMDYxN2JhN2I5MDY0ZjIxMGI3N2U1NmMKQXV0aG9yOiBB bGV4YW5kZXIgUGF2bG92IDxhcGF2bG92QGNocm9taXVtLm9yZz4KRGF0ZTogICBUaHUgTWFyIDEw IDE3OjIxOjAxIDIwMTEgKzAzMDAKCiAgICBTdGVwMQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAxOTBlMzAzLi5h NDA2NGFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNl L1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMDMtMTAgIEFsZXhhbmRl ciBQYXZsb3YgIDxhcGF2bG92QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBHZXQgcmlkIG9mIGhhcy9h ZGQvcmVtb3ZlU3R5bGVDbGFzcygpIG1ldGhvZHMgb24gRWxlbWVudC5wcm90b3R5cGUgLSBTdGVw IDEKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU2MDk2 CisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBhcyB0aGlzIGlzIGEgcmVmYWN0b3JpbmcuCisKKyAg ICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5CYXNl U3RvcmFnZVRyZWVFbGVtZW50LnByb3RvdHlwZS5vbmF0dGFjaCk6CisgICAgICAgICogaW5zcGVj dG9yL2Zyb250LWVuZC9TaWRlYmFyVHJlZUVsZW1lbnQuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuU2lkZWJhclRyZWVFbGVtZW50LnByb3RvdHlwZS5vbmF0dGFjaCk6CisgICAgICAgICogaW5z cGVjdG9yL2Zyb250LWVuZC91dGlsaXRpZXMuanM6CisgICAgICAgIChFbGVtZW50LnByb3RvdHlw ZS5yZW1vdmVTdHlsZUNsYXNzKToKKyAgICAgICAgKEVsZW1lbnQucHJvdG90eXBlLmFkZFN0eWxl Q2xhc3MpOgorICAgICAgICAoRWxlbWVudC5wcm90b3R5cGUuaGFzU3R5bGVDbGFzcyk6CisKIDIw MTEtMDMtMDkgIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgUGF2ZWwgRmVsZG1hbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzCmluZGV4IDNjODU4OTIuLmEw NzYzYTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVz b3VyY2VzUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9S ZXNvdXJjZXNQYW5lbC5qcwpAQCAtMzQsNyArMzQsMTAgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNl c1BhbmVsID0gZnVuY3Rpb24oZGF0YWJhc2UpCiAgICAgV2ViSW5zcGVjdG9yLnNldHRpbmdzLmlu c3RhbGxBcHBsaWNhdGlvblNldHRpbmcoInJlc291cmNlc0xhc3RTZWxlY3RlZEl0ZW0iLCB7fSk7 CiAKICAgICB0aGlzLmNyZWF0ZVNpZGViYXIoKTsKLSAgICB0aGlzLnNpZGViYXJFbGVtZW50LmFk ZFN0eWxlQ2xhc3MoIm91dGxpbmUtZGlzY2xvc3VyZSBmaWx0ZXItYWxsIGNoaWxkcmVuIHNtYWxs Iik7CisgICAgdGhpcy5zaWRlYmFyRWxlbWVudC5hZGRTdHlsZUNsYXNzKCJvdXRsaW5lLWRpc2Ns b3N1cmUiKTsKKyAgICB0aGlzLnNpZGViYXJFbGVtZW50LmFkZFN0eWxlQ2xhc3MoImZpbHRlci1h bGwiKTsKKyAgICB0aGlzLnNpZGViYXJFbGVtZW50LmFkZFN0eWxlQ2xhc3MoImNoaWxkcmVuIik7 CisgICAgdGhpcy5zaWRlYmFyRWxlbWVudC5hZGRTdHlsZUNsYXNzKCJzbWFsbCIpOwogICAgIHRo aXMuc2lkZWJhclRyZWVFbGVtZW50LnJlbW92ZVN0eWxlQ2xhc3MoInNpZGViYXItdHJlZSIpOwog CiAgICAgdGhpcy5yZXNvdXJjZXNMaXN0VHJlZUVsZW1lbnQgPSBuZXcgV2ViSW5zcGVjdG9yLlN0 b3JhZ2VDYXRlZ29yeVRyZWVFbGVtZW50KHRoaXMsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiRnJh bWVzIiksICJGcmFtZXMiLCAiZnJhbWUtc3RvcmFnZS10cmVlLWl0ZW0iKTsKQEAgLTc4Miw3ICs3 ODUsMTEgQEAgV2ViSW5zcGVjdG9yLkJhc2VTdG9yYWdlVHJlZUVsZW1lbnQucHJvdG90eXBlID0g ewogICAgIG9uYXR0YWNoOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICB0aGlzLmxpc3RJdGVt RWxlbWVudC5yZW1vdmVDaGlsZHJlbigpOwotICAgICAgICB0aGlzLmxpc3RJdGVtRWxlbWVudC5h ZGRTdHlsZUNsYXNzKHRoaXMuX2ljb25DbGFzcyk7CisgICAgICAgIGlmICh0aGlzLl9pY29uQ2xh c3MpIHsKKyAgICAgICAgICAgIHZhciBjbGFzc2VzID0gdGhpcy5faWNvbkNsYXNzLnNwbGl0KCIg Iik7CisgICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGNsYXNzZXMubGVuZ3RoOyArK2kp CisgICAgICAgICAgICAgICAgdGhpcy5saXN0SXRlbUVsZW1lbnQuYWRkU3R5bGVDbGFzcyhjbGFz c2VzW2ldKTsKKyAgICAgICAgfQogCiAgICAgICAgIHZhciBzZWxlY3Rpb25FbGVtZW50ID0gZG9j dW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CiAgICAgICAgIHNlbGVjdGlvbkVsZW1lbnQuY2xh c3NOYW1lID0gInNlbGVjdGlvbiI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1NpZGViYXJUcmVlRWxlbWVudC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvU2lkZWJhclRyZWVFbGVtZW50LmpzCmluZGV4IGEyN2M0NTcuLjk4NWM5 MjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2lkZWJh clRyZWVFbGVtZW50LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv U2lkZWJhclRyZWVFbGVtZW50LmpzCkBAIC0xNzksOCArMTc5LDExIEBAIFdlYkluc3BlY3Rvci5T aWRlYmFyVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAgdGhpcy5fbGlz dEl0ZW1Ob2RlLmFkZFN0eWxlQ2xhc3MoInNpZGViYXItdHJlZS1pdGVtIik7CiAKLSAgICAgICAg aWYgKHRoaXMuY2xhc3NOYW1lKQotICAgICAgICAgICAgdGhpcy5fbGlzdEl0ZW1Ob2RlLmFkZFN0 eWxlQ2xhc3ModGhpcy5jbGFzc05hbWUpOworICAgICAgICBpZiAodGhpcy5jbGFzc05hbWUpIHsK KyAgICAgICAgICAgIHZhciBjbGFzc05hbWVzID0gdGhpcy5jbGFzc05hbWUuc3BsaXQoIiAiKTsK KyAgICAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgY2xhc3NOYW1lcy5sZW5ndGg7ICsraSkK KyAgICAgICAgICAgICAgICB0aGlzLl9saXN0SXRlbU5vZGUuYWRkU3R5bGVDbGFzcyhjbGFzc05h bWVzW2ldKTsKKyAgICAgICAgfQogCiAgICAgICAgIGlmICh0aGlzLnNtYWxsKQogICAgICAgICAg ICAgdGhpcy5fbGlzdEl0ZW1Ob2RlLmFkZFN0eWxlQ2xhc3MoInNtYWxsIik7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL3V0aWxpdGllcy5qcyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvdXRpbGl0aWVzLmpzCmluZGV4IDMxYTVmMGMu LjcwZDM1YzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv dXRpbGl0aWVzLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvdXRp bGl0aWVzLmpzCkBAIC0xNTYsMTkgKzE1Niw3IEBAIE5vZGUucHJvdG90eXBlLnJhbmdlQm91bmRh cnlGb3JPZmZzZXQgPSBmdW5jdGlvbihvZmZzZXQpCiAKIEVsZW1lbnQucHJvdG90eXBlLnJlbW92 ZVN0eWxlQ2xhc3MgPSBmdW5jdGlvbihjbGFzc05hbWUpIAogewotICAgIC8vIFRlc3QgZm9yIHRo ZSBzaW1wbGUgY2FzZSBmaXJzdC4KLSAgICBpZiAodGhpcy5jbGFzc05hbWUgPT09IGNsYXNzTmFt ZSkgewotICAgICAgICB0aGlzLmNsYXNzTmFtZSA9ICIiOwotICAgICAgICByZXR1cm47Ci0gICAg fQotCi0gICAgdmFyIGluZGV4ID0gdGhpcy5jbGFzc05hbWUuaW5kZXhPZihjbGFzc05hbWUpOwot ICAgIGlmIChpbmRleCA9PT0gLTEpCi0gICAgICAgIHJldHVybjsKLQotICAgIHRoaXMuY2xhc3NO YW1lID0gdGhpcy5jbGFzc05hbWUuc3BsaXQoIiAiKS5maWx0ZXIoZnVuY3Rpb24ocykgewotICAg ICAgICByZXR1cm4gcyAmJiBzICE9PSBjbGFzc05hbWU7Ci0gICAgfSkuam9pbigiICIpOworICAg IHRoaXMuY2xhc3NMaXN0LnJlbW92ZShjbGFzc05hbWUpOwogfQogCiBFbGVtZW50LnByb3RvdHlw ZS5yZW1vdmVNYXRjaGluZ1N0eWxlQ2xhc3NlcyA9IGZ1bmN0aW9uKGNsYXNzTmFtZVJlZ2V4KQpA QCAtMTgwLDIzICsxNjgsMTIgQEAgRWxlbWVudC5wcm90b3R5cGUucmVtb3ZlTWF0Y2hpbmdTdHls ZUNsYXNzZXMgPSBmdW5jdGlvbihjbGFzc05hbWVSZWdleCkKIAogRWxlbWVudC5wcm90b3R5cGUu YWRkU3R5bGVDbGFzcyA9IGZ1bmN0aW9uKGNsYXNzTmFtZSkgCiB7Ci0gICAgaWYgKGNsYXNzTmFt ZSAmJiAhdGhpcy5oYXNTdHlsZUNsYXNzKGNsYXNzTmFtZSkpCi0gICAgICAgIHRoaXMuY2xhc3NO YW1lICs9ICh0aGlzLmNsYXNzTmFtZS5sZW5ndGggPyAiICIgKyBjbGFzc05hbWUgOiBjbGFzc05h bWUpOworICAgIHRoaXMuY2xhc3NMaXN0LmFkZChjbGFzc05hbWUpOwogfQogCiBFbGVtZW50LnBy b3RvdHlwZS5oYXNTdHlsZUNsYXNzID0gZnVuY3Rpb24oY2xhc3NOYW1lKSAKIHsKLSAgICBpZiAo IWNsYXNzTmFtZSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIC8vIFRlc3QgZm9yIHRoZSBz aW1wbGUgY2FzZQotICAgIGlmICh0aGlzLmNsYXNzTmFtZSA9PT0gY2xhc3NOYW1lKQotICAgICAg ICByZXR1cm4gdHJ1ZTsKLQotICAgIHZhciBpbmRleCA9IHRoaXMuY2xhc3NOYW1lLmluZGV4T2Yo Y2xhc3NOYW1lKTsKLSAgICBpZiAoaW5kZXggPT09IC0xKQotICAgICAgICByZXR1cm4gZmFsc2U7 Ci0gICAgdmFyIHRvVGVzdCA9ICIgIiArIHRoaXMuY2xhc3NOYW1lICsgIiAiOwotICAgIHJldHVy biB0b1Rlc3QuaW5kZXhPZigiICIgKyBjbGFzc05hbWUgKyAiICIsIGluZGV4KSAhPT0gLTE7Cisg ICAgcmV0dXJuIHRoaXMuY2xhc3NMaXN0LmNvbnRhaW5zKGNsYXNzTmFtZSk7CiB9CiAKIEVsZW1l bnQucHJvdG90eXBlLnBvc2l0aW9uQXQgPSBmdW5jdGlvbih4LCB5KQo= 85340 2011-03-10 09:19:46 -0800 2011-03-10 09:48:58 -0800 [PATCH] Comments addressed step1classlist.patch text/plain 15334 apavlov Y29tbWl0IDVjMTU1MTE4MmIyYWRhNGI4ZDZjNGRkMGU0OGRkN2E3OTg1NjkxMDYKQXV0aG9yOiBB bGV4YW5kZXIgUGF2bG92IDxhcGF2bG92QGNocm9taXVtLm9yZz4KRGF0ZTogICBUaHUgTWFyIDEw IDE3OjIxOjAxIDIwMTEgKzAzMDAKCiAgICBTdGVwMQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAwZTk0ODY1Li5i ZGMwODc5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNl L1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzUgQEAKIDIwMTEtMDMtMTAgIEFsZXhhbmRl ciBQYXZsb3YgIDxhcGF2bG92QGNocm9taXVtLm9yZz4KIAorICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBHZXQgcmlkIG9mIGhhcy9h ZGQvcmVtb3ZlU3R5bGVDbGFzcygpIG1ldGhvZHMgb24gRWxlbWVudC5wcm90b3R5cGUgLSBTdGVw IDEKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU2MDk2 CisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBhcyB0aGlzIGlzIGEgcmVmYWN0b3JpbmcuCisKKyAg ICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0JyZWFrcG9pbnRzU2lkZWJhclBhbmUuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuRXZlbnRMaXN0ZW5lckJyZWFrcG9pbnRzU2lkZWJhclBhbmUp OgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRGV0YWlsZWRIZWFwc2hvdFZpZXcuanM6 CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbCk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu QmFzZVN0b3JhZ2VUcmVlRWxlbWVudCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQmFzZVN0b3Jh Z2VUcmVlRWxlbWVudC5wcm90b3R5cGUub25hdHRhY2gpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlN0b3JhZ2VDYXRlZ29yeVRyZWVFbGVtZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5GcmFt ZVRyZWVFbGVtZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5GcmFtZVJlc291cmNlVHJlZUVs ZW1lbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRhdGFiYXNlVHJlZUVsZW1lbnQpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkRhdGFiYXNlVGFibGVUcmVlRWxlbWVudCk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuRE9NU3RvcmFnZVRyZWVFbGVtZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5Db29raWVUcmVlRWxlbWVudCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQXBwbGljYXRpb25D YWNoZVRyZWVFbGVtZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZVJldmlzaW9u VHJlZUVsZW1lbnQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvdXRpbGl0aWVzLmpz OgorICAgICAgICAoRWxlbWVudC5wcm90b3R5cGUucmVtb3ZlU3R5bGVDbGFzcyk6CisgICAgICAg IChFbGVtZW50LnByb3RvdHlwZS5hZGRTdHlsZUNsYXNzKToKKyAgICAgICAgKEVsZW1lbnQucHJv dG90eXBlLmhhc1N0eWxlQ2xhc3MpOgorCisyMDExLTAzLTEwICBBbGV4YW5kZXIgUGF2bG92ICA8 YXBhdmxvdkBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgUmV2aWV3ZWQgYnkgUGF2ZWwgRmVsZG1h bi4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBJbnZhbGlkIGV4cGVjdGVkIHBhcmFtZXRlciBs aXN0IGluIENTU0FnZW50LnNldFNlbGVjdG9yVGV4dCgpIGNhbGxiYWNrIChDU1NTdHlsZU1vZGVs LmpzKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9CcmVh a3BvaW50c1NpZGViYXJQYW5lLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9CcmVha3BvaW50c1NpZGViYXJQYW5lLmpzCmluZGV4IDViYjdmMDQuLjA5OTM2ODQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQnJlYWtwb2ludHNTaWRl YmFyUGFuZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0JyZWFr cG9pbnRzU2lkZWJhclBhbmUuanMKQEAgLTQyNSw3ICs0MjUsOCBAQCBXZWJJbnNwZWN0b3IuRXZl bnRMaXN0ZW5lckJyZWFrcG9pbnRzU2lkZWJhclBhbmUgPSBmdW5jdGlvbigpCiAKICAgICB0aGlz LmNhdGVnb3JpZXNFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgib2wiKTsKICAgICB0 aGlzLmNhdGVnb3JpZXNFbGVtZW50LnRhYkluZGV4ID0gMDsKLSAgICB0aGlzLmNhdGVnb3JpZXNF bGVtZW50LmFkZFN0eWxlQ2xhc3MoInByb3BlcnRpZXMtdHJlZSBldmVudC1saXN0ZW5lci1icmVh a3BvaW50cyIpOworICAgIHRoaXMuY2F0ZWdvcmllc0VsZW1lbnQuYWRkU3R5bGVDbGFzcygicHJv cGVydGllcy10cmVlIik7CisgICAgdGhpcy5jYXRlZ29yaWVzRWxlbWVudC5hZGRTdHlsZUNsYXNz KCJldmVudC1saXN0ZW5lci1icmVha3BvaW50cyIpOwogICAgIHRoaXMuY2F0ZWdvcmllc1RyZWVP dXRsaW5lID0gbmV3IFRyZWVPdXRsaW5lKHRoaXMuY2F0ZWdvcmllc0VsZW1lbnQpOwogICAgIHRo aXMuYm9keUVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5jYXRlZ29yaWVzRWxlbWVudCk7CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGV0YWlsZWRIZWFw c2hvdFZpZXcuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RldGFpbGVk SGVhcHNob3RWaWV3LmpzCmluZGV4IGZmY2UxZGQuLjNkNTVmMDEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGV0YWlsZWRIZWFwc2hvdFZpZXcuanMKKysr IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZXRhaWxlZEhlYXBzaG90Vmll dy5qcwpAQCAtMzcwLDcgKzM3MCw4IEBAIFdlYkluc3BlY3Rvci5EZXRhaWxlZEhlYXBzaG90Vmll dyA9IGZ1bmN0aW9uKHBhcmVudCwgcHJvZmlsZSkKICAgICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hp bGQodGhpcy5kb21pbmF0b3JWaWV3LmVsZW1lbnQpOwogCiAgICAgdmFyIHJldGFpbm1lbnRWaWV3 ID0gbmV3IFdlYkluc3BlY3Rvci5WaWV3KCk7Ci0gICAgcmV0YWlubWVudFZpZXcuZWxlbWVudC5h ZGRTdHlsZUNsYXNzKCJ2aWV3IHJldGFpbmluZy1wYXRocy12aWV3Iik7CisgICAgcmV0YWlubWVu dFZpZXcuZWxlbWVudC5hZGRTdHlsZUNsYXNzKCJ2aWV3Iik7CisgICAgcmV0YWlubWVudFZpZXcu ZWxlbWVudC5hZGRTdHlsZUNsYXNzKCJyZXRhaW5pbmctcGF0aHMtdmlldyIpOwogICAgIHZhciBy ZXRhaW5pbmdQYXRoc1RpdGxlRGl2ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CiAg ICAgcmV0YWluaW5nUGF0aHNUaXRsZURpdi5jbGFzc05hbWUgPSAidGl0bGUiOwogICAgIHZhciBy ZXRhaW5pbmdQYXRoc1RpdGxlID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgic3BhbiIpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5l bC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwu anMKaW5kZXggM2M4NTg5Mi4uMzJkY2M5OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzCkBAIC0zNCwyNiArMzQsMjkgQEAg V2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsID0gZnVuY3Rpb24oZGF0YWJhc2UpCiAgICAgV2Vi SW5zcGVjdG9yLnNldHRpbmdzLmluc3RhbGxBcHBsaWNhdGlvblNldHRpbmcoInJlc291cmNlc0xh c3RTZWxlY3RlZEl0ZW0iLCB7fSk7CiAKICAgICB0aGlzLmNyZWF0ZVNpZGViYXIoKTsKLSAgICB0 aGlzLnNpZGViYXJFbGVtZW50LmFkZFN0eWxlQ2xhc3MoIm91dGxpbmUtZGlzY2xvc3VyZSBmaWx0 ZXItYWxsIGNoaWxkcmVuIHNtYWxsIik7CisgICAgdGhpcy5zaWRlYmFyRWxlbWVudC5hZGRTdHls ZUNsYXNzKCJvdXRsaW5lLWRpc2Nsb3N1cmUiKTsKKyAgICB0aGlzLnNpZGViYXJFbGVtZW50LmFk ZFN0eWxlQ2xhc3MoImZpbHRlci1hbGwiKTsKKyAgICB0aGlzLnNpZGViYXJFbGVtZW50LmFkZFN0 eWxlQ2xhc3MoImNoaWxkcmVuIik7CisgICAgdGhpcy5zaWRlYmFyRWxlbWVudC5hZGRTdHlsZUNs YXNzKCJzbWFsbCIpOwogICAgIHRoaXMuc2lkZWJhclRyZWVFbGVtZW50LnJlbW92ZVN0eWxlQ2xh c3MoInNpZGViYXItdHJlZSIpOwogCi0gICAgdGhpcy5yZXNvdXJjZXNMaXN0VHJlZUVsZW1lbnQg PSBuZXcgV2ViSW5zcGVjdG9yLlN0b3JhZ2VDYXRlZ29yeVRyZWVFbGVtZW50KHRoaXMsIFdlYklu c3BlY3Rvci5VSVN0cmluZygiRnJhbWVzIiksICJGcmFtZXMiLCAiZnJhbWUtc3RvcmFnZS10cmVl LWl0ZW0iKTsKKyAgICB0aGlzLnJlc291cmNlc0xpc3RUcmVlRWxlbWVudCA9IG5ldyBXZWJJbnNw ZWN0b3IuU3RvcmFnZUNhdGVnb3J5VHJlZUVsZW1lbnQodGhpcywgV2ViSW5zcGVjdG9yLlVJU3Ry aW5nKCJGcmFtZXMiKSwgIkZyYW1lcyIsIFsiZnJhbWUtc3RvcmFnZS10cmVlLWl0ZW0iXSk7CiAg ICAgdGhpcy5zaWRlYmFyVHJlZS5hcHBlbmRDaGlsZCh0aGlzLnJlc291cmNlc0xpc3RUcmVlRWxl bWVudCk7CiAgICAgdGhpcy5fdHJlZUVsZW1lbnRGb3JGcmFtZUlkID0ge307CiAKLSAgICB0aGlz LmRhdGFiYXNlc0xpc3RUcmVlRWxlbWVudCA9IG5ldyBXZWJJbnNwZWN0b3IuU3RvcmFnZUNhdGVn b3J5VHJlZUVsZW1lbnQodGhpcywgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJEYXRhYmFzZXMiKSwg IkRhdGFiYXNlcyIsICJkYXRhYmFzZS1zdG9yYWdlLXRyZWUtaXRlbSIpOworICAgIHRoaXMuZGF0 YWJhc2VzTGlzdFRyZWVFbGVtZW50ID0gbmV3IFdlYkluc3BlY3Rvci5TdG9yYWdlQ2F0ZWdvcnlU cmVlRWxlbWVudCh0aGlzLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkRhdGFiYXNlcyIpLCAiRGF0 YWJhc2VzIiwgWyJkYXRhYmFzZS1zdG9yYWdlLXRyZWUtaXRlbSJdKTsKICAgICB0aGlzLnNpZGVi YXJUcmVlLmFwcGVuZENoaWxkKHRoaXMuZGF0YWJhc2VzTGlzdFRyZWVFbGVtZW50KTsKIAotICAg IHRoaXMubG9jYWxTdG9yYWdlTGlzdFRyZWVFbGVtZW50ID0gbmV3IFdlYkluc3BlY3Rvci5TdG9y YWdlQ2F0ZWdvcnlUcmVlRWxlbWVudCh0aGlzLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkxvY2Fs IFN0b3JhZ2UiKSwgIkxvY2FsU3RvcmFnZSIsICJkb21zdG9yYWdlLXN0b3JhZ2UtdHJlZS1pdGVt IGxvY2FsLXN0b3JhZ2UiKTsKKyAgICB0aGlzLmxvY2FsU3RvcmFnZUxpc3RUcmVlRWxlbWVudCA9 IG5ldyBXZWJJbnNwZWN0b3IuU3RvcmFnZUNhdGVnb3J5VHJlZUVsZW1lbnQodGhpcywgV2ViSW5z cGVjdG9yLlVJU3RyaW5nKCJMb2NhbCBTdG9yYWdlIiksICJMb2NhbFN0b3JhZ2UiLCBbImRvbXN0 b3JhZ2Utc3RvcmFnZS10cmVlLWl0ZW0iLCAibG9jYWwtc3RvcmFnZSJdKTsKICAgICB0aGlzLnNp ZGViYXJUcmVlLmFwcGVuZENoaWxkKHRoaXMubG9jYWxTdG9yYWdlTGlzdFRyZWVFbGVtZW50KTsK IAotICAgIHRoaXMuc2Vzc2lvblN0b3JhZ2VMaXN0VHJlZUVsZW1lbnQgPSBuZXcgV2ViSW5zcGVj dG9yLlN0b3JhZ2VDYXRlZ29yeVRyZWVFbGVtZW50KHRoaXMsIFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiU2Vzc2lvbiBTdG9yYWdlIiksICJTZXNzaW9uU3RvcmFnZSIsICJkb21zdG9yYWdlLXN0b3Jh Z2UtdHJlZS1pdGVtIHNlc3Npb24tc3RvcmFnZSIpOworICAgIHRoaXMuc2Vzc2lvblN0b3JhZ2VM aXN0VHJlZUVsZW1lbnQgPSBuZXcgV2ViSW5zcGVjdG9yLlN0b3JhZ2VDYXRlZ29yeVRyZWVFbGVt ZW50KHRoaXMsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiU2Vzc2lvbiBTdG9yYWdlIiksICJTZXNz aW9uU3RvcmFnZSIsIFsiZG9tc3RvcmFnZS1zdG9yYWdlLXRyZWUtaXRlbSIsICJzZXNzaW9uLXN0 b3JhZ2UiXSk7CiAgICAgdGhpcy5zaWRlYmFyVHJlZS5hcHBlbmRDaGlsZCh0aGlzLnNlc3Npb25T dG9yYWdlTGlzdFRyZWVFbGVtZW50KTsKIAotICAgIHRoaXMuY29va2llTGlzdFRyZWVFbGVtZW50 ID0gbmV3IFdlYkluc3BlY3Rvci5TdG9yYWdlQ2F0ZWdvcnlUcmVlRWxlbWVudCh0aGlzLCBXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoIkNvb2tpZXMiKSwgIkNvb2tpZXMiLCAiY29va2llLXN0b3JhZ2Ut dHJlZS1pdGVtIik7CisgICAgdGhpcy5jb29raWVMaXN0VHJlZUVsZW1lbnQgPSBuZXcgV2ViSW5z cGVjdG9yLlN0b3JhZ2VDYXRlZ29yeVRyZWVFbGVtZW50KHRoaXMsIFdlYkluc3BlY3Rvci5VSVN0 cmluZygiQ29va2llcyIpLCAiQ29va2llcyIsIFsiY29va2llLXN0b3JhZ2UtdHJlZS1pdGVtIl0p OwogICAgIHRoaXMuc2lkZWJhclRyZWUuYXBwZW5kQ2hpbGQodGhpcy5jb29raWVMaXN0VHJlZUVs ZW1lbnQpOwogCi0gICAgdGhpcy5hcHBsaWNhdGlvbkNhY2hlTGlzdFRyZWVFbGVtZW50ID0gbmV3 IFdlYkluc3BlY3Rvci5TdG9yYWdlQ2F0ZWdvcnlUcmVlRWxlbWVudCh0aGlzLCBXZWJJbnNwZWN0 b3IuVUlTdHJpbmcoIkFwcGxpY2F0aW9uIENhY2hlIiksICJBcHBsaWNhdGlvbkNhY2hlIiwgImFw cGxpY2F0aW9uLWNhY2hlLXN0b3JhZ2UtdHJlZS1pdGVtIik7CisgICAgdGhpcy5hcHBsaWNhdGlv bkNhY2hlTGlzdFRyZWVFbGVtZW50ID0gbmV3IFdlYkluc3BlY3Rvci5TdG9yYWdlQ2F0ZWdvcnlU cmVlRWxlbWVudCh0aGlzLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkFwcGxpY2F0aW9uIENhY2hl IiksICJBcHBsaWNhdGlvbkNhY2hlIiwgWyJhcHBsaWNhdGlvbi1jYWNoZS1zdG9yYWdlLXRyZWUt aXRlbSJdKTsKICAgICB0aGlzLnNpZGViYXJUcmVlLmFwcGVuZENoaWxkKHRoaXMuYXBwbGljYXRp b25DYWNoZUxpc3RUcmVlRWxlbWVudCk7CiAKICAgICB0aGlzLnN0b3JhZ2VWaWV3cyA9IGRvY3Vt ZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwpAQCAtNzcwLDE5ICs3NzMsMjIgQEAgV2ViSW5zcGVj dG9yLlJlc291cmNlc1BhbmVsLnByb3RvdHlwZSA9IHsKIAogV2ViSW5zcGVjdG9yLlJlc291cmNl c1BhbmVsLnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuUGFuZWwucHJvdG90eXBl OwogCi1XZWJJbnNwZWN0b3IuQmFzZVN0b3JhZ2VUcmVlRWxlbWVudCA9IGZ1bmN0aW9uKHN0b3Jh Z2VQYW5lbCwgcmVwcmVzZW50ZWRPYmplY3QsIHRpdGxlLCBpY29uQ2xhc3MsIGhhc0NoaWxkcmVu KQorV2ViSW5zcGVjdG9yLkJhc2VTdG9yYWdlVHJlZUVsZW1lbnQgPSBmdW5jdGlvbihzdG9yYWdl UGFuZWwsIHJlcHJlc2VudGVkT2JqZWN0LCB0aXRsZSwgaWNvbkNsYXNzZXMsIGhhc0NoaWxkcmVu KQogewogICAgIFRyZWVFbGVtZW50LmNhbGwodGhpcywgIiIsIHJlcHJlc2VudGVkT2JqZWN0LCBo YXNDaGlsZHJlbik7CiAgICAgdGhpcy5fc3RvcmFnZVBhbmVsID0gc3RvcmFnZVBhbmVsOwogICAg IHRoaXMuX3RpdGxlVGV4dCA9IHRpdGxlOwotICAgIHRoaXMuX2ljb25DbGFzcyA9IGljb25DbGFz czsKKyAgICB0aGlzLl9pY29uQ2xhc3NlcyA9IGljb25DbGFzc2VzOwogfQogCiBXZWJJbnNwZWN0 b3IuQmFzZVN0b3JhZ2VUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAgb25hdHRhY2g6IGZ1 bmN0aW9uKCkKICAgICB7CiAgICAgICAgIHRoaXMubGlzdEl0ZW1FbGVtZW50LnJlbW92ZUNoaWxk cmVuKCk7Ci0gICAgICAgIHRoaXMubGlzdEl0ZW1FbGVtZW50LmFkZFN0eWxlQ2xhc3ModGhpcy5f aWNvbkNsYXNzKTsKKyAgICAgICAgaWYgKHRoaXMuX2ljb25DbGFzc2VzKSB7CisgICAgICAgICAg ICBmb3IgKHZhciBpID0gMDsgaSA8IHRoaXMuX2ljb25DbGFzc2VzLmxlbmd0aDsgKytpKQorICAg ICAgICAgICAgICAgIHRoaXMubGlzdEl0ZW1FbGVtZW50LmFkZFN0eWxlQ2xhc3ModGhpcy5faWNv bkNsYXNzZXNbaV0pOworICAgICAgICB9CiAKICAgICAgICAgdmFyIHNlbGVjdGlvbkVsZW1lbnQg PSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKICAgICAgICAgc2VsZWN0aW9uRWxlbWVu dC5jbGFzc05hbWUgPSAic2VsZWN0aW9uIjsKQEAgLTgzNiw5ICs4NDIsOSBAQCBXZWJJbnNwZWN0 b3IuQmFzZVN0b3JhZ2VUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAKIFdlYkluc3BlY3Rvci5C YXNlU3RvcmFnZVRyZWVFbGVtZW50LnByb3RvdHlwZS5fX3Byb3RvX18gPSBUcmVlRWxlbWVudC5w cm90b3R5cGU7CiAKLVdlYkluc3BlY3Rvci5TdG9yYWdlQ2F0ZWdvcnlUcmVlRWxlbWVudCA9IGZ1 bmN0aW9uKHN0b3JhZ2VQYW5lbCwgY2F0ZWdvcnlOYW1lLCBzZXR0aW5nc0tleSwgaWNvbkNsYXNz KQorV2ViSW5zcGVjdG9yLlN0b3JhZ2VDYXRlZ29yeVRyZWVFbGVtZW50ID0gZnVuY3Rpb24oc3Rv cmFnZVBhbmVsLCBjYXRlZ29yeU5hbWUsIHNldHRpbmdzS2V5LCBpY29uQ2xhc3NlcykKIHsKLSAg ICBXZWJJbnNwZWN0b3IuQmFzZVN0b3JhZ2VUcmVlRWxlbWVudC5jYWxsKHRoaXMsIHN0b3JhZ2VQ YW5lbCwgbnVsbCwgY2F0ZWdvcnlOYW1lLCBpY29uQ2xhc3MsIHRydWUpOworICAgIFdlYkluc3Bl Y3Rvci5CYXNlU3RvcmFnZVRyZWVFbGVtZW50LmNhbGwodGhpcywgc3RvcmFnZVBhbmVsLCBudWxs LCBjYXRlZ29yeU5hbWUsIGljb25DbGFzc2VzLCB0cnVlKTsKICAgICB0aGlzLl9leHBhbmRlZFNl dHRpbmdLZXkgPSAicmVzb3VyY2VzIiArIHNldHRpbmdzS2V5ICsgIkV4cGFuZGVkIjsKICAgICBX ZWJJbnNwZWN0b3Iuc2V0dGluZ3MuaW5zdGFsbEFwcGxpY2F0aW9uU2V0dGluZyh0aGlzLl9leHBh bmRlZFNldHRpbmdLZXksIHNldHRpbmdzS2V5ID09PSAiRnJhbWVzIik7CiAgICAgdGhpcy5fY2F0 ZWdvcnlOYW1lID0gY2F0ZWdvcnlOYW1lOwpAQCAtODc3LDcgKzg4Myw3IEBAIFdlYkluc3BlY3Rv ci5TdG9yYWdlQ2F0ZWdvcnlUcmVlRWxlbWVudC5wcm90b3R5cGUuX19wcm90b19fID0gV2ViSW5z cGVjdG9yLkJhc2VTCiAKIFdlYkluc3BlY3Rvci5GcmFtZVRyZWVFbGVtZW50ID0gZnVuY3Rpb24o c3RvcmFnZVBhbmVsLCBmcmFtZUlkLCB0aXRsZSwgc3VidGl0bGUpCiB7Ci0gICAgV2ViSW5zcGVj dG9yLkJhc2VTdG9yYWdlVHJlZUVsZW1lbnQuY2FsbCh0aGlzLCBzdG9yYWdlUGFuZWwsIG51bGws ICIiLCAiZnJhbWUtc3RvcmFnZS10cmVlLWl0ZW0iKTsKKyAgICBXZWJJbnNwZWN0b3IuQmFzZVN0 b3JhZ2VUcmVlRWxlbWVudC5jYWxsKHRoaXMsIHN0b3JhZ2VQYW5lbCwgbnVsbCwgIiIsIFsiZnJh bWUtc3RvcmFnZS10cmVlLWl0ZW0iXSk7CiAgICAgdGhpcy5fZnJhbWVJZCA9IGZyYW1lSWQ7CiAg ICAgdGhpcy5zZXRUaXRsZXModGl0bGUsIHN1YnRpdGxlKTsKIH0KQEAgLTk0OCw3ICs5NTQsNyBA QCBXZWJJbnNwZWN0b3IuRnJhbWVUcmVlRWxlbWVudC5wcm90b3R5cGUuX19wcm90b19fID0gV2Vi SW5zcGVjdG9yLkJhc2VTdG9yYWdlVHJlZQogCiBXZWJJbnNwZWN0b3IuRnJhbWVSZXNvdXJjZVRy ZWVFbGVtZW50ID0gZnVuY3Rpb24oc3RvcmFnZVBhbmVsLCByZXNvdXJjZSkKIHsKLSAgICBXZWJJ bnNwZWN0b3IuQmFzZVN0b3JhZ2VUcmVlRWxlbWVudC5jYWxsKHRoaXMsIHN0b3JhZ2VQYW5lbCwg cmVzb3VyY2UsIHJlc291cmNlLmRpc3BsYXlOYW1lLCAicmVzb3VyY2Utc2lkZWJhci10cmVlLWl0 ZW0gcmVzb3VyY2VzLWNhdGVnb3J5LSIgKyByZXNvdXJjZS5jYXRlZ29yeS5uYW1lKTsKKyAgICBX ZWJJbnNwZWN0b3IuQmFzZVN0b3JhZ2VUcmVlRWxlbWVudC5jYWxsKHRoaXMsIHN0b3JhZ2VQYW5l bCwgcmVzb3VyY2UsIHJlc291cmNlLmRpc3BsYXlOYW1lLCBbInJlc291cmNlLXNpZGViYXItdHJl ZS1pdGVtIiwgInJlc291cmNlcy1jYXRlZ29yeS0iICsgcmVzb3VyY2UuY2F0ZWdvcnkubmFtZV0p OwogICAgIHRoaXMuX3Jlc291cmNlID0gcmVzb3VyY2U7CiAgICAgdGhpcy5fcmVzb3VyY2UuYWRk RXZlbnRMaXN0ZW5lcigiZXJyb3JzLXdhcm5pbmdzLXVwZGF0ZWQiLCB0aGlzLl9lcnJvcnNXYXJu aW5nc1VwZGF0ZWQsIHRoaXMpOwogICAgIHRoaXMuX3Jlc291cmNlLmFkZEV2ZW50TGlzdGVuZXIo ImNvbnRlbnQtY2hhbmdlZCIsIHRoaXMuX2NvbnRlbnRDaGFuZ2VkLCB0aGlzKTsKQEAgLTEwNzks NyArMTA4NSw3IEBAIFdlYkluc3BlY3Rvci5GcmFtZVJlc291cmNlVHJlZUVsZW1lbnQucHJvdG90 eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rvci5CYXNlU3RvCiAKIFdlYkluc3BlY3Rvci5EYXRh YmFzZVRyZWVFbGVtZW50ID0gZnVuY3Rpb24oc3RvcmFnZVBhbmVsLCBkYXRhYmFzZSkKIHsKLSAg ICBXZWJJbnNwZWN0b3IuQmFzZVN0b3JhZ2VUcmVlRWxlbWVudC5jYWxsKHRoaXMsIHN0b3JhZ2VQ YW5lbCwgbnVsbCwgZGF0YWJhc2UubmFtZSwgImRhdGFiYXNlLXN0b3JhZ2UtdHJlZS1pdGVtIiwg dHJ1ZSk7CisgICAgV2ViSW5zcGVjdG9yLkJhc2VTdG9yYWdlVHJlZUVsZW1lbnQuY2FsbCh0aGlz LCBzdG9yYWdlUGFuZWwsIG51bGwsIGRhdGFiYXNlLm5hbWUsIFsiZGF0YWJhc2Utc3RvcmFnZS10 cmVlLWl0ZW0iXSwgdHJ1ZSk7CiAgICAgdGhpcy5fZGF0YWJhc2UgPSBkYXRhYmFzZTsKIH0KIApA QCAtMTEyMCw3ICsxMTI2LDcgQEAgV2ViSW5zcGVjdG9yLkRhdGFiYXNlVHJlZUVsZW1lbnQucHJv dG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rvci5CYXNlU3RvcmFnZVQKIAogV2ViSW5zcGVj dG9yLkRhdGFiYXNlVGFibGVUcmVlRWxlbWVudCA9IGZ1bmN0aW9uKHN0b3JhZ2VQYW5lbCwgZGF0 YWJhc2UsIHRhYmxlTmFtZSkKIHsKLSAgICBXZWJJbnNwZWN0b3IuQmFzZVN0b3JhZ2VUcmVlRWxl bWVudC5jYWxsKHRoaXMsIHN0b3JhZ2VQYW5lbCwgbnVsbCwgdGFibGVOYW1lLCAiZGF0YWJhc2Ut c3RvcmFnZS10cmVlLWl0ZW0iKTsKKyAgICBXZWJJbnNwZWN0b3IuQmFzZVN0b3JhZ2VUcmVlRWxl bWVudC5jYWxsKHRoaXMsIHN0b3JhZ2VQYW5lbCwgbnVsbCwgdGFibGVOYW1lLCBbImRhdGFiYXNl LXN0b3JhZ2UtdHJlZS1pdGVtIl0pOwogICAgIHRoaXMuX2RhdGFiYXNlID0gZGF0YWJhc2U7CiAg ICAgdGhpcy5fdGFibGVOYW1lID0gdGFibGVOYW1lOwogfQpAQCAtMTE0MSw3ICsxMTQ3LDcgQEAg V2ViSW5zcGVjdG9yLkRhdGFiYXNlVGFibGVUcmVlRWxlbWVudC5wcm90b3R5cGUuX19wcm90b19f ID0gV2ViSW5zcGVjdG9yLkJhc2VTdG8KIAogV2ViSW5zcGVjdG9yLkRPTVN0b3JhZ2VUcmVlRWxl bWVudCA9IGZ1bmN0aW9uKHN0b3JhZ2VQYW5lbCwgZG9tU3RvcmFnZSwgY2xhc3NOYW1lKQogewot ICAgIFdlYkluc3BlY3Rvci5CYXNlU3RvcmFnZVRyZWVFbGVtZW50LmNhbGwodGhpcywgc3RvcmFn ZVBhbmVsLCBudWxsLCBkb21TdG9yYWdlLmRvbWFpbiA/IGRvbVN0b3JhZ2UuZG9tYWluIDogV2Vi SW5zcGVjdG9yLlVJU3RyaW5nKCJMb2NhbCBGaWxlcyIpLCAiZG9tc3RvcmFnZS1zdG9yYWdlLXRy ZWUtaXRlbSAiICsgY2xhc3NOYW1lKTsKKyAgICBXZWJJbnNwZWN0b3IuQmFzZVN0b3JhZ2VUcmVl RWxlbWVudC5jYWxsKHRoaXMsIHN0b3JhZ2VQYW5lbCwgbnVsbCwgZG9tU3RvcmFnZS5kb21haW4g PyBkb21TdG9yYWdlLmRvbWFpbiA6IFdlYkluc3BlY3Rvci5VSVN0cmluZygiTG9jYWwgRmlsZXMi KSwgWyJkb21zdG9yYWdlLXN0b3JhZ2UtdHJlZS1pdGVtIiwgY2xhc3NOYW1lXSk7CiAgICAgdGhp cy5fZG9tU3RvcmFnZSA9IGRvbVN0b3JhZ2U7CiB9CiAKQEAgLTExNjEsNyArMTE2Nyw3IEBAIFdl Ykluc3BlY3Rvci5ET01TdG9yYWdlVHJlZUVsZW1lbnQucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdl Ykluc3BlY3Rvci5CYXNlU3RvcmFnCiAKIFdlYkluc3BlY3Rvci5Db29raWVUcmVlRWxlbWVudCA9 IGZ1bmN0aW9uKHN0b3JhZ2VQYW5lbCwgY29va2llRG9tYWluKQogewotICAgIFdlYkluc3BlY3Rv ci5CYXNlU3RvcmFnZVRyZWVFbGVtZW50LmNhbGwodGhpcywgc3RvcmFnZVBhbmVsLCBudWxsLCBj b29raWVEb21haW4gPyBjb29raWVEb21haW4gOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkxvY2Fs IEZpbGVzIiksICJjb29raWUtc3RvcmFnZS10cmVlLWl0ZW0iKTsKKyAgICBXZWJJbnNwZWN0b3Iu QmFzZVN0b3JhZ2VUcmVlRWxlbWVudC5jYWxsKHRoaXMsIHN0b3JhZ2VQYW5lbCwgbnVsbCwgY29v a2llRG9tYWluID8gY29va2llRG9tYWluIDogV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJMb2NhbCBG aWxlcyIpLCBbImNvb2tpZS1zdG9yYWdlLXRyZWUtaXRlbSJdKTsKICAgICB0aGlzLl9jb29raWVE b21haW4gPSBjb29raWVEb21haW47CiB9CiAKQEAgLTExODEsNyArMTE4Nyw3IEBAIFdlYkluc3Bl Y3Rvci5Db29raWVUcmVlRWxlbWVudC5wcm90b3R5cGUuX19wcm90b19fID0gV2ViSW5zcGVjdG9y LkJhc2VTdG9yYWdlVHJlCiAKIFdlYkluc3BlY3Rvci5BcHBsaWNhdGlvbkNhY2hlVHJlZUVsZW1l bnQgPSBmdW5jdGlvbihzdG9yYWdlUGFuZWwsIGFwcGNhY2hlRG9tYWluKQogewotICAgIFdlYklu c3BlY3Rvci5CYXNlU3RvcmFnZVRyZWVFbGVtZW50LmNhbGwodGhpcywgc3RvcmFnZVBhbmVsLCBu dWxsLCBhcHBjYWNoZURvbWFpbiA/IGFwcGNhY2hlRG9tYWluIDogV2ViSW5zcGVjdG9yLlVJU3Ry aW5nKCJMb2NhbCBGaWxlcyIpLCAiYXBwbGljYXRpb24tY2FjaGUtc3RvcmFnZS10cmVlLWl0ZW0i KTsKKyAgICBXZWJJbnNwZWN0b3IuQmFzZVN0b3JhZ2VUcmVlRWxlbWVudC5jYWxsKHRoaXMsIHN0 b3JhZ2VQYW5lbCwgbnVsbCwgYXBwY2FjaGVEb21haW4gPyBhcHBjYWNoZURvbWFpbiA6IFdlYklu c3BlY3Rvci5VSVN0cmluZygiTG9jYWwgRmlsZXMiKSwgWyJhcHBsaWNhdGlvbi1jYWNoZS1zdG9y YWdlLXRyZWUtaXRlbSJdKTsKICAgICB0aGlzLl9hcHBjYWNoZURvbWFpbiA9IGFwcGNhY2hlRG9t YWluOwogfQogCkBAIC0xMjAyLDcgKzEyMDgsNyBAQCBXZWJJbnNwZWN0b3IuQXBwbGljYXRpb25D YWNoZVRyZWVFbGVtZW50LnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuQmFzZQog V2ViSW5zcGVjdG9yLlJlc291cmNlUmV2aXNpb25UcmVlRWxlbWVudCA9IGZ1bmN0aW9uKHN0b3Jh Z2VQYW5lbCwgcmV2aXNpb24pCiB7CiAgICAgdmFyIHRpdGxlID0gcmV2aXNpb24udGltZXN0YW1w ID8gcmV2aXNpb24udGltZXN0YW1wLnRvTG9jYWxlVGltZVN0cmluZygpIDogV2ViSW5zcGVjdG9y LlVJU3RyaW5nKCIob3JpZ2luYWwpIik7Ci0gICAgV2ViSW5zcGVjdG9yLkJhc2VTdG9yYWdlVHJl ZUVsZW1lbnQuY2FsbCh0aGlzLCBzdG9yYWdlUGFuZWwsIG51bGwsIHRpdGxlLCAicmVzb3VyY2Ut c2lkZWJhci10cmVlLWl0ZW0gcmVzb3VyY2VzLWNhdGVnb3J5LSIgKyByZXZpc2lvbi5jYXRlZ29y eS5uYW1lKTsKKyAgICBXZWJJbnNwZWN0b3IuQmFzZVN0b3JhZ2VUcmVlRWxlbWVudC5jYWxsKHRo aXMsIHN0b3JhZ2VQYW5lbCwgbnVsbCwgdGl0bGUsIFsicmVzb3VyY2Utc2lkZWJhci10cmVlLWl0 ZW0iLCAicmVzb3VyY2VzLWNhdGVnb3J5LSIgKyByZXZpc2lvbi5jYXRlZ29yeS5uYW1lXSk7CiAg ICAgaWYgKHJldmlzaW9uLnRpbWVzdGFtcCkKICAgICAgICAgdGhpcy50b29sdGlwID0gcmV2aXNp b24udGltZXN0YW1wLnRvTG9jYWxlU3RyaW5nKCk7CiAgICAgdGhpcy5fcmVzb3VyY2UgPSByZXZp c2lvbjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvdXRp bGl0aWVzLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC91dGlsaXRpZXMu anMKaW5kZXggNjQ5M2M5ZS4uMmQ5NjBkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC91dGlsaXRpZXMuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC91dGlsaXRpZXMuanMKQEAgLTE1NiwxOSArMTU2LDcgQEAgTm9kZS5wcm90 b3R5cGUucmFuZ2VCb3VuZGFyeUZvck9mZnNldCA9IGZ1bmN0aW9uKG9mZnNldCkKIAogRWxlbWVu dC5wcm90b3R5cGUucmVtb3ZlU3R5bGVDbGFzcyA9IGZ1bmN0aW9uKGNsYXNzTmFtZSkgCiB7Ci0g ICAgLy8gVGVzdCBmb3IgdGhlIHNpbXBsZSBjYXNlIGZpcnN0LgotICAgIGlmICh0aGlzLmNsYXNz TmFtZSA9PT0gY2xhc3NOYW1lKSB7Ci0gICAgICAgIHRoaXMuY2xhc3NOYW1lID0gIiI7Ci0gICAg ICAgIHJldHVybjsKLSAgICB9Ci0KLSAgICB2YXIgaW5kZXggPSB0aGlzLmNsYXNzTmFtZS5pbmRl eE9mKGNsYXNzTmFtZSk7Ci0gICAgaWYgKGluZGV4ID09PSAtMSkKLSAgICAgICAgcmV0dXJuOwot Ci0gICAgdGhpcy5jbGFzc05hbWUgPSB0aGlzLmNsYXNzTmFtZS5zcGxpdCgiICIpLmZpbHRlcihm dW5jdGlvbihzKSB7Ci0gICAgICAgIHJldHVybiBzICYmIHMgIT09IGNsYXNzTmFtZTsKLSAgICB9 KS5qb2luKCIgIik7CisgICAgdGhpcy5jbGFzc0xpc3QucmVtb3ZlKGNsYXNzTmFtZSk7CiB9CiAK IEVsZW1lbnQucHJvdG90eXBlLnJlbW92ZU1hdGNoaW5nU3R5bGVDbGFzc2VzID0gZnVuY3Rpb24o Y2xhc3NOYW1lUmVnZXgpCkBAIC0xODAsMjMgKzE2OCwxMiBAQCBFbGVtZW50LnByb3RvdHlwZS5y ZW1vdmVNYXRjaGluZ1N0eWxlQ2xhc3NlcyA9IGZ1bmN0aW9uKGNsYXNzTmFtZVJlZ2V4KQogCiBF bGVtZW50LnByb3RvdHlwZS5hZGRTdHlsZUNsYXNzID0gZnVuY3Rpb24oY2xhc3NOYW1lKSAKIHsK LSAgICBpZiAoY2xhc3NOYW1lICYmICF0aGlzLmhhc1N0eWxlQ2xhc3MoY2xhc3NOYW1lKSkKLSAg ICAgICAgdGhpcy5jbGFzc05hbWUgKz0gKHRoaXMuY2xhc3NOYW1lLmxlbmd0aCA/ICIgIiArIGNs YXNzTmFtZSA6IGNsYXNzTmFtZSk7CisgICAgdGhpcy5jbGFzc0xpc3QuYWRkKGNsYXNzTmFtZSk7 CiB9CiAKIEVsZW1lbnQucHJvdG90eXBlLmhhc1N0eWxlQ2xhc3MgPSBmdW5jdGlvbihjbGFzc05h bWUpIAogewotICAgIGlmICghY2xhc3NOYW1lKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAg Ly8gVGVzdCBmb3IgdGhlIHNpbXBsZSBjYXNlCi0gICAgaWYgKHRoaXMuY2xhc3NOYW1lID09PSBj bGFzc05hbWUpCi0gICAgICAgIHJldHVybiB0cnVlOwotCi0gICAgdmFyIGluZGV4ID0gdGhpcy5j bGFzc05hbWUuaW5kZXhPZihjbGFzc05hbWUpOwotICAgIGlmIChpbmRleCA9PT0gLTEpCi0gICAg ICAgIHJldHVybiBmYWxzZTsKLSAgICB2YXIgdG9UZXN0ID0gIiAiICsgdGhpcy5jbGFzc05hbWUg KyAiICI7Ci0gICAgcmV0dXJuIHRvVGVzdC5pbmRleE9mKCIgIiArIGNsYXNzTmFtZSArICIgIiwg aW5kZXgpICE9PSAtMTsKKyAgICByZXR1cm4gdGhpcy5jbGFzc0xpc3QuY29udGFpbnMoY2xhc3NO YW1lKTsKIH0KIAogRWxlbWVudC5wcm90b3R5cGUucG9zaXRpb25BdCA9IGZ1bmN0aW9uKHgsIHkp Cg==