68997 2011-09-28 05:52:24 -0700 Web Inspector: update call frame location when source mapping is changed. 2011-10-04 06:42:59 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 podivilov podivilov apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 474688 0 podivilov 2011-09-28 05:52:24 -0700 Web Inspector: update call frame location when source mapping is changed. Currently we use fake "debugger-paused" event hack to update execution line and call stack placards when source mapping is changed. - add PresentationCallFrame.createPlacard method to create "live" placards that are updated on source mapping changes. This works like DebuggerPresentationModel.linkifyLocation. - fire execution-line-changed event when selected call frame or source mapping is changed. 474689 1 109009 podivilov 2011-09-28 05:53:45 -0700 Created attachment 109009 Patch 475232 2 109009 pfeldman 2011-09-28 22:42:13 -0700 Comment on attachment 109009 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=109009&action=review > Source/WebCore/inspector/front-end/DebuggerPresentationModel.js:378 > + this._executionRawSourceCode.removeEventListener(WebInspector.RawSourceCode.Events.SourceMappingUpdated, this._dispatchExecutionLineChanged, this); I don't think the concept of the executionRawSourceCode should exist. Execution line for us is the line of the call frame, the one from the UI. > Source/WebCore/inspector/front-end/DebuggerPresentationModel.js:-445 > - get isInternalScript() You should mention this change in the ChangeLog > Source/WebCore/inspector/front-end/DebuggerPresentationModel.js:509 > + this._rawSourceCode.addEventListener(WebInspector.RawSourceCode.Events.SourceMappingUpdated, updatePlacard, this); Why aren't we using linkifyLocation here? 475287 3 podivilov 2011-09-29 00:34:11 -0700 (In reply to comment #2) > (From update of attachment 109009 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=109009&action=review > > > Source/WebCore/inspector/front-end/DebuggerPresentationModel.js:378 > > + this._executionRawSourceCode.removeEventListener(WebInspector.RawSourceCode.Events.SourceMappingUpdated, this._dispatchExecutionLineChanged, this); > > I don't think the concept of the executionRawSourceCode should exist. Execution line for us is the line of the call frame, the one from the UI. Done. > > > Source/WebCore/inspector/front-end/DebuggerPresentationModel.js:-445 > > - get isInternalScript() > > You should mention this change in the ChangeLog Done. > > > Source/WebCore/inspector/front-end/DebuggerPresentationModel.js:509 > > + this._rawSourceCode.addEventListener(WebInspector.RawSourceCode.Events.SourceMappingUpdated, updatePlacard, this); > > Why aren't we using linkifyLocation here? linkifyLocation creates anchors, not placards. How can we use it here? 475289 4 109131 podivilov 2011-09-29 00:35:05 -0700 Created attachment 109131 Patch 477573 5 podivilov 2011-10-04 06:42:59 -0700 Committed r96588: <http://trac.webkit.org/changeset/96588> 109009 2011-09-28 05:53:45 -0700 2011-09-29 00:34:57 -0700 Patch bug-68997-20110928165343.patch text/plain 16881 podivilov U3VidmVyc2lvbiBSZXZpc2lvbjogOTYwOTcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBlYjc1OGUzYzI1MzYyYThl ZTc4Yzc1ODFlNWM4ZjA4ZDhlNjhlYmQ5Li4zNjUxY2NkOTA5ODJmZDZhODdkYjNmZWQ1YTUxZDdm MzgzZWMwMTJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTEtMDktMjggIFBhdmVs IFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogdXBkYXRlIGNhbGwgZnJhbWUgbG9jYXRpb24gd2hlbiBzb3VyY2UgbWFwcGluZyBpcyBj aGFuZ2VkLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 Njg5OTcKKworICAgICAgICBDdXJyZW50bHkgd2UgdXNlIGZha2UgImRlYnVnZ2VyLXBhdXNlZCIg ZXZlbnQgaGFjayB0byB1cGRhdGUgZXhlY3V0aW9uIGxpbmUgYW5kIGNhbGwgc3RhY2sgcGxhY2Fy ZHMgd2hlbiBzb3VyY2UgbWFwcGluZyBpcyBjaGFuZ2VkLgorICAgICAgICAtIGFkZCBQcmVzZW50 YXRpb25DYWxsRnJhbWUuY3JlYXRlUGxhY2FyZCBtZXRob2QgdG8gY3JlYXRlICJsaXZlIiBwbGFj YXJkcyB0aGF0IGFyZSB1cGRhdGVkIG9uIHNvdXJjZSBtYXBwaW5nIGNoYW5nZXMuCisgICAgICAg IC0gZmlyZSBleGVjdXRpb24tbGluZS1jaGFuZ2VkIGV2ZW50IHdoZW4gc2VsZWN0ZWQgY2FsbCBm cmFtZSBvciBzb3VyY2UgbWFwcGluZyBpcyBjaGFuZ2VkLgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9DYWxsU3Rh Y2tTaWRlYmFyUGFuZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5DYWxsU3RhY2tTaWRlYmFy UGFuZS5wcm90b3R5cGUudXBkYXRlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0Rl YnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdn ZXJQcmVzZW50YXRpb25Nb2RlbCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVz ZW50YXRpb25Nb2RlbC5wcm90b3R5cGUuX2RlYnVnZ2VyUGF1c2VkKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlwZS5fZGVidWdnZXJSZXN1 bWVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnBy b3RvdHlwZS5zZXQgc2VsZWN0ZWRDYWxsRnJhbWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRl YnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlLmdldCBzZWxlY3RlZENhbGxGcmFtZSk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5 cGUuX2Rpc3BhdGNoRXhlY3V0aW9uTGluZUNoYW5nZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlLl9kZWJ1Z2dlclJlc2V0KToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5QcmVzZW50YXRpb25DYWxsRnJhbWUpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlByZXNlbnRhdGlvbkNhbGxGcmFtZS5wcm90b3R5cGUuZ2V0IHJhd1NvdXJjZUNv ZGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlByZXNlbnRhdGlvbkNhbGxGcmFtZS5wcm90b3R5 cGUuY3JlYXRlUGxhY2FyZC51cGRhdGVQbGFjYXJkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Q cmVzZW50YXRpb25DYWxsRnJhbWUucHJvdG90eXBlLmNyZWF0ZVBsYWNhcmQpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlByZXNlbnRhdGlvbkNhbGxGcmFtZS5wcm90b3R5cGUudWlMb2NhdGlvbik6 CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5fZGVidWdnZXJQYXVzZWQuZWxz ZS5kaWRHZXRVSUxvY2F0aW9uKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwu cHJvdG90eXBlLl9kZWJ1Z2dlclBhdXNlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0 c1BhbmVsLnByb3RvdHlwZS5fZXhlY3V0aW9uTGluZUNoYW5nZWQpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuX2NhbGxGcmFtZVNlbGVjdGVkKToKKwogMjAx MS0wOS0yMSAgUGF2ZWwgUG9kaXZpbG92ICA8cG9kaXZpbG92QGNocm9taXVtLm9yZz4KIAogICAg ICAgICBXZWIgSW5zcGVjdG9yOiBtaWdyYXRlIFJhd1NvdXJjZUNvZGUgY2xpZW50cyB0byBTb3Vy Y2VNYXBwaW5nIGNsYXNzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9DYWxsU3RhY2tTaWRlYmFyUGFuZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvQ2FsbFN0YWNrU2lkZWJhclBhbmUuanMKaW5kZXggNzU1MWI3OGZmNDQ3ZTYw NzljNmY4NTg4MDU0MmJjMmJkODBjODBmZi4uMmMxYmI0ZDU3ZWQ4NWQwNTE0YmM0ZTc0NGNmZTI4 NzRlMWMxMTIyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9DYWxsU3RhY2tTaWRlYmFyUGFuZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0NhbGxTdGFja1NpZGViYXJQYW5lLmpzCkBAIC00OCwyOCArNDgsOSBAQCBXZWJJ bnNwZWN0b3IuQ2FsbFN0YWNrU2lkZWJhclBhbmUucHJvdG90eXBlID0gewogCiAgICAgICAgIGZv ciAodmFyIGkgPSAwOyBpIDwgY2FsbEZyYW1lcy5sZW5ndGg7ICsraSkgewogICAgICAgICAgICAg dmFyIGNhbGxGcmFtZSA9IGNhbGxGcmFtZXNbaV07Ci0gICAgICAgICAgICB2YXIgdGl0bGUgPSBj YWxsRnJhbWUuZnVuY3Rpb25OYW1lIHx8IFdlYkluc3BlY3Rvci5VSVN0cmluZygiKGFub255bW91 cyBmdW5jdGlvbikiKTsKLQotICAgICAgICAgICAgdmFyIHN1YnRpdGxlOwotICAgICAgICAgICAg aWYgKCFjYWxsRnJhbWUuaXNJbnRlcm5hbFNjcmlwdCkKLSAgICAgICAgICAgICAgICBzdWJ0aXRs ZSA9IFdlYkluc3BlY3Rvci5kaXNwbGF5TmFtZUZvclVSTChjYWxsRnJhbWUudXJsKTsKLSAgICAg ICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICBzdWJ0aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0 cmluZygiKGludGVybmFsIHNjcmlwdCkiKTsKLQotICAgICAgICAgICAgdmFyIHBsYWNhcmQgPSBu ZXcgV2ViSW5zcGVjdG9yLlBsYWNhcmQodGl0bGUsIHN1YnRpdGxlKTsKKyAgICAgICAgICAgIHZh ciBwbGFjYXJkID0gY2FsbEZyYW1lLmNyZWF0ZVBsYWNhcmQoKTsKICAgICAgICAgICAgIHBsYWNh cmQuY2FsbEZyYW1lID0gY2FsbEZyYW1lOwogICAgICAgICAgICAgcGxhY2FyZC5lbGVtZW50LmFk ZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5fcGxhY2FyZFNlbGVjdGVkLmJpbmQodGhpcywg cGxhY2FyZCksIGZhbHNlKTsKLQotICAgICAgICAgICAgZnVuY3Rpb24gZGlkR2V0U291cmNlTGlu ZShwbGFjYXJkLCB1aVNvdXJjZUNvZGUsIGxpbmVOdW1iZXIpCi0gICAgICAgICAgICB7Ci0gICAg ICAgICAgICAgICAgaWYgKHBsYWNhcmQuc3VidGl0bGUpCi0gICAgICAgICAgICAgICAgICAgIHBs YWNhcmQuc3VidGl0bGUgKz0gIjoiICsgKGxpbmVOdW1iZXIgKyAxKTsKLSAgICAgICAgICAgICAg ICBlbHNlCi0gICAgICAgICAgICAgICAgICAgIHBsYWNhcmQuc3VidGl0bGUgPSBXZWJJbnNwZWN0 b3IuVUlTdHJpbmcoImxpbmUgJWQiLCBsaW5lTnVtYmVyICsgMSk7Ci0gICAgICAgICAgICAgICAg cGxhY2FyZC5fdGV4dCA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiJXMoKSBhdCAlcyIsIHBsYWNh cmQudGl0bGUsIHBsYWNhcmQuc3VidGl0bGUpOwotICAgICAgICAgICAgfQotICAgICAgICAgICAg Y2FsbEZyYW1lLnNvdXJjZUxpbmUoZGlkR2V0U291cmNlTGluZS5iaW5kKHRoaXMsIHBsYWNhcmQp KTsKLQogICAgICAgICAgICAgdGhpcy5wbGFjYXJkcy5wdXNoKHBsYWNhcmQpOwogICAgICAgICAg ICAgdGhpcy5ib2R5RWxlbWVudC5hcHBlbmRDaGlsZChwbGFjYXJkLmVsZW1lbnQpOwogICAgICAg ICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVn Z2VyUHJlc2VudGF0aW9uTW9kZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0RlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuanMKaW5kZXggM2IyZjg4NDk4NjljZGJkN2Jj NTk1YTdkNzg5MjdhNmRlYzhiYmQ3ZC4uYTE2OTk2Y2E0NDA0NjliM2NmZWZkNTM0NDk5NTZjMmM4 OTZmNjY2NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9E ZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qcwpAQCAtMzcsNyArMzcsNiBA QCBXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbCA9IGZ1bmN0aW9uKCkKICAg ICB0aGlzLl9mb3JtYXR0ZXIgPSBuZXcgV2ViSW5zcGVjdG9yLlNjcmlwdEZvcm1hdHRlcigpOwog ICAgIHRoaXMuX3Jhd1NvdXJjZUNvZGUgPSB7fTsKICAgICB0aGlzLl9wcmVzZW50YXRpb25DYWxs RnJhbWVzID0gW107Ci0gICAgdGhpcy5fc2VsZWN0ZWRDYWxsRnJhbWVJbmRleCA9IDA7CiAKICAg ICB0aGlzLl9icmVha3BvaW50TWFuYWdlciA9IG5ldyBXZWJJbnNwZWN0b3IuQnJlYWtwb2ludE1h bmFnZXIoV2ViSW5zcGVjdG9yLnNldHRpbmdzLmJyZWFrcG9pbnRzLCB0aGlzLl9icmVha3BvaW50 QWRkZWQuYmluZCh0aGlzKSwgdGhpcy5fYnJlYWtwb2ludFJlbW92ZWQuYmluZCh0aGlzKSwgV2Vi SW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwpOwogCkBAIC02Miw3ICs2MSw4IEBAIFdlYkluc3BlY3Rv ci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLkV2ZW50cyA9IHsKICAgICBCcmVha3BvaW50UmVt b3ZlZDogImJyZWFrcG9pbnQtcmVtb3ZlZCIsCiAgICAgRGVidWdnZXJQYXVzZWQ6ICJkZWJ1Z2dl ci1wYXVzZWQiLAogICAgIERlYnVnZ2VyUmVzdW1lZDogImRlYnVnZ2VyLXJlc3VtZWQiLAotICAg IENhbGxGcmFtZVNlbGVjdGVkOiAiY2FsbC1mcmFtZS1zZWxlY3RlZCIKKyAgICBDYWxsRnJhbWVT ZWxlY3RlZDogImNhbGwtZnJhbWUtc2VsZWN0ZWQiLAorICAgIEV4ZWN1dGlvbkxpbmVDaGFuZ2Vk OiAiZXhlY3V0aW9uLWxpbmUtY2hhbmdlZCIKIH0KIAogV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJl c2VudGF0aW9uTW9kZWwucHJvdG90eXBlID0gewpAQCAtMzUyLDM1ICszNTIsNTMgQEAgV2ViSW5z cGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlID0gewogICAgICAgICB0 aGlzLl9wcmVzZW50YXRpb25DYWxsRnJhbWVzID0gW107CiAgICAgICAgIGZvciAodmFyIGkgPSAw OyBpIDwgY2FsbEZyYW1lcy5sZW5ndGg7ICsraSkgewogICAgICAgICAgICAgdmFyIGNhbGxGcmFt ZSA9IGNhbGxGcmFtZXNbaV07Ci0gICAgICAgICAgICB2YXIgcmF3U291cmNlQ29kZTsKICAgICAg ICAgICAgIHZhciBzY3JpcHQgPSBXZWJJbnNwZWN0b3IuZGVidWdnZXJNb2RlbC5zY3JpcHRGb3JT b3VyY2VJRChjYWxsRnJhbWUubG9jYXRpb24uc2NyaXB0SWQpOwotICAgICAgICAgICAgaWYgKHNj cmlwdCkKLSAgICAgICAgICAgICAgICByYXdTb3VyY2VDb2RlID0gdGhpcy5fcmF3U291cmNlQ29k ZUZvclNjcmlwdChzY3JpcHQuc291cmNlVVJMLCBzY3JpcHQuc2NyaXB0SWQpOworICAgICAgICAg ICAgaWYgKCFzY3JpcHQpCisgICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICB2 YXIgcmF3U291cmNlQ29kZSA9IHRoaXMuX3Jhd1NvdXJjZUNvZGVGb3JTY3JpcHQoc2NyaXB0LnNv dXJjZVVSTCwgc2NyaXB0LnNjcmlwdElkKTsKICAgICAgICAgICAgIHRoaXMuX3ByZXNlbnRhdGlv bkNhbGxGcmFtZXMucHVzaChuZXcgV2ViSW5zcGVjdG9yLlByZXNlbnRhdGlvbkNhbGxGcmFtZShj YWxsRnJhbWUsIGksIHRoaXMsIHJhd1NvdXJjZUNvZGUpKTsKICAgICAgICAgfQogICAgICAgICB2 YXIgZGV0YWlscyA9IFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1vZGVsLmRlYnVnZ2VyUGF1c2VkRGV0 YWlsczsKICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9y LkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuRXZlbnRzLkRlYnVnZ2VyUGF1c2VkLCB7IGNhbGxG cmFtZXM6IHRoaXMuX3ByZXNlbnRhdGlvbkNhbGxGcmFtZXMsIGRldGFpbHM6IGRldGFpbHMgfSk7 CiAKLSAgICAgICAgdGhpcy5zZWxlY3RlZENhbGxGcmFtZSA9IHRoaXMuX3ByZXNlbnRhdGlvbkNh bGxGcmFtZXNbdGhpcy5fc2VsZWN0ZWRDYWxsRnJhbWVJbmRleF07CisgICAgICAgIHRoaXMuc2Vs ZWN0ZWRDYWxsRnJhbWUgPSB0aGlzLl9wcmVzZW50YXRpb25DYWxsRnJhbWVzWzBdOwogICAgIH0s CiAKICAgICBfZGVidWdnZXJSZXN1bWVkOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICB0aGlz Ll9wcmVzZW50YXRpb25DYWxsRnJhbWVzID0gW107Ci0gICAgICAgIHRoaXMuX3NlbGVjdGVkQ2Fs bEZyYW1lSW5kZXggPSAwOworICAgICAgICB0aGlzLnNlbGVjdGVkQ2FsbEZyYW1lID0gbnVsbDsK ICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkRlYnVn Z2VyUHJlc2VudGF0aW9uTW9kZWwuRXZlbnRzLkRlYnVnZ2VyUmVzdW1lZCk7CiAgICAgfSwKIAog ICAgIHNldCBzZWxlY3RlZENhbGxGcmFtZShjYWxsRnJhbWUpCiAgICAgewotICAgICAgICB0aGlz Ll9zZWxlY3RlZENhbGxGcmFtZUluZGV4ID0gY2FsbEZyYW1lLmluZGV4OwotICAgICAgICBjYWxs RnJhbWUuc2VsZWN0KCk7CisgICAgICAgIHRoaXMuX3NlbGVjdGVkQ2FsbEZyYW1lID0gY2FsbEZy YW1lOworICAgICAgICBpZiAodGhpcy5fZXhlY3V0aW9uUmF3U291cmNlQ29kZSkKKyAgICAgICAg ICAgIHRoaXMuX2V4ZWN1dGlvblJhd1NvdXJjZUNvZGUucmVtb3ZlRXZlbnRMaXN0ZW5lcihXZWJJ bnNwZWN0b3IuUmF3U291cmNlQ29kZS5FdmVudHMuU291cmNlTWFwcGluZ1VwZGF0ZWQsIHRoaXMu X2Rpc3BhdGNoRXhlY3V0aW9uTGluZUNoYW5nZWQsIHRoaXMpOworCisgICAgICAgIGlmICghY2Fs bEZyYW1lKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIGNhbGxGcmFtZS5yYXdTb3Vy Y2VDb2RlLmZvcmNlVXBkYXRlU291cmNlTWFwcGluZygpOwogICAgICAgICB0aGlzLmRpc3BhdGNo RXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5F dmVudHMuQ2FsbEZyYW1lU2VsZWN0ZWQsIGNhbGxGcmFtZSk7CisKKyAgICAgICAgdGhpcy5fZXhl Y3V0aW9uUmF3U291cmNlQ29kZSA9IGNhbGxGcmFtZS5yYXdTb3VyY2VDb2RlOworICAgICAgICB0 aGlzLl9leGVjdXRpb25SYXdMb2NhdGlvbiA9IGNhbGxGcmFtZS5fY2FsbEZyYW1lLmxvY2F0aW9u OworICAgICAgICBpZiAodGhpcy5fZXhlY3V0aW9uUmF3U291cmNlQ29kZS5zb3VyY2VNYXBwaW5n KQorICAgICAgICAgICAgdGhpcy5fZGlzcGF0Y2hFeGVjdXRpb25MaW5lQ2hhbmdlZCgpOworICAg ICAgICB0aGlzLl9leGVjdXRpb25SYXdTb3VyY2VDb2RlLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5z cGVjdG9yLlJhd1NvdXJjZUNvZGUuRXZlbnRzLlNvdXJjZU1hcHBpbmdVcGRhdGVkLCB0aGlzLl9k aXNwYXRjaEV4ZWN1dGlvbkxpbmVDaGFuZ2VkLCB0aGlzKTsKICAgICB9LAogCiAgICAgZ2V0IHNl bGVjdGVkQ2FsbEZyYW1lKCkKICAgICB7Ci0gICAgICAgIHJldHVybiB0aGlzLl9wcmVzZW50YXRp b25DYWxsRnJhbWVzW3RoaXMuX3NlbGVjdGVkQ2FsbEZyYW1lSW5kZXhdOworICAgICAgICByZXR1 cm4gdGhpcy5fc2VsZWN0ZWRDYWxsRnJhbWU7CisgICAgfSwKKworICAgIF9kaXNwYXRjaEV4ZWN1 dGlvbkxpbmVDaGFuZ2VkOiBmdW5jdGlvbihldmVudCkKKyAgICB7CisgICAgICAgIHZhciB1aUxv Y2F0aW9uID0gdGhpcy5fZXhlY3V0aW9uUmF3U291cmNlQ29kZS5zb3VyY2VNYXBwaW5nLnJhd0xv Y2F0aW9uVG9VSUxvY2F0aW9uKHRoaXMuX2V4ZWN1dGlvblJhd0xvY2F0aW9uKTsKKyAgICAgICAg dGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2Vu dGF0aW9uTW9kZWwuRXZlbnRzLkV4ZWN1dGlvbkxpbmVDaGFuZ2VkLCB1aUxvY2F0aW9uKTsKICAg ICB9LAogCiAgICAgX3Jhd1NvdXJjZUNvZGVGb3JTY3JpcHQ6IGZ1bmN0aW9uKHNvdXJjZVVSTCwg c2NyaXB0SWQpCkBAIC00MTAsOSArNDI4LDExIEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNl bnRhdGlvbk1vZGVsLnByb3RvdHlwZSA9IHsKIAogICAgIF9kZWJ1Z2dlclJlc2V0OiBmdW5jdGlv bigpCiAgICAgeworICAgICAgICBmb3IgKHZhciBpZCBpbiB0aGlzLl9yYXdTb3VyY2VDb2RlKQor ICAgICAgICAgICAgdGhpcy5fcmF3U291cmNlQ29kZVtpZF0ucmVtb3ZlQWxsTGlzdGVuZXJzKCk7 CiAgICAgICAgIHRoaXMuX3Jhd1NvdXJjZUNvZGUgPSB7fTsKICAgICAgICAgdGhpcy5fcHJlc2Vu dGF0aW9uQ2FsbEZyYW1lcyA9IFtdOwotICAgICAgICB0aGlzLl9zZWxlY3RlZENhbGxGcmFtZUlu ZGV4ID0gMDsKKyAgICAgICAgdGhpcy5fc2VsZWN0ZWRDYWxsRnJhbWUgPSBudWxsOwogICAgICAg ICB0aGlzLl9icmVha3BvaW50TWFuYWdlci5kZWJ1Z2dlclJlc2V0KCk7CiAgICAgfQogfQpAQCAt NDI4LDMxICs0NDgsMTQgQEAgV2ViSW5zcGVjdG9yLlByZXNlbnRhdGlvbkNhbGxGcmFtZSA9IGZ1 bmN0aW9uKGNhbGxGcmFtZSwgaW5kZXgsIG1vZGVsLCByYXdTb3VyY2UKICAgICB0aGlzLl9pbmRl eCA9IGluZGV4OwogICAgIHRoaXMuX21vZGVsID0gbW9kZWw7CiAgICAgdGhpcy5fcmF3U291cmNl Q29kZSA9IHJhd1NvdXJjZUNvZGU7Ci0gICAgdGhpcy5fc2NyaXB0ID0gV2ViSW5zcGVjdG9yLmRl YnVnZ2VyTW9kZWwuc2NyaXB0Rm9yU291cmNlSUQoY2FsbEZyYW1lLmxvY2F0aW9uLnNjcmlwdElk KTsKIH0KIAogV2ViSW5zcGVjdG9yLlByZXNlbnRhdGlvbkNhbGxGcmFtZS5wcm90b3R5cGUgPSB7 Ci0gICAgZ2V0IGZ1bmN0aW9uTmFtZSgpCi0gICAgewotICAgICAgICByZXR1cm4gdGhpcy5fY2Fs bEZyYW1lLmZ1bmN0aW9uTmFtZTsKLSAgICB9LAotCiAgICAgZ2V0IHR5cGUoKQogICAgIHsKICAg ICAgICAgcmV0dXJuIHRoaXMuX2NhbGxGcmFtZS50eXBlOwogICAgIH0sCiAKLSAgICBnZXQgaXNJ bnRlcm5hbFNjcmlwdCgpCi0gICAgewotICAgICAgICByZXR1cm4gIXRoaXMuX3NjcmlwdDsKLSAg ICB9LAotCi0gICAgZ2V0IHVybCgpCi0gICAgewotICAgICAgICBpZiAodGhpcy5fcmF3U291cmNl Q29kZSAmJiB0aGlzLl9yYXdTb3VyY2VDb2RlLnNvdXJjZU1hcHBpbmcpCi0gICAgICAgICAgICBy ZXR1cm4gdGhpcy5fcmF3U291cmNlQ29kZS5zb3VyY2VNYXBwaW5nLnVpU291cmNlQ29kZS51cmw7 Ci0gICAgfSwKLQogICAgIGdldCBzY29wZUNoYWluKCkKICAgICB7CiAgICAgICAgIHJldHVybiB0 aGlzLl9jYWxsRnJhbWUuc2NvcGVDaGFpbjsKQEAgLTQ2OCwxMCArNDcxLDkgQEAgV2ViSW5zcGVj dG9yLlByZXNlbnRhdGlvbkNhbGxGcmFtZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiB0 aGlzLl9pbmRleDsKICAgICB9LAogCi0gICAgc2VsZWN0OiBmdW5jdGlvbigpCisgICAgZ2V0IHJh d1NvdXJjZUNvZGUoKQogICAgIHsKLSAgICAgICAgaWYgKHRoaXMuX3Jhd1NvdXJjZUNvZGUpCi0g ICAgICAgICAgICB0aGlzLl9yYXdTb3VyY2VDb2RlLmZvcmNlVXBkYXRlU291cmNlTWFwcGluZygp OworICAgICAgICByZXR1cm4gdGhpcy5fcmF3U291cmNlQ29kZTsKICAgICB9LAogCiAgICAgZXZh bHVhdGU6IGZ1bmN0aW9uKGNvZGUsIG9iamVjdEdyb3VwLCBpbmNsdWRlQ29tbWFuZExpbmVBUEks IHJldHVybkJ5VmFsdWUsIGNhbGxiYWNrKQpAQCAtNDkyLDI3ICs0OTQsMzMgQEAgV2ViSW5zcGVj dG9yLlByZXNlbnRhdGlvbkNhbGxGcmFtZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIERlYnVnZ2Vy QWdlbnQuZXZhbHVhdGVPbkNhbGxGcmFtZSh0aGlzLl9jYWxsRnJhbWUuY2FsbEZyYW1lSWQsIGNv ZGUsIG9iamVjdEdyb3VwLCBpbmNsdWRlQ29tbWFuZExpbmVBUEksIHJldHVybkJ5VmFsdWUsIGRp ZEV2YWx1YXRlT25DYWxsRnJhbWUuYmluZCh0aGlzKSk7CiAgICAgfSwKIAotICAgIHNvdXJjZUxp bmU6IGZ1bmN0aW9uKGNhbGxiYWNrKQorICAgIGNyZWF0ZVBsYWNhcmQ6IGZ1bmN0aW9uKHRpdGxl LCBzdWJ0aXRsZSkKICAgICB7Ci0gICAgICAgIHZhciByYXdMb2NhdGlvbiA9IHRoaXMuX2NhbGxG cmFtZS5sb2NhdGlvbjsKLSAgICAgICAgaWYgKCF0aGlzLl9yYXdTb3VyY2VDb2RlKSB7Ci0gICAg ICAgICAgICBjYWxsYmFjayh1bmRlZmluZWQsIHJhd0xvY2F0aW9uLmxpbmVOdW1iZXIpOwotICAg ICAgICAgICAgcmV0dXJuOwotICAgICAgICB9Ci0KLSAgICAgICAgaWYgKHRoaXMuX3Jhd1NvdXJj ZUNvZGUuc291cmNlTWFwcGluZykgewotICAgICAgICAgICAgdmFyIHVpTG9jYXRpb24gPSB0aGlz Ll9yYXdTb3VyY2VDb2RlLnNvdXJjZU1hcHBpbmcucmF3TG9jYXRpb25Ub1VJTG9jYXRpb24ocmF3 TG9jYXRpb24pOwotICAgICAgICAgICAgY2FsbGJhY2sodWlMb2NhdGlvbi51aVNvdXJjZUNvZGUs IHVpTG9jYXRpb24ubGluZU51bWJlcik7Ci0gICAgICAgICAgICByZXR1cm47CisgICAgICAgIHZh ciB0aXRsZSA9IHRoaXMuX2NhbGxGcmFtZS5mdW5jdGlvbk5hbWUgfHwgV2ViSW5zcGVjdG9yLlVJ U3RyaW5nKCIoYW5vbnltb3VzIGZ1bmN0aW9uKSIpOworICAgICAgICB2YXIgcGxhY2FyZCA9IG5l dyBXZWJJbnNwZWN0b3IuUGxhY2FyZCh0aXRsZSwgIiIpOworICAgICAgICBmdW5jdGlvbiB1cGRh dGVQbGFjYXJkKCkKKyAgICAgICAgeworICAgICAgICAgICAgdmFyIHVpTG9jYXRpb24gPSB0aGlz Ll9yYXdTb3VyY2VDb2RlLnNvdXJjZU1hcHBpbmcucmF3TG9jYXRpb25Ub1VJTG9jYXRpb24odGhp cy5fY2FsbEZyYW1lLmxvY2F0aW9uKTsKKyAgICAgICAgICAgIHBsYWNhcmQuc3VidGl0bGUgPSBX ZWJJbnNwZWN0b3IuZGlzcGxheU5hbWVGb3JVUkwodWlMb2NhdGlvbi51aVNvdXJjZUNvZGUudXJs KSArICI6IiArICh1aUxvY2F0aW9uLmxpbmVOdW1iZXIgKyAxKTsKKyAgICAgICAgICAgIHBsYWNh cmQuX3RleHQgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIiVzKCkgYXQgJXMiLCBwbGFjYXJkLnRp dGxlLCBwbGFjYXJkLnN1YnRpdGxlKTsKICAgICAgICAgfQorICAgICAgICBpZiAodGhpcy5fcmF3 U291cmNlQ29kZS5zb3VyY2VNYXBwaW5nKQorICAgICAgICAgICAgdXBkYXRlUGxhY2FyZC5jYWxs KHRoaXMpOworICAgICAgICB0aGlzLl9yYXdTb3VyY2VDb2RlLmFkZEV2ZW50TGlzdGVuZXIoV2Vi SW5zcGVjdG9yLlJhd1NvdXJjZUNvZGUuRXZlbnRzLlNvdXJjZU1hcHBpbmdVcGRhdGVkLCB1cGRh dGVQbGFjYXJkLCB0aGlzKTsKKyAgICAgICAgcmV0dXJuIHBsYWNhcmQ7CisgICAgfSwKIAotICAg ICAgICBmdW5jdGlvbiBzb3VyY2VNYXBwaW5nVXBkYXRlZCgpCisgICAgdWlMb2NhdGlvbjogZnVu Y3Rpb24oY2FsbGJhY2spCisgICAgeworICAgICAgICBmdW5jdGlvbiBzb3VyY2VNYXBwaW5nUmVh ZHkoKQogICAgICAgICB7Ci0gICAgICAgICAgICB0aGlzLl9yYXdTb3VyY2VDb2RlLnJlbW92ZUV2 ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlJhd1NvdXJjZUNvZGUuRXZlbnRzLlNvdXJjZU1hcHBp bmdVcGRhdGVkLCBzb3VyY2VNYXBwaW5nVXBkYXRlZCwgdGhpcyk7Ci0gICAgICAgICAgICB2YXIg dWlMb2NhdGlvbiA9IHRoaXMuX3Jhd1NvdXJjZUNvZGUuc291cmNlTWFwcGluZy5yYXdMb2NhdGlv blRvVUlMb2NhdGlvbihyYXdMb2NhdGlvbik7Ci0gICAgICAgICAgICBjYWxsYmFjayh1aUxvY2F0 aW9uLnVpU291cmNlQ29kZSwgdWlMb2NhdGlvbi5saW5lTnVtYmVyKTsKKyAgICAgICAgICAgIHRo aXMuX3Jhd1NvdXJjZUNvZGUucmVtb3ZlRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuUmF3U291 cmNlQ29kZS5FdmVudHMuU291cmNlTWFwcGluZ1VwZGF0ZWQsIHNvdXJjZU1hcHBpbmdSZWFkeSwg dGhpcyk7CisgICAgICAgICAgICBjYWxsYmFjayh0aGlzLl9yYXdTb3VyY2VDb2RlLnNvdXJjZU1h cHBpbmcucmF3TG9jYXRpb25Ub1VJTG9jYXRpb24odGhpcy5fY2FsbEZyYW1lLmxvY2F0aW9uKSk7 CiAgICAgICAgIH0KLSAgICAgICAgdGhpcy5fcmF3U291cmNlQ29kZS5hZGRFdmVudExpc3RlbmVy KFdlYkluc3BlY3Rvci5SYXdTb3VyY2VDb2RlLkV2ZW50cy5Tb3VyY2VNYXBwaW5nVXBkYXRlZCwg c291cmNlTWFwcGluZ1VwZGF0ZWQsIHRoaXMpOworICAgICAgICBpZiAodGhpcy5fcmF3U291cmNl Q29kZS5zb3VyY2VNYXBwaW5nKQorICAgICAgICAgICAgc291cmNlTWFwcGluZ1JlYWR5LmNhbGwo dGhpcyk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIHRoaXMuX3Jhd1NvdXJjZUNvZGUuYWRk RXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuUmF3U291cmNlQ29kZS5FdmVudHMuU291cmNlTWFw cGluZ1VwZGF0ZWQsIHNvdXJjZU1hcHBpbmdSZWFkeSwgdGhpcyk7CiAgICAgfQogfQogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5q cyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCmlu ZGV4IGMzMTA5NDgxZWViNmMzNWFhMWU5OGRlOWE4YTg2MzUyYzMyOWJiMjguLjVjZTRiYmM1MmE5 ZDJhNzM1NGM2ZDVmMzE2MmM4NDYxNGUyNjU5OGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCkBAIC0xNzAsNiArMTcwLDcgQEAg V2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbCA9IGZ1bmN0aW9uKHByZXNlbnRhdGlvbk1vZGVsKQog ICAgIHRoaXMuX3ByZXNlbnRhdGlvbk1vZGVsLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9y LkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuRXZlbnRzLkRlYnVnZ2VyUGF1c2VkLCB0aGlzLl9k ZWJ1Z2dlclBhdXNlZCwgdGhpcyk7CiAgICAgdGhpcy5fcHJlc2VudGF0aW9uTW9kZWwuYWRkRXZl bnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5FdmVudHMu RGVidWdnZXJSZXN1bWVkLCB0aGlzLl9kZWJ1Z2dlclJlc3VtZWQsIHRoaXMpOwogICAgIHRoaXMu X3ByZXNlbnRhdGlvbk1vZGVsLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRlYnVnZ2Vy UHJlc2VudGF0aW9uTW9kZWwuRXZlbnRzLkNhbGxGcmFtZVNlbGVjdGVkLCB0aGlzLl9jYWxsRnJh bWVTZWxlY3RlZCwgdGhpcyk7CisgICAgdGhpcy5fcHJlc2VudGF0aW9uTW9kZWwuYWRkRXZlbnRM aXN0ZW5lcihXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5FdmVudHMuRXhl Y3V0aW9uTGluZUNoYW5nZWQsIHRoaXMuX2V4ZWN1dGlvbkxpbmVDaGFuZ2VkLCB0aGlzKTsKIAog ICAgIHZhciBlbmFibGVEZWJ1Z2dlciA9IFByZWZlcmVuY2VzLmRlYnVnZ2VyQWx3YXlzRW5hYmxl ZCB8fCBXZWJJbnNwZWN0b3Iuc2V0dGluZ3MuZGVidWdnZXJFbmFibGVkLmdldCgpOwogICAgIGlm IChlbmFibGVEZWJ1Z2dlcikKQEAgLTQ5NywxNCArNDk4LDE0IEBAIFdlYkluc3BlY3Rvci5TY3Jp cHRzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICB9IGVsc2UgaWYgKGRldGFpbHMucmVhc29u ID09PSBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLkJyZWFrUmVhc29uLkV4Y2VwdGlvbikgewog ICAgICAgICAgICAgdGhpcy5zaWRlYmFyUGFuZXMuY2FsbHN0YWNrLnNldFN0YXR1cyhXZWJJbnNw ZWN0b3IuVUlTdHJpbmcoIlBhdXNlZCBvbiBleGNlcHRpb246ICclcycuIiwgZGV0YWlscy5hdXhE YXRhLmRlc2NyaXB0aW9uKSk7CiAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBmdW5jdGlv biBkaWRHZXRTb3VyY2VMb2NhdGlvbih1aVNvdXJjZUNvZGUsIGxpbmVOdW1iZXIpCisgICAgICAg ICAgICBmdW5jdGlvbiBkaWRHZXRVSUxvY2F0aW9uKHVpTG9jYXRpb24pCiAgICAgICAgICAgICB7 Ci0gICAgICAgICAgICAgICAgaWYgKCF1aVNvdXJjZUNvZGUgfHwgIXRoaXMuX3ByZXNlbnRhdGlv bk1vZGVsLmZpbmRCcmVha3BvaW50KHVpU291cmNlQ29kZSwgbGluZU51bWJlcikpCisgICAgICAg ICAgICAgICAgaWYgKCF0aGlzLl9wcmVzZW50YXRpb25Nb2RlbC5maW5kQnJlYWtwb2ludCh1aUxv Y2F0aW9uLnVpU291cmNlQ29kZSwgdWlMb2NhdGlvbi5saW5lTnVtYmVyKSkKICAgICAgICAgICAg ICAgICAgICAgcmV0dXJuOwotICAgICAgICAgICAgICAgIHRoaXMuc2lkZWJhclBhbmVzLmpzQnJl YWtwb2ludHMuaGlnaGxpZ2h0QnJlYWtwb2ludCh1aVNvdXJjZUNvZGUsIGxpbmVOdW1iZXIpOwor ICAgICAgICAgICAgICAgIHRoaXMuc2lkZWJhclBhbmVzLmpzQnJlYWtwb2ludHMuaGlnaGxpZ2h0 QnJlYWtwb2ludCh1aUxvY2F0aW9uLnVpU291cmNlQ29kZSwgdWlMb2NhdGlvbi5saW5lTnVtYmVy KTsKICAgICAgICAgICAgICAgICB0aGlzLnNpZGViYXJQYW5lcy5jYWxsc3RhY2suc2V0U3RhdHVz KFdlYkluc3BlY3Rvci5VSVN0cmluZygiUGF1c2VkIG9uIGEgSmF2YVNjcmlwdCBicmVha3BvaW50 LiIpKTsKICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGNhbGxGcmFtZXNbMF0uc291cmNlTGlu ZShkaWRHZXRTb3VyY2VMb2NhdGlvbi5iaW5kKHRoaXMpKTsKKyAgICAgICAgICAgIGNhbGxGcmFt ZXNbMF0udWlMb2NhdGlvbihkaWRHZXRVSUxvY2F0aW9uLmJpbmQodGhpcykpOwogICAgICAgICB9 CiAKICAgICAgICAgd2luZG93LmZvY3VzKCk7CkBAIC03MTUsMTEgKzcxNiwyNiBAQCBXZWJJbnNw ZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgZGVsZXRlIHRoaXMuX2V4 ZWN1dGlvblNvdXJjZUZyYW1lOwogICAgIH0sCiAKLSAgICBfY2FsbEZyYW1lU2VsZWN0ZWQ6IGZ1 bmN0aW9uKGV2ZW50KQorICAgIF9leGVjdXRpb25MaW5lQ2hhbmdlZDogZnVuY3Rpb24oZXZlbnQp CiAgICAgewotICAgICAgICB2YXIgY2FsbEZyYW1lID0gZXZlbnQuZGF0YTsKKyAgICAgICAgdmFy IHVpTG9jYXRpb24gPSBldmVudC5kYXRhOwogCiAgICAgICAgIHRoaXMuX2NsZWFyQ3VycmVudEV4 ZWN1dGlvbkxpbmUoKTsKKyAgICAgICAgaWYgKCF1aUxvY2F0aW9uKQorICAgICAgICAgICAgcmV0 dXJuOworCisgICAgICAgIGlmICghdWlMb2NhdGlvbi51aVNvdXJjZUNvZGUuX29wdGlvbikgewor ICAgICAgICAgICAgLy8gQW5vbnltb3VzIHNjcmlwdHMgYXJlIG5vdCBhZGRlZCB0byBmaWxlcyBz ZWxlY3QgYnkgZGVmYXVsdC4KKyAgICAgICAgICAgIHRoaXMuX2FkZE9wdGlvblRvRmlsZXNTZWxl Y3QodWlMb2NhdGlvbi51aVNvdXJjZUNvZGUpOworICAgICAgICB9CisgICAgICAgIHZhciBzb3Vy Y2VGcmFtZSA9IHRoaXMuX3Nob3dTb3VyY2VGcmFtZUFuZEFkZFRvSGlzdG9yeSh1aUxvY2F0aW9u LnVpU291cmNlQ29kZSk7CisgICAgICAgIHNvdXJjZUZyYW1lLnNldEV4ZWN1dGlvbkxpbmUodWlM b2NhdGlvbi5saW5lTnVtYmVyKTsKKyAgICAgICAgdGhpcy5fZXhlY3V0aW9uU291cmNlRnJhbWUg PSBzb3VyY2VGcmFtZTsKKyAgICB9LAorCisgICAgX2NhbGxGcmFtZVNlbGVjdGVkOiBmdW5jdGlv bihldmVudCkKKyAgICB7CisgICAgICAgIHZhciBjYWxsRnJhbWUgPSBldmVudC5kYXRhOwogCiAg ICAgICAgIGlmICghY2FsbEZyYW1lKQogICAgICAgICAgICAgcmV0dXJuOwpAQCAtNzI3LDIxICs3 NDMsNiBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAg dGhpcy5zaWRlYmFyUGFuZXMuc2NvcGVjaGFpbi51cGRhdGUoY2FsbEZyYW1lKTsKICAgICAgICAg dGhpcy5zaWRlYmFyUGFuZXMud2F0Y2hFeHByZXNzaW9ucy5yZWZyZXNoRXhwcmVzc2lvbnMoKTsK ICAgICAgICAgdGhpcy5zaWRlYmFyUGFuZXMuY2FsbHN0YWNrLnNlbGVjdGVkQ2FsbEZyYW1lID0g dGhpcy5fcHJlc2VudGF0aW9uTW9kZWwuc2VsZWN0ZWRDYWxsRnJhbWU7Ci0KLSAgICAgICAgZnVu Y3Rpb24gZGlkR2V0U291cmNlTG9jYXRpb24odWlTb3VyY2VDb2RlLCBsaW5lTnVtYmVyKQotICAg ICAgICB7Ci0gICAgICAgICAgICBpZiAoIXVpU291cmNlQ29kZSkKLSAgICAgICAgICAgICAgICBy ZXR1cm47Ci0KLSAgICAgICAgICAgIGlmICghdWlTb3VyY2VDb2RlLl9vcHRpb24pIHsKLSAgICAg ICAgICAgICAgICAvLyBBbm9ueW1vdXMgc2NyaXB0cyBhcmUgbm90IGFkZGVkIHRvIGZpbGVzIHNl bGVjdCBieSBkZWZhdWx0LgotICAgICAgICAgICAgICAgIHRoaXMuX2FkZE9wdGlvblRvRmlsZXNT ZWxlY3QodWlTb3VyY2VDb2RlKTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIHZhciBzb3Vy Y2VGcmFtZSA9IHRoaXMuX3Nob3dTb3VyY2VGcmFtZUFuZEFkZFRvSGlzdG9yeSh1aVNvdXJjZUNv ZGUpOwotICAgICAgICAgICAgc291cmNlRnJhbWUuc2V0RXhlY3V0aW9uTGluZShsaW5lTnVtYmVy KTsKLSAgICAgICAgICAgIHRoaXMuX2V4ZWN1dGlvblNvdXJjZUZyYW1lID0gc291cmNlRnJhbWU7 Ci0gICAgICAgIH0KLSAgICAgICAgY2FsbEZyYW1lLnNvdXJjZUxpbmUoZGlkR2V0U291cmNlTG9j YXRpb24uYmluZCh0aGlzKSk7CiAgICAgfSwKIAogICAgIF9maWxlc1NlbGVjdENoYW5nZWQ6IGZ1 bmN0aW9uKCkK 109131 2011-09-29 00:35:05 -0700 2011-09-30 04:45:16 -0700 Patch bug-68997-20110929113503.patch text/plain 16961 podivilov U3VidmVyc2lvbiBSZXZpc2lvbjogOTYyMTgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA2MTNiNDA4NGUxYTEyZmM3 YTkzNzViMWVmMmU3ODExZDkzZDQ4MDdiLi43NDIxY2NlY2VkMTBmNzY5YzE3NzNjMzgzN2U4MDE3 YTgwOGIwOWMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzYgQEAKKzIwMTEtMDktMjggIFBhdmVs IFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogdXBkYXRlIGNhbGwgZnJhbWUgbG9jYXRpb24gd2hlbiBzb3VyY2UgbWFwcGluZyBpcyBj aGFuZ2VkLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 Njg5OTcKKworICAgICAgICBDdXJyZW50bHkgd2UgdXNlIGZha2UgImRlYnVnZ2VyLXBhdXNlZCIg ZXZlbnQgaGFjayB0byB1cGRhdGUgZXhlY3V0aW9uIGxpbmUgYW5kIGNhbGwgc3RhY2sgcGxhY2Fy ZHMgd2hlbiBzb3VyY2UgbWFwcGluZyBpcyBjaGFuZ2VkLgorICAgICAgICAtIGFkZCBQcmVzZW50 YXRpb25DYWxsRnJhbWUuY3JlYXRlUGxhY2FyZCBtZXRob2QgdG8gY3JlYXRlICJsaXZlIiBwbGFj YXJkcyB0aGF0IGFyZSB1cGRhdGVkIG9uIHNvdXJjZSBtYXBwaW5nIGNoYW5nZXMuCisgICAgICAg IC0gcmVtb3ZlIFByZXNlbnRhdGlvbkNhbGxGcmFtZSBmdW5jdGlvbk5hbWUsIGlzSW50ZXJuYWxT Y3JpcHQsIGFuZCB1cmwgZ2V0dGVycy4KKyAgICAgICAgLSBmaXJlIGV4ZWN1dGlvbi1saW5lLWNo YW5nZWQgZXZlbnQgd2hlbiBzZWxlY3RlZCBjYWxsIGZyYW1lIG9yIHNvdXJjZSBtYXBwaW5nIGlz IGNoYW5nZWQuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0NhbGxTdGFja1NpZGViYXJQYW5lLmpzOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLkNhbGxTdGFja1NpZGViYXJQYW5lLnByb3RvdHlwZS51cGRhdGUpOgor ICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlwZS5f ZGVidWdnZXJQYXVzZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0 aW9uTW9kZWwucHJvdG90eXBlLl9kZWJ1Z2dlclJlc3VtZWQpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlLnNldCBzZWxlY3RlZENhbGxG cmFtZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5w cm90b3R5cGUuZ2V0IHNlbGVjdGVkQ2FsbEZyYW1lKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5E ZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlwZS5fZGlzcGF0Y2hFeGVjdXRpb25MaW5l Q2hhbmdlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2Rl bC5wcm90b3R5cGUuX2RlYnVnZ2VyUmVzZXQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlByZXNl bnRhdGlvbkNhbGxGcmFtZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUHJlc2VudGF0aW9uQ2Fs bEZyYW1lLnByb3RvdHlwZS5nZXQgcmF3U291cmNlQ29kZSk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuUHJlc2VudGF0aW9uQ2FsbEZyYW1lLnByb3RvdHlwZS5jcmVhdGVQbGFjYXJkLnVwZGF0ZVBs YWNhcmQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlByZXNlbnRhdGlvbkNhbGxGcmFtZS5wcm90 b3R5cGUuY3JlYXRlUGxhY2FyZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUHJlc2VudGF0aW9u Q2FsbEZyYW1lLnByb3RvdHlwZS51aUxvY2F0aW9uKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJv bnQtZW5kL1NjcmlwdHNQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFu ZWwucHJvdG90eXBlLl9kZWJ1Z2dlclBhdXNlZC5lbHNlLmRpZEdldFVJTG9jYXRpb24pOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuX2RlYnVnZ2VyUGF1c2Vk KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLl9leGVjdXRp b25MaW5lQ2hhbmdlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3Rv dHlwZS5fY2FsbEZyYW1lU2VsZWN0ZWQpOgorCiAyMDExLTA5LTI4ICBWc2V2b2xvZCBWbGFzb3Yg IDx2c2V2aWtAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFJlZmFjdG9y IHNlYXJjaGluZyBpbiBpbnNwZWN0b3IsIGFkZCB0ZXN0IChmaXhlZCBub24gcmVnZXggc2VhcmNo KS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ2FsbFN0 YWNrU2lkZWJhclBhbmUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0Nh bGxTdGFja1NpZGViYXJQYW5lLmpzCmluZGV4IDc1NTFiNzhmZjQ0N2U2MDc5YzZmODU4ODA1NDJi YzJiZDgwYzgwZmYuLjJjMWJiNGQ1N2VkODVkMDUxNGJjNGU3NDRjZmUyODc0ZTFjMTEyMmIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ2FsbFN0YWNrU2lk ZWJhclBhbmUuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DYWxs U3RhY2tTaWRlYmFyUGFuZS5qcwpAQCAtNDgsMjggKzQ4LDkgQEAgV2ViSW5zcGVjdG9yLkNhbGxT dGFja1NpZGViYXJQYW5lLnByb3RvdHlwZSA9IHsKIAogICAgICAgICBmb3IgKHZhciBpID0gMDsg aSA8IGNhbGxGcmFtZXMubGVuZ3RoOyArK2kpIHsKICAgICAgICAgICAgIHZhciBjYWxsRnJhbWUg PSBjYWxsRnJhbWVzW2ldOwotICAgICAgICAgICAgdmFyIHRpdGxlID0gY2FsbEZyYW1lLmZ1bmN0 aW9uTmFtZSB8fCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIihhbm9ueW1vdXMgZnVuY3Rpb24pIik7 Ci0KLSAgICAgICAgICAgIHZhciBzdWJ0aXRsZTsKLSAgICAgICAgICAgIGlmICghY2FsbEZyYW1l LmlzSW50ZXJuYWxTY3JpcHQpCi0gICAgICAgICAgICAgICAgc3VidGl0bGUgPSBXZWJJbnNwZWN0 b3IuZGlzcGxheU5hbWVGb3JVUkwoY2FsbEZyYW1lLnVybCk7Ci0gICAgICAgICAgICBlbHNlCi0g ICAgICAgICAgICAgICAgc3VidGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIihpbnRlcm5h bCBzY3JpcHQpIik7Ci0KLSAgICAgICAgICAgIHZhciBwbGFjYXJkID0gbmV3IFdlYkluc3BlY3Rv ci5QbGFjYXJkKHRpdGxlLCBzdWJ0aXRsZSk7CisgICAgICAgICAgICB2YXIgcGxhY2FyZCA9IGNh bGxGcmFtZS5jcmVhdGVQbGFjYXJkKCk7CiAgICAgICAgICAgICBwbGFjYXJkLmNhbGxGcmFtZSA9 IGNhbGxGcmFtZTsKICAgICAgICAgICAgIHBsYWNhcmQuZWxlbWVudC5hZGRFdmVudExpc3RlbmVy KCJjbGljayIsIHRoaXMuX3BsYWNhcmRTZWxlY3RlZC5iaW5kKHRoaXMsIHBsYWNhcmQpLCBmYWxz ZSk7Ci0KLSAgICAgICAgICAgIGZ1bmN0aW9uIGRpZEdldFNvdXJjZUxpbmUocGxhY2FyZCwgdWlT b3VyY2VDb2RlLCBsaW5lTnVtYmVyKQotICAgICAgICAgICAgewotICAgICAgICAgICAgICAgIGlm IChwbGFjYXJkLnN1YnRpdGxlKQotICAgICAgICAgICAgICAgICAgICBwbGFjYXJkLnN1YnRpdGxl ICs9ICI6IiArIChsaW5lTnVtYmVyICsgMSk7Ci0gICAgICAgICAgICAgICAgZWxzZQotICAgICAg ICAgICAgICAgICAgICBwbGFjYXJkLnN1YnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJs aW5lICVkIiwgbGluZU51bWJlciArIDEpOwotICAgICAgICAgICAgICAgIHBsYWNhcmQuX3RleHQg PSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIiVzKCkgYXQgJXMiLCBwbGFjYXJkLnRpdGxlLCBwbGFj YXJkLnN1YnRpdGxlKTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGNhbGxGcmFtZS5zb3Vy Y2VMaW5lKGRpZEdldFNvdXJjZUxpbmUuYmluZCh0aGlzLCBwbGFjYXJkKSk7Ci0KICAgICAgICAg ICAgIHRoaXMucGxhY2FyZHMucHVzaChwbGFjYXJkKTsKICAgICAgICAgICAgIHRoaXMuYm9keUVs ZW1lbnQuYXBwZW5kQ2hpbGQocGxhY2FyZC5lbGVtZW50KTsKICAgICAgICAgfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlv bk1vZGVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlclBy ZXNlbnRhdGlvbk1vZGVsLmpzCmluZGV4IDNiMmY4ODQ5ODY5Y2RiZDdiYzU5NWE3ZDc4OTI3YTZk ZWM4YmJkN2QuLjFhMWRmNTIwN2E4YjM5MmZmYzdkMmM1NDNjYTE2YjE1MzgwMDFjYjMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJQcmVzZW50 YXRpb25Nb2RlbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0Rl YnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuanMKQEAgLTM3LDcgKzM3LDYgQEAgV2ViSW5zcGVjdG9y LkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwgPSBmdW5jdGlvbigpCiAgICAgdGhpcy5fZm9ybWF0 dGVyID0gbmV3IFdlYkluc3BlY3Rvci5TY3JpcHRGb3JtYXR0ZXIoKTsKICAgICB0aGlzLl9yYXdT b3VyY2VDb2RlID0ge307CiAgICAgdGhpcy5fcHJlc2VudGF0aW9uQ2FsbEZyYW1lcyA9IFtdOwot ICAgIHRoaXMuX3NlbGVjdGVkQ2FsbEZyYW1lSW5kZXggPSAwOwogCiAgICAgdGhpcy5fYnJlYWtw b2ludE1hbmFnZXIgPSBuZXcgV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnRNYW5hZ2VyKFdlYkluc3Bl Y3Rvci5zZXR0aW5ncy5icmVha3BvaW50cywgdGhpcy5fYnJlYWtwb2ludEFkZGVkLmJpbmQodGhp cyksIHRoaXMuX2JyZWFrcG9pbnRSZW1vdmVkLmJpbmQodGhpcyksIFdlYkluc3BlY3Rvci5kZWJ1 Z2dlck1vZGVsKTsKIApAQCAtNjIsNyArNjEsOCBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVz ZW50YXRpb25Nb2RlbC5FdmVudHMgPSB7CiAgICAgQnJlYWtwb2ludFJlbW92ZWQ6ICJicmVha3Bv aW50LXJlbW92ZWQiLAogICAgIERlYnVnZ2VyUGF1c2VkOiAiZGVidWdnZXItcGF1c2VkIiwKICAg ICBEZWJ1Z2dlclJlc3VtZWQ6ICJkZWJ1Z2dlci1yZXN1bWVkIiwKLSAgICBDYWxsRnJhbWVTZWxl Y3RlZDogImNhbGwtZnJhbWUtc2VsZWN0ZWQiCisgICAgQ2FsbEZyYW1lU2VsZWN0ZWQ6ICJjYWxs LWZyYW1lLXNlbGVjdGVkIiwKKyAgICBFeGVjdXRpb25MaW5lQ2hhbmdlZDogImV4ZWN1dGlvbi1s aW5lLWNoYW5nZWQiCiB9CiAKIFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVs LnByb3RvdHlwZSA9IHsKQEAgLTM1MiwzNSArMzUyLDUxIEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dl clByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5fcHJlc2VudGF0 aW9uQ2FsbEZyYW1lcyA9IFtdOwogICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGNhbGxGcmFt ZXMubGVuZ3RoOyArK2kpIHsKICAgICAgICAgICAgIHZhciBjYWxsRnJhbWUgPSBjYWxsRnJhbWVz W2ldOwotICAgICAgICAgICAgdmFyIHJhd1NvdXJjZUNvZGU7CiAgICAgICAgICAgICB2YXIgc2Ny aXB0ID0gV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwuc2NyaXB0Rm9yU291cmNlSUQoY2FsbEZy YW1lLmxvY2F0aW9uLnNjcmlwdElkKTsKLSAgICAgICAgICAgIGlmIChzY3JpcHQpCi0gICAgICAg ICAgICAgICAgcmF3U291cmNlQ29kZSA9IHRoaXMuX3Jhd1NvdXJjZUNvZGVGb3JTY3JpcHQoc2Ny aXB0LnNvdXJjZVVSTCwgc2NyaXB0LnNjcmlwdElkKTsKKyAgICAgICAgICAgIGlmICghc2NyaXB0 KQorICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgdmFyIHJhd1NvdXJjZUNv ZGUgPSB0aGlzLl9yYXdTb3VyY2VDb2RlRm9yU2NyaXB0KHNjcmlwdC5zb3VyY2VVUkwsIHNjcmlw dC5zY3JpcHRJZCk7CiAgICAgICAgICAgICB0aGlzLl9wcmVzZW50YXRpb25DYWxsRnJhbWVzLnB1 c2gobmV3IFdlYkluc3BlY3Rvci5QcmVzZW50YXRpb25DYWxsRnJhbWUoY2FsbEZyYW1lLCBpLCB0 aGlzLCByYXdTb3VyY2VDb2RlKSk7CiAgICAgICAgIH0KICAgICAgICAgdmFyIGRldGFpbHMgPSBX ZWJJbnNwZWN0b3IuZGVidWdnZXJNb2RlbC5kZWJ1Z2dlclBhdXNlZERldGFpbHM7CiAgICAgICAg IHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNl bnRhdGlvbk1vZGVsLkV2ZW50cy5EZWJ1Z2dlclBhdXNlZCwgeyBjYWxsRnJhbWVzOiB0aGlzLl9w cmVzZW50YXRpb25DYWxsRnJhbWVzLCBkZXRhaWxzOiBkZXRhaWxzIH0pOwogCi0gICAgICAgIHRo aXMuc2VsZWN0ZWRDYWxsRnJhbWUgPSB0aGlzLl9wcmVzZW50YXRpb25DYWxsRnJhbWVzW3RoaXMu X3NlbGVjdGVkQ2FsbEZyYW1lSW5kZXhdOworICAgICAgICB0aGlzLnNlbGVjdGVkQ2FsbEZyYW1l ID0gdGhpcy5fcHJlc2VudGF0aW9uQ2FsbEZyYW1lc1swXTsKICAgICB9LAogCiAgICAgX2RlYnVn Z2VyUmVzdW1lZDogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgdGhpcy5fcHJlc2VudGF0aW9u Q2FsbEZyYW1lcyA9IFtdOwotICAgICAgICB0aGlzLl9zZWxlY3RlZENhbGxGcmFtZUluZGV4ID0g MDsKKyAgICAgICAgdGhpcy5zZWxlY3RlZENhbGxGcmFtZSA9IG51bGw7CiAgICAgICAgIHRoaXMu ZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlv bk1vZGVsLkV2ZW50cy5EZWJ1Z2dlclJlc3VtZWQpOwogICAgIH0sCiAKICAgICBzZXQgc2VsZWN0 ZWRDYWxsRnJhbWUoY2FsbEZyYW1lKQogICAgIHsKLSAgICAgICAgdGhpcy5fc2VsZWN0ZWRDYWxs RnJhbWVJbmRleCA9IGNhbGxGcmFtZS5pbmRleDsKLSAgICAgICAgY2FsbEZyYW1lLnNlbGVjdCgp OworICAgICAgICBpZiAodGhpcy5fc2VsZWN0ZWRDYWxsRnJhbWUpCisgICAgICAgICAgICB0aGlz Ll9zZWxlY3RlZENhbGxGcmFtZS5yYXdTb3VyY2VDb2RlLnJlbW92ZUV2ZW50TGlzdGVuZXIoV2Vi SW5zcGVjdG9yLlJhd1NvdXJjZUNvZGUuRXZlbnRzLlNvdXJjZU1hcHBpbmdVcGRhdGVkLCB0aGlz Ll9kaXNwYXRjaEV4ZWN1dGlvbkxpbmVDaGFuZ2VkLCB0aGlzKTsKKyAgICAgICAgdGhpcy5fc2Vs ZWN0ZWRDYWxsRnJhbWUgPSBjYWxsRnJhbWU7CisgICAgICAgIGlmICghdGhpcy5fc2VsZWN0ZWRD YWxsRnJhbWUpCisgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgdGhpcy5fc2VsZWN0ZWRD YWxsRnJhbWUucmF3U291cmNlQ29kZS5mb3JjZVVwZGF0ZVNvdXJjZU1hcHBpbmcoKTsKICAgICAg ICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJl c2VudGF0aW9uTW9kZWwuRXZlbnRzLkNhbGxGcmFtZVNlbGVjdGVkLCBjYWxsRnJhbWUpOworCisg ICAgICAgIGlmICh0aGlzLl9zZWxlY3RlZENhbGxGcmFtZS5yYXdTb3VyY2VDb2RlLnNvdXJjZU1h cHBpbmcpCisgICAgICAgICAgICB0aGlzLl9kaXNwYXRjaEV4ZWN1dGlvbkxpbmVDaGFuZ2VkKCk7 CisgICAgICAgIHRoaXMuX3NlbGVjdGVkQ2FsbEZyYW1lLnJhd1NvdXJjZUNvZGUuYWRkRXZlbnRM aXN0ZW5lcihXZWJJbnNwZWN0b3IuUmF3U291cmNlQ29kZS5FdmVudHMuU291cmNlTWFwcGluZ1Vw ZGF0ZWQsIHRoaXMuX2Rpc3BhdGNoRXhlY3V0aW9uTGluZUNoYW5nZWQsIHRoaXMpOwogICAgIH0s CiAKICAgICBnZXQgc2VsZWN0ZWRDYWxsRnJhbWUoKQogICAgIHsKLSAgICAgICAgcmV0dXJuIHRo aXMuX3ByZXNlbnRhdGlvbkNhbGxGcmFtZXNbdGhpcy5fc2VsZWN0ZWRDYWxsRnJhbWVJbmRleF07 CisgICAgICAgIHJldHVybiB0aGlzLl9zZWxlY3RlZENhbGxGcmFtZTsKKyAgICB9LAorCisgICAg X2Rpc3BhdGNoRXhlY3V0aW9uTGluZUNoYW5nZWQ6IGZ1bmN0aW9uKGV2ZW50KQorICAgIHsKKyAg ICAgICAgdmFyIHJhd0xvY2F0aW9uID0gdGhpcy5fc2VsZWN0ZWRDYWxsRnJhbWUuX2NhbGxGcmFt ZS5sb2NhdGlvbjsKKyAgICAgICAgdmFyIHVpTG9jYXRpb24gPSB0aGlzLl9zZWxlY3RlZENhbGxG cmFtZS5yYXdTb3VyY2VDb2RlLnNvdXJjZU1hcHBpbmcucmF3TG9jYXRpb25Ub1VJTG9jYXRpb24o cmF3TG9jYXRpb24pOworICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJ bnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5FdmVudHMuRXhlY3V0aW9uTGluZUNo YW5nZWQsIHVpTG9jYXRpb24pOwogICAgIH0sCiAKICAgICBfcmF3U291cmNlQ29kZUZvclNjcmlw dDogZnVuY3Rpb24oc291cmNlVVJMLCBzY3JpcHRJZCkKQEAgLTQxMCw5ICs0MjYsMTEgQEAgV2Vi SW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlID0gewogCiAgICAg X2RlYnVnZ2VyUmVzZXQ6IGZ1bmN0aW9uKCkKICAgICB7CisgICAgICAgIGZvciAodmFyIGlkIGlu IHRoaXMuX3Jhd1NvdXJjZUNvZGUpCisgICAgICAgICAgICB0aGlzLl9yYXdTb3VyY2VDb2RlW2lk XS5yZW1vdmVBbGxMaXN0ZW5lcnMoKTsKICAgICAgICAgdGhpcy5fcmF3U291cmNlQ29kZSA9IHt9 OwogICAgICAgICB0aGlzLl9wcmVzZW50YXRpb25DYWxsRnJhbWVzID0gW107Ci0gICAgICAgIHRo aXMuX3NlbGVjdGVkQ2FsbEZyYW1lSW5kZXggPSAwOworICAgICAgICB0aGlzLl9zZWxlY3RlZENh bGxGcmFtZSA9IG51bGw7CiAgICAgICAgIHRoaXMuX2JyZWFrcG9pbnRNYW5hZ2VyLmRlYnVnZ2Vy UmVzZXQoKTsKICAgICB9CiB9CkBAIC00MjgsMzEgKzQ0NiwxNCBAQCBXZWJJbnNwZWN0b3IuUHJl c2VudGF0aW9uQ2FsbEZyYW1lID0gZnVuY3Rpb24oY2FsbEZyYW1lLCBpbmRleCwgbW9kZWwsIHJh d1NvdXJjZQogICAgIHRoaXMuX2luZGV4ID0gaW5kZXg7CiAgICAgdGhpcy5fbW9kZWwgPSBtb2Rl bDsKICAgICB0aGlzLl9yYXdTb3VyY2VDb2RlID0gcmF3U291cmNlQ29kZTsKLSAgICB0aGlzLl9z Y3JpcHQgPSBXZWJJbnNwZWN0b3IuZGVidWdnZXJNb2RlbC5zY3JpcHRGb3JTb3VyY2VJRChjYWxs RnJhbWUubG9jYXRpb24uc2NyaXB0SWQpOwogfQogCiBXZWJJbnNwZWN0b3IuUHJlc2VudGF0aW9u Q2FsbEZyYW1lLnByb3RvdHlwZSA9IHsKLSAgICBnZXQgZnVuY3Rpb25OYW1lKCkKLSAgICB7Ci0g ICAgICAgIHJldHVybiB0aGlzLl9jYWxsRnJhbWUuZnVuY3Rpb25OYW1lOwotICAgIH0sCi0KICAg ICBnZXQgdHlwZSgpCiAgICAgewogICAgICAgICByZXR1cm4gdGhpcy5fY2FsbEZyYW1lLnR5cGU7 CiAgICAgfSwKIAotICAgIGdldCBpc0ludGVybmFsU2NyaXB0KCkKLSAgICB7Ci0gICAgICAgIHJl dHVybiAhdGhpcy5fc2NyaXB0OwotICAgIH0sCi0KLSAgICBnZXQgdXJsKCkKLSAgICB7Ci0gICAg ICAgIGlmICh0aGlzLl9yYXdTb3VyY2VDb2RlICYmIHRoaXMuX3Jhd1NvdXJjZUNvZGUuc291cmNl TWFwcGluZykKLSAgICAgICAgICAgIHJldHVybiB0aGlzLl9yYXdTb3VyY2VDb2RlLnNvdXJjZU1h cHBpbmcudWlTb3VyY2VDb2RlLnVybDsKLSAgICB9LAotCiAgICAgZ2V0IHNjb3BlQ2hhaW4oKQog ICAgIHsKICAgICAgICAgcmV0dXJuIHRoaXMuX2NhbGxGcmFtZS5zY29wZUNoYWluOwpAQCAtNDY4 LDEwICs0NjksOSBAQCBXZWJJbnNwZWN0b3IuUHJlc2VudGF0aW9uQ2FsbEZyYW1lLnByb3RvdHlw ZSA9IHsKICAgICAgICAgcmV0dXJuIHRoaXMuX2luZGV4OwogICAgIH0sCiAKLSAgICBzZWxlY3Q6 IGZ1bmN0aW9uKCkKKyAgICBnZXQgcmF3U291cmNlQ29kZSgpCiAgICAgewotICAgICAgICBpZiAo dGhpcy5fcmF3U291cmNlQ29kZSkKLSAgICAgICAgICAgIHRoaXMuX3Jhd1NvdXJjZUNvZGUuZm9y Y2VVcGRhdGVTb3VyY2VNYXBwaW5nKCk7CisgICAgICAgIHJldHVybiB0aGlzLl9yYXdTb3VyY2VD b2RlOwogICAgIH0sCiAKICAgICBldmFsdWF0ZTogZnVuY3Rpb24oY29kZSwgb2JqZWN0R3JvdXAs IGluY2x1ZGVDb21tYW5kTGluZUFQSSwgcmV0dXJuQnlWYWx1ZSwgY2FsbGJhY2spCkBAIC00OTIs MjcgKzQ5MiwzMyBAQCBXZWJJbnNwZWN0b3IuUHJlc2VudGF0aW9uQ2FsbEZyYW1lLnByb3RvdHlw ZSA9IHsKICAgICAgICAgRGVidWdnZXJBZ2VudC5ldmFsdWF0ZU9uQ2FsbEZyYW1lKHRoaXMuX2Nh bGxGcmFtZS5jYWxsRnJhbWVJZCwgY29kZSwgb2JqZWN0R3JvdXAsIGluY2x1ZGVDb21tYW5kTGlu ZUFQSSwgcmV0dXJuQnlWYWx1ZSwgZGlkRXZhbHVhdGVPbkNhbGxGcmFtZS5iaW5kKHRoaXMpKTsK ICAgICB9LAogCi0gICAgc291cmNlTGluZTogZnVuY3Rpb24oY2FsbGJhY2spCisgICAgY3JlYXRl UGxhY2FyZDogZnVuY3Rpb24odGl0bGUsIHN1YnRpdGxlKQogICAgIHsKLSAgICAgICAgdmFyIHJh d0xvY2F0aW9uID0gdGhpcy5fY2FsbEZyYW1lLmxvY2F0aW9uOwotICAgICAgICBpZiAoIXRoaXMu X3Jhd1NvdXJjZUNvZGUpIHsKLSAgICAgICAgICAgIGNhbGxiYWNrKHVuZGVmaW5lZCwgcmF3TG9j YXRpb24ubGluZU51bWJlcik7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KLQotICAg ICAgICBpZiAodGhpcy5fcmF3U291cmNlQ29kZS5zb3VyY2VNYXBwaW5nKSB7Ci0gICAgICAgICAg ICB2YXIgdWlMb2NhdGlvbiA9IHRoaXMuX3Jhd1NvdXJjZUNvZGUuc291cmNlTWFwcGluZy5yYXdM b2NhdGlvblRvVUlMb2NhdGlvbihyYXdMb2NhdGlvbik7Ci0gICAgICAgICAgICBjYWxsYmFjayh1 aUxvY2F0aW9uLnVpU291cmNlQ29kZSwgdWlMb2NhdGlvbi5saW5lTnVtYmVyKTsKLSAgICAgICAg ICAgIHJldHVybjsKKyAgICAgICAgdmFyIHRpdGxlID0gdGhpcy5fY2FsbEZyYW1lLmZ1bmN0aW9u TmFtZSB8fCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIihhbm9ueW1vdXMgZnVuY3Rpb24pIik7Cisg ICAgICAgIHZhciBwbGFjYXJkID0gbmV3IFdlYkluc3BlY3Rvci5QbGFjYXJkKHRpdGxlLCAiIik7 CisgICAgICAgIGZ1bmN0aW9uIHVwZGF0ZVBsYWNhcmQoKQorICAgICAgICB7CisgICAgICAgICAg ICB2YXIgdWlMb2NhdGlvbiA9IHRoaXMuX3Jhd1NvdXJjZUNvZGUuc291cmNlTWFwcGluZy5yYXdM b2NhdGlvblRvVUlMb2NhdGlvbih0aGlzLl9jYWxsRnJhbWUubG9jYXRpb24pOworICAgICAgICAg ICAgcGxhY2FyZC5zdWJ0aXRsZSA9IFdlYkluc3BlY3Rvci5kaXNwbGF5TmFtZUZvclVSTCh1aUxv Y2F0aW9uLnVpU291cmNlQ29kZS51cmwpICsgIjoiICsgKHVpTG9jYXRpb24ubGluZU51bWJlciAr IDEpOworICAgICAgICAgICAgcGxhY2FyZC5fdGV4dCA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygi JXMoKSBhdCAlcyIsIHBsYWNhcmQudGl0bGUsIHBsYWNhcmQuc3VidGl0bGUpOwogICAgICAgICB9 CisgICAgICAgIGlmICh0aGlzLl9yYXdTb3VyY2VDb2RlLnNvdXJjZU1hcHBpbmcpCisgICAgICAg ICAgICB1cGRhdGVQbGFjYXJkLmNhbGwodGhpcyk7CisgICAgICAgIHRoaXMuX3Jhd1NvdXJjZUNv ZGUuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuUmF3U291cmNlQ29kZS5FdmVudHMuU291 cmNlTWFwcGluZ1VwZGF0ZWQsIHVwZGF0ZVBsYWNhcmQsIHRoaXMpOworICAgICAgICByZXR1cm4g cGxhY2FyZDsKKyAgICB9LAogCi0gICAgICAgIGZ1bmN0aW9uIHNvdXJjZU1hcHBpbmdVcGRhdGVk KCkKKyAgICB1aUxvY2F0aW9uOiBmdW5jdGlvbihjYWxsYmFjaykKKyAgICB7CisgICAgICAgIGZ1 bmN0aW9uIHNvdXJjZU1hcHBpbmdSZWFkeSgpCiAgICAgICAgIHsKLSAgICAgICAgICAgIHRoaXMu X3Jhd1NvdXJjZUNvZGUucmVtb3ZlRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuUmF3U291cmNl Q29kZS5FdmVudHMuU291cmNlTWFwcGluZ1VwZGF0ZWQsIHNvdXJjZU1hcHBpbmdVcGRhdGVkLCB0 aGlzKTsKLSAgICAgICAgICAgIHZhciB1aUxvY2F0aW9uID0gdGhpcy5fcmF3U291cmNlQ29kZS5z b3VyY2VNYXBwaW5nLnJhd0xvY2F0aW9uVG9VSUxvY2F0aW9uKHJhd0xvY2F0aW9uKTsKLSAgICAg ICAgICAgIGNhbGxiYWNrKHVpTG9jYXRpb24udWlTb3VyY2VDb2RlLCB1aUxvY2F0aW9uLmxpbmVO dW1iZXIpOworICAgICAgICAgICAgdGhpcy5fcmF3U291cmNlQ29kZS5yZW1vdmVFdmVudExpc3Rl bmVyKFdlYkluc3BlY3Rvci5SYXdTb3VyY2VDb2RlLkV2ZW50cy5Tb3VyY2VNYXBwaW5nVXBkYXRl ZCwgc291cmNlTWFwcGluZ1JlYWR5LCB0aGlzKTsKKyAgICAgICAgICAgIGNhbGxiYWNrKHRoaXMu X3Jhd1NvdXJjZUNvZGUuc291cmNlTWFwcGluZy5yYXdMb2NhdGlvblRvVUlMb2NhdGlvbih0aGlz Ll9jYWxsRnJhbWUubG9jYXRpb24pKTsKICAgICAgICAgfQotICAgICAgICB0aGlzLl9yYXdTb3Vy Y2VDb2RlLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlJhd1NvdXJjZUNvZGUuRXZlbnRz LlNvdXJjZU1hcHBpbmdVcGRhdGVkLCBzb3VyY2VNYXBwaW5nVXBkYXRlZCwgdGhpcyk7CisgICAg ICAgIGlmICh0aGlzLl9yYXdTb3VyY2VDb2RlLnNvdXJjZU1hcHBpbmcpCisgICAgICAgICAgICBz b3VyY2VNYXBwaW5nUmVhZHkuY2FsbCh0aGlzKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAg dGhpcy5fcmF3U291cmNlQ29kZS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5SYXdTb3Vy Y2VDb2RlLkV2ZW50cy5Tb3VyY2VNYXBwaW5nVXBkYXRlZCwgc291cmNlTWFwcGluZ1JlYWR5LCB0 aGlzKTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9TY3JpcHRzUGFuZWwuanMKaW5kZXggYzMxMDk0ODFlZWI2YzM1YWExZTk4ZGU5YThhODYz NTJjMzI5YmIyOC4uNWNlNGJiYzUyYTlkMmE3MzU0YzZkNWYzMTYyYzg0NjE0ZTI2NTk4YSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwu anMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwu anMKQEAgLTE3MCw2ICsxNzAsNyBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsID0gZnVuY3Rp b24ocHJlc2VudGF0aW9uTW9kZWwpCiAgICAgdGhpcy5fcHJlc2VudGF0aW9uTW9kZWwuYWRkRXZl bnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5FdmVudHMu RGVidWdnZXJQYXVzZWQsIHRoaXMuX2RlYnVnZ2VyUGF1c2VkLCB0aGlzKTsKICAgICB0aGlzLl9w cmVzZW50YXRpb25Nb2RlbC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclBy ZXNlbnRhdGlvbk1vZGVsLkV2ZW50cy5EZWJ1Z2dlclJlc3VtZWQsIHRoaXMuX2RlYnVnZ2VyUmVz dW1lZCwgdGhpcyk7CiAgICAgdGhpcy5fcHJlc2VudGF0aW9uTW9kZWwuYWRkRXZlbnRMaXN0ZW5l cihXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5FdmVudHMuQ2FsbEZyYW1l U2VsZWN0ZWQsIHRoaXMuX2NhbGxGcmFtZVNlbGVjdGVkLCB0aGlzKTsKKyAgICB0aGlzLl9wcmVz ZW50YXRpb25Nb2RlbC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNl bnRhdGlvbk1vZGVsLkV2ZW50cy5FeGVjdXRpb25MaW5lQ2hhbmdlZCwgdGhpcy5fZXhlY3V0aW9u TGluZUNoYW5nZWQsIHRoaXMpOwogCiAgICAgdmFyIGVuYWJsZURlYnVnZ2VyID0gUHJlZmVyZW5j ZXMuZGVidWdnZXJBbHdheXNFbmFibGVkIHx8IFdlYkluc3BlY3Rvci5zZXR0aW5ncy5kZWJ1Z2dl ckVuYWJsZWQuZ2V0KCk7CiAgICAgaWYgKGVuYWJsZURlYnVnZ2VyKQpAQCAtNDk3LDE0ICs0OTgs MTQgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIH0g ZWxzZSBpZiAoZGV0YWlscy5yZWFzb24gPT09IFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwuQnJl YWtSZWFzb24uRXhjZXB0aW9uKSB7CiAgICAgICAgICAgICB0aGlzLnNpZGViYXJQYW5lcy5jYWxs c3RhY2suc2V0U3RhdHVzKFdlYkluc3BlY3Rvci5VSVN0cmluZygiUGF1c2VkIG9uIGV4Y2VwdGlv bjogJyVzJy4iLCBkZXRhaWxzLmF1eERhdGEuZGVzY3JpcHRpb24pKTsKICAgICAgICAgfSBlbHNl IHsKLSAgICAgICAgICAgIGZ1bmN0aW9uIGRpZEdldFNvdXJjZUxvY2F0aW9uKHVpU291cmNlQ29k ZSwgbGluZU51bWJlcikKKyAgICAgICAgICAgIGZ1bmN0aW9uIGRpZEdldFVJTG9jYXRpb24odWlM b2NhdGlvbikKICAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICBpZiAoIXVpU291cmNlQ29k ZSB8fCAhdGhpcy5fcHJlc2VudGF0aW9uTW9kZWwuZmluZEJyZWFrcG9pbnQodWlTb3VyY2VDb2Rl LCBsaW5lTnVtYmVyKSkKKyAgICAgICAgICAgICAgICBpZiAoIXRoaXMuX3ByZXNlbnRhdGlvbk1v ZGVsLmZpbmRCcmVha3BvaW50KHVpTG9jYXRpb24udWlTb3VyY2VDb2RlLCB1aUxvY2F0aW9uLmxp bmVOdW1iZXIpKQogICAgICAgICAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgICAgICAgICAg dGhpcy5zaWRlYmFyUGFuZXMuanNCcmVha3BvaW50cy5oaWdobGlnaHRCcmVha3BvaW50KHVpU291 cmNlQ29kZSwgbGluZU51bWJlcik7CisgICAgICAgICAgICAgICAgdGhpcy5zaWRlYmFyUGFuZXMu anNCcmVha3BvaW50cy5oaWdobGlnaHRCcmVha3BvaW50KHVpTG9jYXRpb24udWlTb3VyY2VDb2Rl LCB1aUxvY2F0aW9uLmxpbmVOdW1iZXIpOwogICAgICAgICAgICAgICAgIHRoaXMuc2lkZWJhclBh bmVzLmNhbGxzdGFjay5zZXRTdGF0dXMoV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJQYXVzZWQgb24g YSBKYXZhU2NyaXB0IGJyZWFrcG9pbnQuIikpOwogICAgICAgICAgICAgfQotICAgICAgICAgICAg Y2FsbEZyYW1lc1swXS5zb3VyY2VMaW5lKGRpZEdldFNvdXJjZUxvY2F0aW9uLmJpbmQodGhpcykp OworICAgICAgICAgICAgY2FsbEZyYW1lc1swXS51aUxvY2F0aW9uKGRpZEdldFVJTG9jYXRpb24u YmluZCh0aGlzKSk7CiAgICAgICAgIH0KIAogICAgICAgICB3aW5kb3cuZm9jdXMoKTsKQEAgLTcx NSwxMSArNzE2LDI2IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewog ICAgICAgICBkZWxldGUgdGhpcy5fZXhlY3V0aW9uU291cmNlRnJhbWU7CiAgICAgfSwKIAotICAg IF9jYWxsRnJhbWVTZWxlY3RlZDogZnVuY3Rpb24oZXZlbnQpCisgICAgX2V4ZWN1dGlvbkxpbmVD aGFuZ2VkOiBmdW5jdGlvbihldmVudCkKICAgICB7Ci0gICAgICAgIHZhciBjYWxsRnJhbWUgPSBl dmVudC5kYXRhOworICAgICAgICB2YXIgdWlMb2NhdGlvbiA9IGV2ZW50LmRhdGE7CiAKICAgICAg ICAgdGhpcy5fY2xlYXJDdXJyZW50RXhlY3V0aW9uTGluZSgpOworICAgICAgICBpZiAoIXVpTG9j YXRpb24pCisgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgaWYgKCF1aUxvY2F0aW9uLnVp U291cmNlQ29kZS5fb3B0aW9uKSB7CisgICAgICAgICAgICAvLyBBbm9ueW1vdXMgc2NyaXB0cyBh cmUgbm90IGFkZGVkIHRvIGZpbGVzIHNlbGVjdCBieSBkZWZhdWx0LgorICAgICAgICAgICAgdGhp cy5fYWRkT3B0aW9uVG9GaWxlc1NlbGVjdCh1aUxvY2F0aW9uLnVpU291cmNlQ29kZSk7CisgICAg ICAgIH0KKyAgICAgICAgdmFyIHNvdXJjZUZyYW1lID0gdGhpcy5fc2hvd1NvdXJjZUZyYW1lQW5k QWRkVG9IaXN0b3J5KHVpTG9jYXRpb24udWlTb3VyY2VDb2RlKTsKKyAgICAgICAgc291cmNlRnJh bWUuc2V0RXhlY3V0aW9uTGluZSh1aUxvY2F0aW9uLmxpbmVOdW1iZXIpOworICAgICAgICB0aGlz Ll9leGVjdXRpb25Tb3VyY2VGcmFtZSA9IHNvdXJjZUZyYW1lOworICAgIH0sCisKKyAgICBfY2Fs bEZyYW1lU2VsZWN0ZWQ6IGZ1bmN0aW9uKGV2ZW50KQorICAgIHsKKyAgICAgICAgdmFyIGNhbGxG cmFtZSA9IGV2ZW50LmRhdGE7CiAKICAgICAgICAgaWYgKCFjYWxsRnJhbWUpCiAgICAgICAgICAg ICByZXR1cm47CkBAIC03MjcsMjEgKzc0Myw2IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwu cHJvdG90eXBlID0gewogICAgICAgICB0aGlzLnNpZGViYXJQYW5lcy5zY29wZWNoYWluLnVwZGF0 ZShjYWxsRnJhbWUpOwogICAgICAgICB0aGlzLnNpZGViYXJQYW5lcy53YXRjaEV4cHJlc3Npb25z LnJlZnJlc2hFeHByZXNzaW9ucygpOwogICAgICAgICB0aGlzLnNpZGViYXJQYW5lcy5jYWxsc3Rh Y2suc2VsZWN0ZWRDYWxsRnJhbWUgPSB0aGlzLl9wcmVzZW50YXRpb25Nb2RlbC5zZWxlY3RlZENh bGxGcmFtZTsKLQotICAgICAgICBmdW5jdGlvbiBkaWRHZXRTb3VyY2VMb2NhdGlvbih1aVNvdXJj ZUNvZGUsIGxpbmVOdW1iZXIpCi0gICAgICAgIHsKLSAgICAgICAgICAgIGlmICghdWlTb3VyY2VD b2RlKQotICAgICAgICAgICAgICAgIHJldHVybjsKLQotICAgICAgICAgICAgaWYgKCF1aVNvdXJj ZUNvZGUuX29wdGlvbikgewotICAgICAgICAgICAgICAgIC8vIEFub255bW91cyBzY3JpcHRzIGFy ZSBub3QgYWRkZWQgdG8gZmlsZXMgc2VsZWN0IGJ5IGRlZmF1bHQuCi0gICAgICAgICAgICAgICAg dGhpcy5fYWRkT3B0aW9uVG9GaWxlc1NlbGVjdCh1aVNvdXJjZUNvZGUpOwotICAgICAgICAgICAg fQotICAgICAgICAgICAgdmFyIHNvdXJjZUZyYW1lID0gdGhpcy5fc2hvd1NvdXJjZUZyYW1lQW5k QWRkVG9IaXN0b3J5KHVpU291cmNlQ29kZSk7Ci0gICAgICAgICAgICBzb3VyY2VGcmFtZS5zZXRF eGVjdXRpb25MaW5lKGxpbmVOdW1iZXIpOwotICAgICAgICAgICAgdGhpcy5fZXhlY3V0aW9uU291 cmNlRnJhbWUgPSBzb3VyY2VGcmFtZTsKLSAgICAgICAgfQotICAgICAgICBjYWxsRnJhbWUuc291 cmNlTGluZShkaWRHZXRTb3VyY2VMb2NhdGlvbi5iaW5kKHRoaXMpKTsKICAgICB9LAogCiAgICAg X2ZpbGVzU2VsZWN0Q2hhbmdlZDogZnVuY3Rpb24oKQo=