110133 2013-02-18 09:28:42 -0800 Web Inspector: Let user know when file system based uiSourceCode was changed on disk. 2013-03-03 22:55:21 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 vsevik vsevik apavlov buildbot keishi loislo pfeldman pmuellr rniwa vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 835556 0 vsevik 2013-02-18 09:28:42 -0800 Patch to follow 835564 1 188907 vsevik 2013-02-18 09:33:34 -0800 Created attachment 188907 Patch 836064 2 188907 pfeldman 2013-02-19 00:14:09 -0800 Comment on attachment 188907 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=188907&action=review As per our discussion, conflict resolution should be encapsulated in the UISourceCode if possible. > Source/WebCore/inspector/front-end/DefaultTextEditor.js:505 > + this._textModel.editRange(this._textModel.range(), text, this.lastSelection()) I'd do that on the call site. > Source/WebCore/inspector/front-end/SimpleWorkspaceProvider.js:102 > + requestUpdatedFileContent: function(path, currentContent, callback) { { on the next line. 845273 3 190983 vsevik 2013-03-01 10:15:49 -0800 Created attachment 190983 Patch 845341 4 190983 webkit.review.bot 2013-03-01 11:19:34 -0800 Comment on attachment 190983 Patch Rejecting attachment 190983 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=webkit-commit-queue.appspot.com', '--bot-id=gce-cq-02', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 190983, '--port=chromium-xvfb']" exit_code: 2 cwd: /mnt/git/webkit-commit-queue Last 500 characters of output: rce/WebKit/chromium/webkit/media/crypto/ppapi/cdm --revision 181763 --non-interactive --force --accept theirs-conflict --ignore-externals' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' 57>At revision 181763. ________ running '/usr/bin/python tools/clang/scripts/update.py --mac-only' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' ________ running '/usr/bin/python gyp_webkit' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' Updating webkit projects from gyp files... Full output: http://webkit-commit-queue.appspot.com/results/16687537 845347 5 190983 buildbot 2013-03-01 11:24:00 -0800 Comment on attachment 190983 Patch Attachment 190983 did not pass mac-ews (mac): Output: http://webkit-commit-queue.appspot.com/results/16772732 New failing tests: svg/as-image/img-relative-height.html 846160 6 vsevik 2013-03-03 22:55:21 -0800 Committed r144598: <http://trac.webkit.org/changeset/144598> 188907 2013-02-18 09:33:34 -0800 2013-03-01 10:15:45 -0800 Patch bug-110133-20130218212956.patch text/plain 13206 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzMjAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDQ5MjEwODkwYjQwOTc4 MzZkYTRkYmE3NWRhOTgyMTI5MzFlOWQ2OS4uOGNmYzFiYTdjM2Q2YTY5YWNjZDRjNGMxMTIzZmI3 ZjE1NmZhNjFhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQ0IEBACiAyMDEzLTAyLTE4ICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IExldCB1c2VyIGtub3cgd2hlbiBmaWxlIHN5c3RlbSBiYXNlZCB1aVNvdXJjZUNvZGUgd2Fz IGNoYW5nZWQgb24gZGlzay4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTExMDEzMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFdlIG5vdyBjaGVjayBpZiBmaWxlIHN5c3RlbSBiYXNlZCB1aVNvdXJjZUNvZGUg Y29udGVudCB3YXMgdXBkYXRlZCBleHRlcm5hbGx5IHdoZW4gCisgICAgICAgIFVJU291cmNlQ29k ZUZyYW1lIGlzIHNob3duIG9yIGluc3BlY3RvciB3aW5kb3cgaXMgZm9jdXNlZC4KKyAgICAgICAg SWYgdGhlcmUgaXMgbm8gd29ya2luZyBjb3B5IGJlaW5nIGVkaXRlZCByaWdodCBub3cgd2UgcmVw bGFjZSBvbGQgY29udGVudCB3aXRoIHRoZSBuZXcgb25lIHNpbGVudGx5LgorICAgICAgICBPdGhl cndpc2UgYXNrIHVzZXIgaWYgaGUgd2FudHMgdG8gcmVwbGFjZSBoaXMgd29ya2luZyBjb3B5IHdp dGggdGhlIG5ldyBjb250ZW50LgorCisgICAgICAgICogRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRT dHJpbmdzLmpzOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRGVmYXVsdFRleHRFZGl0 b3IuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVmYXVsdFRleHRFZGl0b3IucHJvdG90eXBl LnNldFRleHQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRmlsZVN5c3RlbVByb2pl Y3REZWxlZ2F0ZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5GaWxlU3lzdGVtUHJvamVjdERl bGVnYXRlLnByb3RvdHlwZS5pbm5lckNhbGxiYWNrKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5G aWxlU3lzdGVtUHJvamVjdERlbGVnYXRlLnByb3RvdHlwZS5yZXF1ZXN0RmlsZUNvbnRlbnQpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1Qcm9qZWN0RGVsZWdhdGUucHJvdG90eXBl Ll9jb250ZW50UmVxdWVzdEZpbmlzaGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5GaWxlU3lz dGVtUHJvamVjdERlbGVnYXRlLnByb3RvdHlwZS5yZXF1ZXN0VXBkYXRlZEZpbGVDb250ZW50KToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5GaWxlU3lzdGVtUHJvamVjdERlbGVnYXRlLnByb3RvdHlw ZS5jb250ZW50Q2FsbGJhY2spOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1Qcm9q ZWN0RGVsZWdhdGUucHJvdG90eXBlLnNlYXJjaEluRmlsZUNvbnRlbnQpOgorICAgICAgICAqIGlu c3BlY3Rvci9mcm9udC1lbmQvSmF2YVNjcmlwdFNvdXJjZUZyYW1lLmpzOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2VGcmFtZS5wcm90b3R5cGUud2FzU2hvd24pOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2VGcmFtZS5wcm90b3R5cGUud2lsbEhp ZGUpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU2ltcGxlV29ya3NwYWNlUHJvdmlk ZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2ltcGxlUHJvamVjdERlbGVnYXRlLnByb3Rv dHlwZS5yZXF1ZXN0VXBkYXRlZEZpbGVDb250ZW50KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJv bnQtZW5kL1VJU291cmNlQ29kZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5VSVNvdXJjZUNv ZGUucHJvdG90eXBlLnJlcXVlc3RVcGRhdGVkQ29udGVudCk6CisgICAgICAgICogaW5zcGVjdG9y L2Zyb250LWVuZC9VSVNvdXJjZUNvZGVGcmFtZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5V SVNvdXJjZUNvZGVGcmFtZS5wcm90b3R5cGUud2FzU2hvd24pOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlVJU291cmNlQ29kZUZyYW1lLnByb3RvdHlwZS53aWxsSGlkZSk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuVUlTb3VyY2VDb2RlRnJhbWUucHJvdG90eXBlLl93aW5kb3dGb2N1c2VkKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGVGcmFtZS5wcm90b3R5cGUuX2NoZWNrQ29u dGVudFVwZGF0ZWQudXBkYXRlZENvbnRlbnRMb2FkZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlVJU291cmNlQ29kZUZyYW1lLnByb3RvdHlwZS5fY2hlY2tDb250ZW50VXBkYXRlZCk6CisgICAg ICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Xb3Jrc3BhY2UuanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuUHJvamVjdERlbGVnYXRlLnByb3RvdHlwZS5yZXF1ZXN0VXBkYXRlZEZpbGVDb250ZW50 KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Qcm9qZWN0LnByb3RvdHlwZS5yZXF1ZXN0VXBkYXRl ZEZpbGVDb250ZW50KToKKworMjAxMy0wMi0xOCAgVnNldm9sb2QgVmxhc292ICA8dnNldmlrQGNo cm9taXVtLm9yZz4KKwogICAgICAgICBXZWIgSW5zcGVjdG9yOiBDcmVhdGUgc2VwYXJhdGUgcHJv amVjdCBmb3IgZWFjaCBkb21haW4gZm9yIFVJU291cmNlQ29kZSBiYXNlZCBvbiBicm93c2VyIHJl c291cmNlcy4KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEwOTY5MQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL2xvY2Fs aXplZFN0cmluZ3MuanMgYi9Tb3VyY2UvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0 cmluZ3MuanMKaW5kZXggZjNiOTYyYTQyOTA2ZTZjMjM1ZDMxOGM2YzVkZWIwZDU2NzgyZDY1NS4u Mzg4ZGU5NTVlYzExM2RiZmUwNWIwNmQ1ODYyYWE0ZDhiZDdlYjIxZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCisrKyBiL1NvdXJj ZS9XZWJDb3JlL0VuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwpAQCAtODY0LDMgKzg2 NCw0IEBAIGxvY2FsaXplZFN0cmluZ3NbIk1hcHBpbmdzIl0gPSAiTWFwcGluZ3MiOwogbG9jYWxp emVkU3RyaW5nc1siQWRkIl0gPSAiQWRkIjsKIGxvY2FsaXplZFN0cmluZ3NbIk9iamVjdCBzdGF0 ZSBiZWxvdyBpcyBjYXB0dXJlZCB1cG9uIGZpcnN0IGV4cGFuc2lvbiJdID0gIk9iamVjdCBzdGF0 ZSBiZWxvdyBpcyBjYXB0dXJlZCB1cG9uIGZpcnN0IGV4cGFuc2lvbiI7CiBsb2NhbGl6ZWRTdHJp bmdzWyIoaW5kZXgpIl0gPSAiKGluZGV4KSI7Citsb2NhbGl6ZWRTdHJpbmdzWyJUaGlzIGZpbGUg d2FzIGNoYW5nZWQgZXh0ZXJuYWxseS4gV291bGQgeW91IGxpa2UgdG8gcmVsb2FkIGl0PyJdID0g IlRoaXMgZmlsZSB3YXMgY2hhbmdlZCBleHRlcm5hbGx5LiBXb3VsZCB5b3UgbGlrZSB0byByZWxv YWQgaXQ/IjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv RGVmYXVsdFRleHRFZGl0b3IuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0RlZmF1bHRUZXh0RWRpdG9yLmpzCmluZGV4IGVhOTk3YzlkMTJjYTgwODg2OGZlOTkwZjM3ODk2 NzEyNTE1NGM5ZTkuLjI1N2YyZTg2NTAyY2VjYTBjMjlhYzMwZmY3MTYyNDRlNDgwNzA3OWQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVmYXVsdFRleHRF ZGl0b3IuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWZhdWx0 VGV4dEVkaXRvci5qcwpAQCAtNTAxLDYgKzUwMSwxMSBAQCBXZWJJbnNwZWN0b3IuRGVmYXVsdFRl eHRFZGl0b3IucHJvdG90eXBlID0gewogICAgICAqLwogICAgIHNldFRleHQ6IGZ1bmN0aW9uKHRl eHQpCiAgICAgeworICAgICAgICBpZiAodGhpcy5fbG9hZGVkKSB7CisgICAgICAgICAgICB0aGlz Ll90ZXh0TW9kZWwuZWRpdFJhbmdlKHRoaXMuX3RleHRNb2RlbC5yYW5nZSgpLCB0ZXh0LCB0aGlz Lmxhc3RTZWxlY3Rpb24oKSkKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAgICAg ICB0aGlzLl9sb2FkZWQgPSB0cnVlOwogICAgICAgICB0aGlzLl90ZXh0TW9kZWwuc2V0VGV4dCh0 ZXh0KTsKICAgICB9LAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0ZpbGVTeXN0ZW1Qcm9qZWN0RGVsZWdhdGUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0ZpbGVTeXN0ZW1Qcm9qZWN0RGVsZWdhdGUuanMKaW5kZXggODM4ZjI3 MGQ4ODdiZTlmMTQ0YzIyYWU1OWVkZTAzMTkwYmM5NzJjZi4uZmQ4ZjA0YWQ5NGEwZDk3ZmYwNWQy MDNiZWM0MWMwMTQ2ZWNiMjg3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9GaWxlU3lzdGVtUHJvamVjdERlbGVnYXRlLmpzCisrKyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRmlsZVN5c3RlbVByb2plY3REZWxlZ2F0ZS5qcwpAQCAt OTAsNiArOTAsNyBAQCBXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbVByb2plY3REZWxlZ2F0ZS5wcm90 b3R5cGUgPSB7CiAgICAgICAgICAqLwogICAgICAgICBmdW5jdGlvbiBpbm5lckNhbGxiYWNrKGNv bnRlbnQpCiAgICAgICAgIHsKKyAgICAgICAgICAgIHRoaXMuX2NvbnRlbnRSZXF1ZXN0RmluaXNo ZWQocGF0aCwgY29udGVudCk7CiAgICAgICAgICAgICB2YXIgY29udGVudFR5cGUgPSB0aGlzLl9j b250ZW50VHlwZUZvclBhdGgoZmlsZVBhdGgpOwogICAgICAgICAgICAgY2FsbGJhY2soY29udGVu dCwgZmFsc2UsIGNvbnRlbnRUeXBlLmNhbm9uaWNhbE1pbWVUeXBlKCkpOwogICAgICAgICB9CkBA IC05Nyw2ICs5OCw0MCBAQCBXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbVByb2plY3REZWxlZ2F0ZS5w cm90b3R5cGUgPSB7CiAKICAgICAvKioKICAgICAgKiBAcGFyYW0ge3N0cmluZ30gcGF0aAorICAg ICAqIEBwYXJhbSB7c3RyaW5nfSBjb250ZW50CisgICAgICogQHJldHVybiB7c3RyaW5nfQorICAg ICAqLworICAgIF9jb250ZW50UmVxdWVzdEZpbmlzaGVkOiBmdW5jdGlvbihwYXRoLCBjb250ZW50 KQorICAgIHsKKyAgICAgICAgdGhpcy5fbGFzdENvbnRlbnRSZXF1ZXN0UGF0aCA9IHBhdGg7Cisg ICAgICAgIHRoaXMuX2xhc3RDb250ZW50UmVxdWVzdENvbnRlbnQgPSBjb250ZW50OworICAgIH0s CisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge3N0cmluZ30gcGF0aAorICAgICAqIEBwYXJhbSB7 c3RyaW5nfSBjdXJyZW50Q29udGVudAorICAgICAqIEBwYXJhbSB7ZnVuY3Rpb24oP3N0cmluZyl9 IGNhbGxiYWNrCisgICAgICovCisgICAgcmVxdWVzdFVwZGF0ZWRGaWxlQ29udGVudDogZnVuY3Rp b24ocGF0aCwgY3VycmVudENvbnRlbnQsIGNhbGxiYWNrKQorICAgIHsKKyAgICAgICAgdmFyIGZp bGVQYXRoID0gdGhpcy5fZmlsZVBhdGhGb3JQYXRoKHBhdGgpOworICAgICAgICB0aGlzLl9maWxl U3lzdGVtLnJlcXVlc3RGaWxlQ29udGVudChmaWxlUGF0aCwgaW5uZXJDYWxsYmFjay5iaW5kKHRo aXMpKTsKKworICAgICAgICAvKioKKyAgICAgICAgICogQHBhcmFtIHs/c3RyaW5nfSBjb250ZW50 CisgICAgICAgICAqLworICAgICAgICBmdW5jdGlvbiBpbm5lckNhbGxiYWNrKGNvbnRlbnQpCisg ICAgICAgIHsKKyAgICAgICAgICAgIHZhciBwcmV2aW91c0NvbnRlbnQgPSB0aGlzLl9sYXN0Q29u dGVudFJlcXVlc3RQYXRoID09PSBwYXRoID8gdGhpcy5fbGFzdENvbnRlbnRSZXF1ZXN0Q29udGVu dCA6IG51bGw7CisgICAgICAgICAgICBpZiAodHlwZW9mIHByZXZpb3VzQ29udGVudCAhPT0gInN0 cmluZyIpCisgICAgICAgICAgICAgICAgcHJldmlvdXNDb250ZW50ID0gY3VycmVudENvbnRlbnQ7 CisgICAgICAgICAgICB0aGlzLl9jb250ZW50UmVxdWVzdEZpbmlzaGVkKHBhdGgsIGNvbnRlbnQp OworICAgICAgICAgICAgY2FsbGJhY2soY29udGVudCAhPT0gcHJldmlvdXNDb250ZW50ID8gY29u dGVudCA6IG51bGwpOworICAgICAgICB9CisgICAgfSwKKworICAgIC8qKgorICAgICAqIEBwYXJh bSB7c3RyaW5nfSBwYXRoCiAgICAgICogQHBhcmFtIHtzdHJpbmd9IG5ld0NvbnRlbnQKICAgICAg KiBAcGFyYW0ge2Z1bmN0aW9uKD9zdHJpbmcpfSBjYWxsYmFjawogICAgICAqLwpAQCAtMTE1LDE0 ICsxNTAsMTMgQEAgV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1Qcm9qZWN0RGVsZWdhdGUucHJvdG90 eXBlID0gewogICAgICAqLwogICAgIHNlYXJjaEluRmlsZUNvbnRlbnQ6IGZ1bmN0aW9uKHBhdGgs IHF1ZXJ5LCBjYXNlU2Vuc2l0aXZlLCBpc1JlZ2V4LCBjYWxsYmFjaykKICAgICB7Ci0gICAgICAg IHRoaXMucmVxdWVzdEZpbGVDb250ZW50KHBhdGgsIGNvbnRlbnRDYWxsYmFjay5iaW5kKHRoaXMp KTsKKyAgICAgICAgdmFyIGZpbGVQYXRoID0gdGhpcy5fZmlsZVBhdGhGb3JQYXRoKHBhdGgpOwor ICAgICAgICB0aGlzLl9maWxlU3lzdGVtLnJlcXVlc3RGaWxlQ29udGVudChmaWxlUGF0aCwgY29u dGVudENhbGxiYWNrLmJpbmQodGhpcykpOwogCiAgICAgICAgIC8qKgogICAgICAgICAgKiBAcGFy YW0gez9zdHJpbmd9IGNvbnRlbnQKLSAgICAgICAgICogQHBhcmFtIHtib29sZWFufSBiYXNlNjRF bmNvZGVkCi0gICAgICAgICAqIEBwYXJhbSB7c3RyaW5nfSBtaW1lVHlwZQogICAgICAgICAgKi8K LSAgICAgICAgZnVuY3Rpb24gY29udGVudENhbGxiYWNrKGNvbnRlbnQsIGJhc2U2NEVuY29kZWQs IG1pbWVUeXBlKQorICAgICAgICBmdW5jdGlvbiBjb250ZW50Q2FsbGJhY2soY29udGVudCkKICAg ICAgICAgewogICAgICAgICAgICAgdmFyIHJlc3VsdCA9IFtdOwogICAgICAgICAgICAgaWYgKGNv bnRlbnQgIT09IG51bGwpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0phdmFTY3JpcHRTb3VyY2VGcmFtZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvSmF2YVNjcmlwdFNvdXJjZUZyYW1lLmpzCmluZGV4IGFjMmU0MzNjMDFjZTE3 ZjA0NjlhMDdkYmU1ZTg1MTdkNDlkYTkxNjkuLjI1YTMyNWJjNTFjOTdiOGZhZjNjZjY0OTIxZWI0 ZTlkN2FkMTFiNmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvSmF2YVNjcmlwdFNvdXJjZUZyYW1lLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvSmF2YVNjcmlwdFNvdXJjZUZyYW1lLmpzCkBAIC02OCwxMiArNjgsMTIgQEAg V2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7CiAgICAgLy8g VmlldyBldmVudHMKICAgICB3YXNTaG93bjogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgV2Vi SW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS53YXNTaG93bi5jYWxsKHRoaXMpOworICAg ICAgICBXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlRnJhbWUucHJvdG90eXBlLndhc1Nob3duLmNh bGwodGhpcyk7CiAgICAgfSwKIAogICAgIHdpbGxIaWRlOiBmdW5jdGlvbigpCiAgICAgewotICAg ICAgICBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlLndpbGxIaWRlLmNhbGwodGhp cyk7CisgICAgICAgIFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGVGcmFtZS5wcm90b3R5cGUud2ls bEhpZGUuY2FsbCh0aGlzKTsKICAgICAgICAgdGhpcy5fcG9wb3ZlckhlbHBlci5oaWRlUG9wb3Zl cigpOwogICAgIH0sCiAKQEAgLTExMCw3ICsxMTAsNiBAQCBXZWJJbnNwZWN0b3IuSmF2YVNjcmlw dFNvdXJjZUZyYW1lLnByb3RvdHlwZSA9IHsKIAogICAgIHBvcHVsYXRlVGV4dEFyZWFDb250ZXh0 TWVudTogZnVuY3Rpb24oY29udGV4dE1lbnUsIGxpbmVOdW1iZXIpCiAgICAgewotICAgICAgICBX ZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlLnBvcHVsYXRlVGV4dEFyZWFDb250ZXh0 TWVudS5jYWxsKHRoaXMsIGNvbnRleHRNZW51LCBsaW5lTnVtYmVyKTsKICAgICAgICAgdmFyIHNl bGVjdGlvbiA9IHdpbmRvdy5nZXRTZWxlY3Rpb24oKTsKICAgICAgICAgaWYgKHNlbGVjdGlvbi50 eXBlID09PSAiUmFuZ2UiICYmICFzZWxlY3Rpb24uaXNDb2xsYXBzZWQpIHsKICAgICAgICAgICAg IHZhciBhZGRUb1dhdGNoTGFiZWwgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoV2ViSW5zcGVjdG9y LnVzZUxvd2VyQ2FzZU1lbnVUaXRsZXMoKSA/ICJBZGQgdG8gd2F0Y2giIDogIkFkZCB0byBXYXRj aCIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TaW1w bGVXb3Jrc3BhY2VQcm92aWRlci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvU2ltcGxlV29ya3NwYWNlUHJvdmlkZXIuanMKaW5kZXggMGZhN2FkZGJkNDdlOWU3NWQ4NDI0 NDE1M2Q1ODA5Y2VjNDBlODM0Mi4uMWJmZjY0ODFiNmI1MjVlNDMwNTIwZjU4NTY4MTliOWRjNDcy MWNiZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TaW1w bGVXb3Jrc3BhY2VQcm92aWRlci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1NpbXBsZVdvcmtzcGFjZVByb3ZpZGVyLmpzCkBAIC05Niw2ICs5NiwxNSBAQCBXZWJJ bnNwZWN0b3IuU2ltcGxlUHJvamVjdERlbGVnYXRlLnByb3RvdHlwZSA9IHsKIAogICAgIC8qKgog ICAgICAqIEBwYXJhbSB7c3RyaW5nfSBwYXRoCisgICAgICogQHBhcmFtIHtzdHJpbmd9IGN1cnJl bnRDb250ZW50CisgICAgICogQHBhcmFtIHtmdW5jdGlvbig/c3RyaW5nKX0gY2FsbGJhY2sKKyAg ICAgKi8KKyAgICByZXF1ZXN0VXBkYXRlZEZpbGVDb250ZW50OiBmdW5jdGlvbihwYXRoLCBjdXJy ZW50Q29udGVudCwgY2FsbGJhY2spIHsKKyAgICAgICAgY2FsbGJhY2sobnVsbCk7CisgICAgfSwK KworICAgIC8qKgorICAgICAqIEBwYXJhbSB7c3RyaW5nfSBwYXRoCiAgICAgICogQHBhcmFtIHtz dHJpbmd9IG5ld0NvbnRlbnQKICAgICAgKiBAcGFyYW0ge2Z1bmN0aW9uKD9zdHJpbmcpfSBjYWxs YmFjawogICAgICAqLwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9VSVNvdXJjZUNvZGUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1VJU291cmNlQ29kZS5qcwppbmRleCA3MmJhYzhhODE4MmQyOTg3NzAwYzExZjY1NDRlYzEwMWVl NjFmNzFmLi41Mzg0ZjZkYTAwMzVmMDNhMGNlYmE0NjA2YTg1ODQyNjQ0ZTMyNzk0IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1VJU291cmNlQ29kZS5qcwor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1VJU291cmNlQ29kZS5qcwpA QCAtMjM1LDYgKzIzNSwxNCBAQCBXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlLnByb3RvdHlwZSA9 IHsKICAgICB9LAogCiAgICAgLyoqCisgICAgICogQHBhcmFtIHtmdW5jdGlvbig/c3RyaW5nKX0g Y2FsbGJhY2sKKyAgICAgKi8KKyAgICByZXF1ZXN0VXBkYXRlZENvbnRlbnQ6IGZ1bmN0aW9uKGNh bGxiYWNrKQorICAgIHsKKyAgICAgICAgdGhpcy5fcHJvamVjdC5yZXF1ZXN0VXBkYXRlZEZpbGVD b250ZW50KHRoaXMsIGNhbGxiYWNrKTsKKyAgICB9LAorCisgICAgLyoqCiAgICAgICogQHBhcmFt IHtmdW5jdGlvbig/c3RyaW5nLGJvb2xlYW4sc3RyaW5nKX0gY2FsbGJhY2sKICAgICAgKi8KICAg ICByZXF1ZXN0T3JpZ2luYWxDb250ZW50OiBmdW5jdGlvbihjYWxsYmFjaykKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVUlTb3VyY2VDb2RlRnJhbWUuanMg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1VJU291cmNlQ29kZUZyYW1lLmpz CmluZGV4IGUxZDAxYjhmMDE4NDU0YTVmMGZkYjE4YTg5MjRkNmIyYTZlZTc0MDAuLmY4YzZjODkx M2MxZjNhN2ExMDVhZWYyYjc3ZmQ5YWM5OTlmMGZhODEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVUlTb3VyY2VDb2RlRnJhbWUuanMKKysrIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9VSVNvdXJjZUNvZGVGcmFtZS5qcwpAQCAtNDEs NiArNDEsMjEgQEAgV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZUZyYW1lID0gZnVuY3Rpb24odWlT b3VyY2VDb2RlKQogfQogCiBXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlRnJhbWUucHJvdG90eXBl ID0geworICAgIHdhc1Nob3duOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICBXZWJJbnNwZWN0 b3IuU291cmNlRnJhbWUucHJvdG90eXBlLndhc1Nob3duLmNhbGwodGhpcyk7CisgICAgICAgIHRo aXMuX2JvdW5kV2luZG93Rm9jdXNlZCA9IHRoaXMuX3dpbmRvd0ZvY3VzZWQuYmluZCh0aGlzKTsK KyAgICAgICAgd2luZG93LmFkZEV2ZW50TGlzdGVuZXIoImZvY3VzIiwgdGhpcy5fYm91bmRXaW5k b3dGb2N1c2VkLCBmYWxzZSk7CisgICAgICAgIHRoaXMuX2NoZWNrQ29udGVudFVwZGF0ZWQoKTsK KyAgICB9LAorCisgICAgd2lsbEhpZGU6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIFdlYklu c3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUud2lsbEhpZGUuY2FsbCh0aGlzKTsKKyAgICAg ICAgd2luZG93LnJlbW92ZUV2ZW50TGlzdGVuZXIoImZvY3VzIiwgdGhpcy5fYm91bmRXaW5kb3dG b2N1c2VkLCBmYWxzZSk7CisgICAgICAgIGRlbGV0ZSB0aGlzLl9ib3VuZFdpbmRvd0ZvY3VzZWQ7 CisgICAgfSwKKwogICAgIC8qKgogICAgICAqIEByZXR1cm4ge2Jvb2xlYW59CiAgICAgICovCkBA IC00OSw2ICs2NCwzMyBAQCBXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlRnJhbWUucHJvdG90eXBl ID0gewogICAgICAgICByZXR1cm4gdGhpcy5fdWlTb3VyY2VDb2RlLmlzRWRpdGFibGUoKTsKICAg ICB9LAogCisgICAgX3dpbmRvd0ZvY3VzZWQ6IGZ1bmN0aW9uKGV2ZW50KQorICAgIHsKKyAgICAg ICAgdGhpcy5fY2hlY2tDb250ZW50VXBkYXRlZCgpOworICAgIH0sCisKKyAgICBfY2hlY2tDb250 ZW50VXBkYXRlZDogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgaWYgKCF0aGlzLmxvYWRlZCB8 fCAhdGhpcy5pc1Nob3dpbmcoKSkKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgdGhpcy5f dWlTb3VyY2VDb2RlLnJlcXVlc3RVcGRhdGVkQ29udGVudCh1cGRhdGVkQ29udGVudExvYWRlZC5i aW5kKHRoaXMpKTsKKworICAgICAgICBmdW5jdGlvbiB1cGRhdGVkQ29udGVudExvYWRlZCh1cGRh dGVkQ29udGVudCkKKyAgICAgICAgeworICAgICAgICAgICAgaWYgKHR5cGVvZiB1cGRhdGVkQ29u dGVudCAhPT0gInN0cmluZyIpCisgICAgICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgICAg ICBpZiAoIXRoaXMuX3VpU291cmNlQ29kZS5pc0RpcnR5KCkpIHsKKyAgICAgICAgICAgICAgICB0 aGlzLl91aVNvdXJjZUNvZGUuYWRkUmV2aXNpb24odXBkYXRlZENvbnRlbnQpOworICAgICAgICAg ICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgdmFyIHNob3VsZFVw ZGF0ZSA9IHdpbmRvdy5jb25maXJtKFdlYkluc3BlY3Rvci5VSVN0cmluZygiVGhpcyBmaWxlIHdh cyBjaGFuZ2VkIGV4dGVybmFsbHkuIFdvdWxkIHlvdSBsaWtlIHRvIHJlbG9hZCBpdD8iKSk7Cisg ICAgICAgICAgICBpZiAoc2hvdWxkVXBkYXRlKQorICAgICAgICAgICAgICAgIHRoaXMuX3VpU291 cmNlQ29kZS5hZGRSZXZpc2lvbih1cGRhdGVkQ29udGVudCk7CisgICAgICAgIH0KKyAgICB9LAor CiAgICAgLyoqCiAgICAgICogQHBhcmFtIHtzdHJpbmd9IHRleHQKICAgICAgKi8KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvV29ya3NwYWNlLmpzIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Xb3Jrc3BhY2UuanMKaW5kZXggN2M5OTY4 MGE1OGIzYmM4ZmVmMjVhMjM2NWJlNDM0NzRhZDRlYmFmMi4uZWYzYjk4MmFhMmY2MGZlYzdkNDdi ZmVjZmI3NzQzN2VkMjUzYWZlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9Xb3Jrc3BhY2UuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9Xb3Jrc3BhY2UuanMKQEAgLTEwMSw2ICsxMDEsMTMgQEAgV2ViSW5zcGVjdG9yLlBy b2plY3REZWxlZ2F0ZS5wcm90b3R5cGUgPSB7CiAKICAgICAvKioKICAgICAgKiBAcGFyYW0ge3N0 cmluZ30gcGF0aAorICAgICAqIEBwYXJhbSB7c3RyaW5nfSBjdXJyZW50Q29udGVudAorICAgICAq IEBwYXJhbSB7ZnVuY3Rpb24oP3N0cmluZyl9IGNhbGxiYWNrCisgICAgICovCisgICAgcmVxdWVz dFVwZGF0ZWRGaWxlQ29udGVudDogZnVuY3Rpb24ocGF0aCwgY3VycmVudENvbnRlbnQsIGNhbGxi YWNrKSB7IH0sCisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge3N0cmluZ30gcGF0aAogICAgICAq IEBwYXJhbSB7c3RyaW5nfSBuZXdDb250ZW50CiAgICAgICogQHBhcmFtIHtmdW5jdGlvbig/c3Ry aW5nKX0gY2FsbGJhY2sKICAgICAgKi8KQEAgLTI2OCw2ICsyNzUsMTUgQEAgV2ViSW5zcGVjdG9y LlByb2plY3QucHJvdG90eXBlID0gewogCiAgICAgLyoqCiAgICAgICogQHBhcmFtIHtXZWJJbnNw ZWN0b3IuVUlTb3VyY2VDb2RlfSB1aVNvdXJjZUNvZGUKKyAgICAgKiBAcGFyYW0ge2Z1bmN0aW9u KD9zdHJpbmcpfSBjYWxsYmFjaworICAgICAqLworICAgIHJlcXVlc3RVcGRhdGVkRmlsZUNvbnRl bnQ6IGZ1bmN0aW9uKHVpU291cmNlQ29kZSwgY2FsbGJhY2spCisgICAgeworICAgICAgICB0aGlz Ll9wcm9qZWN0RGVsZWdhdGUucmVxdWVzdFVwZGF0ZWRGaWxlQ29udGVudCh1aVNvdXJjZUNvZGUu cGF0aCgpLCB1aVNvdXJjZUNvZGUud29ya2luZ0NvcHkoKSwgY2FsbGJhY2spOworICAgIH0sCisK KyAgICAvKioKKyAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGV9IHVpU291 cmNlQ29kZQogICAgICAqIEBwYXJhbSB7c3RyaW5nfSBuZXdDb250ZW50CiAgICAgICogQHBhcmFt IHtmdW5jdGlvbig/c3RyaW5nKX0gY2FsbGJhY2sKICAgICAgKi8K 190983 2013-03-01 10:15:49 -0800 2013-03-01 11:24:00 -0800 Patch bug-110133-20130301221159.patch text/plain 14107 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ0NDY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWMyODhlOWVjYThhMWM5 NGI0YWY5ZjlmMjQ2ZmE5ZWE0MTdkNjkxYi4uNWJmMGU5MmM3ZWRkNGMzNWVlM2RkYjkzYzEzZDJl MGUxMjAwYTljMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQ3IEBACiAyMDEzLTAzLTAxICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IExldCB1c2VyIGtub3cgd2hlbiBmaWxlIHN5c3RlbSBiYXNlZCB1aVNvdXJjZUNvZGUgd2Fz IGNoYW5nZWQgb24gZGlzay4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTExMDEzMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFdlIG5vdyBjaGVjayBpZiBmaWxlIHN5c3RlbSBiYXNlZCB1aVNvdXJjZUNvZGUg Y29udGVudCB3YXMgdXBkYXRlZCBleHRlcm5hbGx5IHdoZW4gCisgICAgICAgIFVJU291cmNlQ29k ZUZyYW1lIGlzIHNob3duIG9yIGluc3BlY3RvciB3aW5kb3cgaXMgZm9jdXNlZC4KKyAgICAgICAg SWYgdGhlcmUgaXMgbm8gd29ya2luZyBjb3B5IGJlaW5nIGVkaXRlZCByaWdodCBub3cgd2UgcmVw bGFjZSBvbGQgY29udGVudCB3aXRoIHRoZSBuZXcgb25lIHNpbGVudGx5LgorICAgICAgICBPdGhl cndpc2UgYXNrIHVzZXIgaWYgaGUgd2FudHMgdG8gcmVwbGFjZSBoaXMgd29ya2luZyBjb3B5IHdp dGggdGhlIG5ldyBjb250ZW50LgorCisgICAgICAgICogRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRT dHJpbmdzLmpzOgorICAgICAgICAqIFdlYkNvcmUudmNwcm9qL1dlYkNvcmUudmNwcm9qOgorICAg ICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRGVmYXVsdFRleHRFZGl0b3IuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuRGVmYXVsdFRleHRFZGl0b3IucHJvdG90eXBlLmVkaXRSYW5nZSk6Cisg ICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9GaWxlU3lzdGVtUHJvamVjdERlbGVnYXRlLmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1Qcm9qZWN0RGVsZWdhdGUucHJvdG90 eXBlLmlubmVyQ2FsbGJhY2spOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1Qcm9q ZWN0RGVsZWdhdGUucHJvdG90eXBlLnJlcXVlc3RGaWxlQ29udGVudCk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuRmlsZVN5c3RlbVByb2plY3REZWxlZ2F0ZS5wcm90b3R5cGUuX2NvbnRlbnRSZXF1 ZXN0RmluaXNoZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1Qcm9qZWN0RGVs ZWdhdGUucHJvdG90eXBlLnJlcXVlc3RVcGRhdGVkRmlsZUNvbnRlbnQpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkZpbGVTeXN0ZW1Qcm9qZWN0RGVsZWdhdGUucHJvdG90eXBlLmNvbnRlbnRDYWxs YmFjayk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbVByb2plY3REZWxlZ2F0ZS5w cm90b3R5cGUuc2VhcmNoSW5GaWxlQ29udGVudCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9KYXZhU2NyaXB0U291cmNlRnJhbWUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSmF2 YVNjcmlwdFNvdXJjZUZyYW1lLnByb3RvdHlwZS53YXNTaG93bik6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuSmF2YVNjcmlwdFNvdXJjZUZyYW1lLnByb3RvdHlwZS53aWxsSGlkZSk6CisgICAgICAg ICogaW5zcGVjdG9yL2Zyb250LWVuZC9TaW1wbGVXb3Jrc3BhY2VQcm92aWRlci5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5TaW1wbGVQcm9qZWN0RGVsZWdhdGUucHJvdG90eXBlLnJlcXVlc3RV cGRhdGVkRmlsZUNvbnRlbnQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU291cmNl RnJhbWUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlLnNl dENvbnRlbnQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvVUlTb3VyY2VDb2RlLmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZS5wcm90b3R5cGUuY2hlY2tDb250 ZW50VXBkYXRlZC51cGRhdGVkQ29udGVudExvYWRlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu VUlTb3VyY2VDb2RlLnByb3RvdHlwZS5jaGVja0NvbnRlbnRVcGRhdGVkKToKKyAgICAgICAgKiBp bnNwZWN0b3IvZnJvbnQtZW5kL1VJU291cmNlQ29kZUZyYW1lLmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlVJU291cmNlQ29kZUZyYW1lLnByb3RvdHlwZS53YXNTaG93bik6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlRnJhbWUucHJvdG90eXBlLndpbGxIaWRlKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGVGcmFtZS5wcm90b3R5cGUuX3dpbmRvd0ZvY3Vz ZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZUZyYW1lLnByb3RvdHlwZS5f Y2hlY2tDb250ZW50VXBkYXRlZCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Xb3Jr c3BhY2UuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUHJvamVjdERlbGVnYXRlLnByb3RvdHlw ZS5yZXF1ZXN0VXBkYXRlZEZpbGVDb250ZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Qcm9q ZWN0LnByb3RvdHlwZS5yZXF1ZXN0VXBkYXRlZEZpbGVDb250ZW50KToKKworMjAxMy0wMy0wMSAg VnNldm9sb2QgVmxhc292ICA8dnNldmlrQGNocm9taXVtLm9yZz4KKwogICAgICAgICBXZWIgSW5z cGVjdG9yOiBOYXZpZ2F0b3Igc2hvdWxkIHNob3cgdHJlZSBlbGVtZW50IGZvciBlYWNoIGZvbGRl ciBpbiB0aGUgc291cmNlIHBhdGguCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMDg5NDMKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvRW5nbGlz aC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzIGIvU291cmNlL1dlYkNvcmUvRW5nbGlzaC5scHJv ai9sb2NhbGl6ZWRTdHJpbmdzLmpzCmluZGV4IDE4MWFiMDgwNWE5MjQ0ODhjYmUwNjZkZTk5OWJm NmUyNDE5MTAwNzkuLmJjNTFkOGY0ZjJhNGM3ZjU3NWUyYmFhMGMyYzVhMzk2NGQ3ZmJmNmYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0VuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5q cworKysgYi9Tb3VyY2UvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMK QEAgLTg3NCwzICs4NzQsNCBAQCBsb2NhbGl6ZWRTdHJpbmdzWyJSZWNlaXZlIFdlYlNvY2tldCBI YW5kc2hha2UiXSA9ICJSZWNlaXZlIFdlYlNvY2tldCBIYW5kc2hha2UiOwogbG9jYWxpemVkU3Ry aW5nc1siRGVzdHJveSBXZWJTb2NrZXQiXSA9ICJEZXN0cm95IFdlYlNvY2tldCI7CiBsb2NhbGl6 ZWRTdHJpbmdzWyJTcGxpdCBwYW5lbHMgdmVydGljYWxseSB3aGVuIGRvY2tlZCB0byByaWdodCJd ID0gIlNwbGl0IHBhbmVscyB2ZXJ0aWNhbGx5IHdoZW4gZG9ja2VkIHRvIHJpZ2h0IjsKIGxvY2Fs aXplZFN0cmluZ3NbIihubyBkb21haW4pIl0gPSAiKG5vIGRvbWFpbikiOworbG9jYWxpemVkU3Ry aW5nc1siVGhpcyBmaWxlIHdhcyBjaGFuZ2VkIGV4dGVybmFsbHkuIFdvdWxkIHlvdSBsaWtlIHRv IHJlbG9hZCBpdD8iXSA9ICJUaGlzIGZpbGUgd2FzIGNoYW5nZWQgZXh0ZXJuYWxseS4gV291bGQg eW91IGxpa2UgdG8gcmVsb2FkIGl0PyI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0RlZmF1bHRUZXh0RWRpdG9yLmpzIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9EZWZhdWx0VGV4dEVkaXRvci5qcwppbmRleCBlYTk5N2M5ZDEyY2E4 MDg4NjhmZTk5MGYzNzg5NjcxMjUxNTRjOWU5Li5mYTdmMjIwNGZmNzJiZGRiNDkzZjU3ODgwNGQ3 NTA0M2Q0OTA1MWZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0RlZmF1bHRUZXh0RWRpdG9yLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvRGVmYXVsdFRleHRFZGl0b3IuanMKQEAgLTM1MCw3ICszNTAsNyBAQCBXZWJJbnNw ZWN0b3IuRGVmYXVsdFRleHRFZGl0b3IucHJvdG90eXBlID0gewogICAgICAqLwogICAgIGVkaXRS YW5nZTogZnVuY3Rpb24ocmFuZ2UsIHRleHQpCiAgICAgewotICAgICAgICByZXR1cm4gdGhpcy5f dGV4dE1vZGVsLmVkaXRSYW5nZShyYW5nZSwgdGV4dCk7CisgICAgICAgIHJldHVybiB0aGlzLl90 ZXh0TW9kZWwuZWRpdFJhbmdlKHJhbmdlLCB0ZXh0LCB0aGlzLmxhc3RTZWxlY3Rpb24oKSk7CiAg ICAgfSwKIAogICAgIF91cGRhdGVQYW5lbE9mZnNldHM6IGZ1bmN0aW9uKCkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRmlsZVN5c3RlbVByb2plY3REZWxl Z2F0ZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRmlsZVN5c3RlbVBy b2plY3REZWxlZ2F0ZS5qcwppbmRleCAwNjAxOWJkZTNkNGJmNWFhMWRjMWJmOWU5YWFlMjliYjU1 NmI0ZTY5Li41MDU2OGQxZWFhNGUyZWMzYjIxYTQ4MGI0MDYyYjhkMGM1MDMwOTM2IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0ZpbGVTeXN0ZW1Qcm9qZWN0 RGVsZWdhdGUuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9GaWxl U3lzdGVtUHJvamVjdERlbGVnYXRlLmpzCkBAIC05MSw2ICs5MSw3IEBAIFdlYkluc3BlY3Rvci5G aWxlU3lzdGVtUHJvamVjdERlbGVnYXRlLnByb3RvdHlwZSA9IHsKICAgICAgICAgICovCiAgICAg ICAgIGZ1bmN0aW9uIGlubmVyQ2FsbGJhY2soY29udGVudCkKICAgICAgICAgeworICAgICAgICAg ICAgdGhpcy5fY29udGVudFJlcXVlc3RGaW5pc2hlZChwYXRoLCBjb250ZW50KTsKICAgICAgICAg ICAgIHZhciBjb250ZW50VHlwZSA9IHRoaXMuX2NvbnRlbnRUeXBlRm9yUGF0aChwYXRoKTsKICAg ICAgICAgICAgIGNhbGxiYWNrKGNvbnRlbnQsIGZhbHNlLCBjb250ZW50VHlwZS5jYW5vbmljYWxN aW1lVHlwZSgpKTsKICAgICAgICAgfQpAQCAtOTgsNiArOTksNDAgQEAgV2ViSW5zcGVjdG9yLkZp bGVTeXN0ZW1Qcm9qZWN0RGVsZWdhdGUucHJvdG90eXBlID0gewogCiAgICAgLyoqCiAgICAgICog QHBhcmFtIHtBcnJheS48c3RyaW5nPn0gcGF0aAorICAgICAqIEBwYXJhbSB7c3RyaW5nfSBjb250 ZW50CisgICAgICogQHJldHVybiB7c3RyaW5nfQorICAgICAqLworICAgIF9jb250ZW50UmVxdWVz dEZpbmlzaGVkOiBmdW5jdGlvbihwYXRoLCBjb250ZW50KQorICAgIHsKKyAgICAgICAgdGhpcy5f bGFzdENvbnRlbnRSZXF1ZXN0UGF0aCA9IHBhdGg7CisgICAgICAgIHRoaXMuX2xhc3RDb250ZW50 UmVxdWVzdENvbnRlbnQgPSBjb250ZW50OworICAgIH0sCisKKyAgICAvKioKKyAgICAgKiBAcGFy YW0ge0FycmF5LjxzdHJpbmc+fSBwYXRoCisgICAgICogQHBhcmFtIHtzdHJpbmd9IGN1cnJlbnRD b250ZW50CisgICAgICogQHBhcmFtIHtmdW5jdGlvbig/c3RyaW5nKX0gY2FsbGJhY2sKKyAgICAg Ki8KKyAgICByZXF1ZXN0VXBkYXRlZEZpbGVDb250ZW50OiBmdW5jdGlvbihwYXRoLCBjdXJyZW50 Q29udGVudCwgY2FsbGJhY2spCisgICAgeworICAgICAgICB2YXIgZmlsZVBhdGggPSB0aGlzLl9m aWxlUGF0aEZvclBhdGgocGF0aCk7CisgICAgICAgIHRoaXMuX2ZpbGVTeXN0ZW0ucmVxdWVzdEZp bGVDb250ZW50KGZpbGVQYXRoLCBpbm5lckNhbGxiYWNrLmJpbmQodGhpcykpOworCisgICAgICAg IC8qKgorICAgICAgICAgKiBAcGFyYW0gez9zdHJpbmd9IGNvbnRlbnQKKyAgICAgICAgICovCisg ICAgICAgIGZ1bmN0aW9uIGlubmVyQ2FsbGJhY2soY29udGVudCkKKyAgICAgICAgeworICAgICAg ICAgICAgdmFyIHByZXZpb3VzQ29udGVudCA9IHRoaXMuX2xhc3RDb250ZW50UmVxdWVzdFBhdGgg PT09IHBhdGggPyB0aGlzLl9sYXN0Q29udGVudFJlcXVlc3RDb250ZW50IDogbnVsbDsKKyAgICAg ICAgICAgIGlmICh0eXBlb2YgcHJldmlvdXNDb250ZW50ICE9PSAic3RyaW5nIikKKyAgICAgICAg ICAgICAgICBwcmV2aW91c0NvbnRlbnQgPSBjdXJyZW50Q29udGVudDsKKyAgICAgICAgICAgIHRo aXMuX2NvbnRlbnRSZXF1ZXN0RmluaXNoZWQocGF0aCwgY29udGVudCk7CisgICAgICAgICAgICBj YWxsYmFjayhjb250ZW50ICE9PSBwcmV2aW91c0NvbnRlbnQgPyBjb250ZW50IDogbnVsbCk7Cisg ICAgICAgIH0KKyAgICB9LAorCisgICAgLyoqCisgICAgICogQHBhcmFtIHtBcnJheS48c3RyaW5n Pn0gcGF0aAogICAgICAqIEBwYXJhbSB7c3RyaW5nfSBuZXdDb250ZW50CiAgICAgICogQHBhcmFt IHtmdW5jdGlvbig/c3RyaW5nKX0gY2FsbGJhY2sKICAgICAgKi8KQEAgLTExNiwxNCArMTUxLDEz IEBAIFdlYkluc3BlY3Rvci5GaWxlU3lzdGVtUHJvamVjdERlbGVnYXRlLnByb3RvdHlwZSA9IHsK ICAgICAgKi8KICAgICBzZWFyY2hJbkZpbGVDb250ZW50OiBmdW5jdGlvbihwYXRoLCBxdWVyeSwg Y2FzZVNlbnNpdGl2ZSwgaXNSZWdleCwgY2FsbGJhY2spCiAgICAgewotICAgICAgICB0aGlzLnJl cXVlc3RGaWxlQ29udGVudChwYXRoLCBjb250ZW50Q2FsbGJhY2suYmluZCh0aGlzKSk7CisgICAg ICAgIHZhciBmaWxlUGF0aCA9IHRoaXMuX2ZpbGVQYXRoRm9yUGF0aChwYXRoKTsKKyAgICAgICAg dGhpcy5fZmlsZVN5c3RlbS5yZXF1ZXN0RmlsZUNvbnRlbnQoZmlsZVBhdGgsIGNvbnRlbnRDYWxs YmFjay5iaW5kKHRoaXMpKTsKIAogICAgICAgICAvKioKICAgICAgICAgICogQHBhcmFtIHs/c3Ry aW5nfSBjb250ZW50Ci0gICAgICAgICAqIEBwYXJhbSB7Ym9vbGVhbn0gYmFzZTY0RW5jb2RlZAot ICAgICAgICAgKiBAcGFyYW0ge3N0cmluZ30gbWltZVR5cGUKICAgICAgICAgICovCi0gICAgICAg IGZ1bmN0aW9uIGNvbnRlbnRDYWxsYmFjayhjb250ZW50LCBiYXNlNjRFbmNvZGVkLCBtaW1lVHlw ZSkKKyAgICAgICAgZnVuY3Rpb24gY29udGVudENhbGxiYWNrKGNvbnRlbnQpCiAgICAgICAgIHsK ICAgICAgICAgICAgIHZhciByZXN1bHQgPSBbXTsKICAgICAgICAgICAgIGlmIChjb250ZW50ICE9 PSBudWxsKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9K YXZhU2NyaXB0U291cmNlRnJhbWUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0phdmFTY3JpcHRTb3VyY2VGcmFtZS5qcwppbmRleCBhYzJlNDMzYzAxY2UxN2YwNDY5YTA3 ZGJlNWU4NTE3ZDQ5ZGE5MTY5Li4yNWEzMjViYzUxYzk3YjhmYWYzY2Y2NDkyMWViNGU5ZDdhZDEx YjZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0phdmFT Y3JpcHRTb3VyY2VGcmFtZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0phdmFTY3JpcHRTb3VyY2VGcmFtZS5qcwpAQCAtNjgsMTIgKzY4LDEyIEBAIFdlYkluc3Bl Y3Rvci5KYXZhU2NyaXB0U291cmNlRnJhbWUucHJvdG90eXBlID0gewogICAgIC8vIFZpZXcgZXZl bnRzCiAgICAgd2FzU2hvd246IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIFdlYkluc3BlY3Rv ci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUud2FzU2hvd24uY2FsbCh0aGlzKTsKKyAgICAgICAgV2Vi SW5zcGVjdG9yLlVJU291cmNlQ29kZUZyYW1lLnByb3RvdHlwZS53YXNTaG93bi5jYWxsKHRoaXMp OwogICAgIH0sCiAKICAgICB3aWxsSGlkZTogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgV2Vi SW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS53aWxsSGlkZS5jYWxsKHRoaXMpOworICAg ICAgICBXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlRnJhbWUucHJvdG90eXBlLndpbGxIaWRlLmNh bGwodGhpcyk7CiAgICAgICAgIHRoaXMuX3BvcG92ZXJIZWxwZXIuaGlkZVBvcG92ZXIoKTsKICAg ICB9LAogCkBAIC0xMTAsNyArMTEwLDYgQEAgV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2VG cmFtZS5wcm90b3R5cGUgPSB7CiAKICAgICBwb3B1bGF0ZVRleHRBcmVhQ29udGV4dE1lbnU6IGZ1 bmN0aW9uKGNvbnRleHRNZW51LCBsaW5lTnVtYmVyKQogICAgIHsKLSAgICAgICAgV2ViSW5zcGVj dG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5wb3B1bGF0ZVRleHRBcmVhQ29udGV4dE1lbnUuY2Fs bCh0aGlzLCBjb250ZXh0TWVudSwgbGluZU51bWJlcik7CiAgICAgICAgIHZhciBzZWxlY3Rpb24g PSB3aW5kb3cuZ2V0U2VsZWN0aW9uKCk7CiAgICAgICAgIGlmIChzZWxlY3Rpb24udHlwZSA9PT0g IlJhbmdlIiAmJiAhc2VsZWN0aW9uLmlzQ29sbGFwc2VkKSB7CiAgICAgICAgICAgICB2YXIgYWRk VG9XYXRjaExhYmVsID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKFdlYkluc3BlY3Rvci51c2VMb3dl ckNhc2VNZW51VGl0bGVzKCkgPyAiQWRkIHRvIHdhdGNoIiA6ICJBZGQgdG8gV2F0Y2giKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2ltcGxlV29ya3Nw YWNlUHJvdmlkZXIuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NpbXBs ZVdvcmtzcGFjZVByb3ZpZGVyLmpzCmluZGV4IDdmM2RkODYzNzViOGUzNTcwMzAwYmMzM2FmNzQw MTdlZDFlZjYxMjcuLmRiZWE5YmRlMjYwMjgzYzQ3MzU2NTBhZTY5M2EzYWFjZDBjM2YzZjUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2ltcGxlV29ya3Nw YWNlUHJvdmlkZXIuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9T aW1wbGVXb3Jrc3BhY2VQcm92aWRlci5qcwpAQCAtOTksNiArOTksMTYgQEAgV2ViSW5zcGVjdG9y LlNpbXBsZVByb2plY3REZWxlZ2F0ZS5wcm90b3R5cGUgPSB7CiAKICAgICAvKioKICAgICAgKiBA cGFyYW0ge0FycmF5LjxzdHJpbmc+fSBwYXRoCisgICAgICogQHBhcmFtIHtzdHJpbmd9IGN1cnJl bnRDb250ZW50CisgICAgICogQHBhcmFtIHtmdW5jdGlvbig/c3RyaW5nKX0gY2FsbGJhY2sKKyAg ICAgKi8KKyAgICByZXF1ZXN0VXBkYXRlZEZpbGVDb250ZW50OiBmdW5jdGlvbihwYXRoLCBjdXJy ZW50Q29udGVudCwgY2FsbGJhY2spCisgICAgeworICAgICAgICBjYWxsYmFjayhudWxsKTsKKyAg ICB9LAorCisgICAgLyoqCisgICAgICogQHBhcmFtIHtBcnJheS48c3RyaW5nPn0gcGF0aAogICAg ICAqIEBwYXJhbSB7c3RyaW5nfSBuZXdDb250ZW50CiAgICAgICogQHBhcmFtIHtmdW5jdGlvbig/ c3RyaW5nKX0gY2FsbGJhY2sKICAgICAgKi8KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpzCmluZGV4IGRkMDI5MDIxNWQ2YzI0MjZhZWJjZDMy ZDkxNWJhOWJiNGMyZDc1M2IuLmY5NmYyNzczNTI3YjU0ZDdhY2YyZmE5ZDJiN2ZjMTZjZDdlNjNk N2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNl RnJhbWUuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VG cmFtZS5qcwpAQCAtMzA1LDggKzMwNSwxMSBAQCBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJv dG90eXBlID0gewogICAgIHsKICAgICAgICAgdGhpcy5fdGV4dEVkaXRvci5taW1lVHlwZSA9IG1p bWVUeXBlOwogCi0gICAgICAgIHRoaXMuX2xvYWRlZCA9IHRydWU7Ci0gICAgICAgIHRoaXMuX3Rl eHRFZGl0b3Iuc2V0VGV4dChjb250ZW50IHx8ICIiKTsKKyAgICAgICAgaWYgKCF0aGlzLl9sb2Fk ZWQpIHsKKyAgICAgICAgICAgIHRoaXMuX2xvYWRlZCA9IHRydWU7CisgICAgICAgICAgICB0aGlz Ll90ZXh0RWRpdG9yLnNldFRleHQoY29udGVudCB8fCAiIik7CisgICAgICAgIH0gZWxzZQorICAg ICAgICAgICAgdGhpcy5fdGV4dEVkaXRvci5lZGl0UmFuZ2UodGhpcy5fdGV4dEVkaXRvci5yYW5n ZSgpLCBjb250ZW50IHx8ICIiKTsKIAogICAgICAgICB0aGlzLl90ZXh0RWRpdG9yLmJlZ2luVXBk YXRlcygpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1VJU291cmNlQ29kZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVUlT b3VyY2VDb2RlLmpzCmluZGV4IGM3MTRmMTI3YmIxNTA1NGRlZmU5MTA3NTRkNDlhM2QyNGQ3NzFm ZWYuLjRmNzZiYWY4OWJlODExOTgzMjc2ZGM5MDQwMGYwMzliOTFkMTA0MGMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVUlTb3VyY2VDb2RlLmpzCisrKyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVUlTb3VyY2VDb2RlLmpzCkBAIC0y MTQsNiArMjE0LDI2IEBAIFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUucHJvdG90eXBlID0gewog ICAgICAgICAgICAgdGhpcy5fcHJvamVjdC5yZXF1ZXN0RmlsZUNvbnRlbnQodGhpcywgdGhpcy5f ZmlyZUNvbnRlbnRBdmFpbGFibGUuYmluZCh0aGlzKSk7CiAgICAgfSwKIAorICAgIGNoZWNrQ29u dGVudFVwZGF0ZWQ6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHRoaXMuX3Byb2plY3QucmVx dWVzdFVwZGF0ZWRGaWxlQ29udGVudCh0aGlzLCB1cGRhdGVkQ29udGVudExvYWRlZC5iaW5kKHRo aXMpKTsKKworICAgICAgICBmdW5jdGlvbiB1cGRhdGVkQ29udGVudExvYWRlZCh1cGRhdGVkQ29u dGVudCkKKyAgICAgICAgeworICAgICAgICAgICAgaWYgKHR5cGVvZiB1cGRhdGVkQ29udGVudCAh PT0gInN0cmluZyIpCisgICAgICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgICAgICBpZiAo IXRoaXMuaXNEaXJ0eSgpKSB7CisgICAgICAgICAgICAgICAgdGhpcy5hZGRSZXZpc2lvbih1cGRh dGVkQ29udGVudCk7CisgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgfQorCisg ICAgICAgICAgICB2YXIgc2hvdWxkVXBkYXRlID0gd2luZG93LmNvbmZpcm0oV2ViSW5zcGVjdG9y LlVJU3RyaW5nKCJUaGlzIGZpbGUgd2FzIGNoYW5nZWQgZXh0ZXJuYWxseS4gV291bGQgeW91IGxp a2UgdG8gcmVsb2FkIGl0PyIpKTsKKyAgICAgICAgICAgIGlmIChzaG91bGRVcGRhdGUpCisgICAg ICAgICAgICAgICAgdGhpcy5hZGRSZXZpc2lvbih1cGRhdGVkQ29udGVudCk7CisgICAgICAgIH0K KyAgICB9LAorCiAgICAgLyoqCiAgICAgICogQHBhcmFtIHtmdW5jdGlvbig/c3RyaW5nLGJvb2xl YW4sc3RyaW5nKX0gY2FsbGJhY2sKICAgICAgKi8KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvVUlTb3VyY2VDb2RlRnJhbWUuanMgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1VJU291cmNlQ29kZUZyYW1lLmpzCmluZGV4IGUxZDAxYjhm MDE4NDU0YTVmMGZkYjE4YTg5MjRkNmIyYTZlZTc0MDAuLmQ1MjAwMjg4NzQxZWVkZTZkOTczZjBj NzA4MTFlNmUzYWNhYTAzNGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvVUlTb3VyY2VDb2RlRnJhbWUuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9VSVNvdXJjZUNvZGVGcmFtZS5qcwpAQCAtNDEsNiArNDEsMjEgQEAgV2Vi SW5zcGVjdG9yLlVJU291cmNlQ29kZUZyYW1lID0gZnVuY3Rpb24odWlTb3VyY2VDb2RlKQogfQog CiBXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlRnJhbWUucHJvdG90eXBlID0geworICAgIHdhc1No b3duOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUu cHJvdG90eXBlLndhc1Nob3duLmNhbGwodGhpcyk7CisgICAgICAgIHRoaXMuX2JvdW5kV2luZG93 Rm9jdXNlZCA9IHRoaXMuX3dpbmRvd0ZvY3VzZWQuYmluZCh0aGlzKTsKKyAgICAgICAgd2luZG93 LmFkZEV2ZW50TGlzdGVuZXIoImZvY3VzIiwgdGhpcy5fYm91bmRXaW5kb3dGb2N1c2VkLCBmYWxz ZSk7CisgICAgICAgIHRoaXMuX2NoZWNrQ29udGVudFVwZGF0ZWQoKTsKKyAgICB9LAorCisgICAg d2lsbEhpZGU6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIFdlYkluc3BlY3Rvci5Tb3VyY2VG cmFtZS5wcm90b3R5cGUud2lsbEhpZGUuY2FsbCh0aGlzKTsKKyAgICAgICAgd2luZG93LnJlbW92 ZUV2ZW50TGlzdGVuZXIoImZvY3VzIiwgdGhpcy5fYm91bmRXaW5kb3dGb2N1c2VkLCBmYWxzZSk7 CisgICAgICAgIGRlbGV0ZSB0aGlzLl9ib3VuZFdpbmRvd0ZvY3VzZWQ7CisgICAgfSwKKwogICAg IC8qKgogICAgICAqIEByZXR1cm4ge2Jvb2xlYW59CiAgICAgICovCkBAIC00OSw2ICs2NCwxOCBA QCBXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlRnJhbWUucHJvdG90eXBlID0gewogICAgICAgICBy ZXR1cm4gdGhpcy5fdWlTb3VyY2VDb2RlLmlzRWRpdGFibGUoKTsKICAgICB9LAogCisgICAgX3dp bmRvd0ZvY3VzZWQ6IGZ1bmN0aW9uKGV2ZW50KQorICAgIHsKKyAgICAgICAgdGhpcy5fY2hlY2tD b250ZW50VXBkYXRlZCgpOworICAgIH0sCisKKyAgICBfY2hlY2tDb250ZW50VXBkYXRlZDogZnVu Y3Rpb24oKQorICAgIHsKKyAgICAgICAgaWYgKCF0aGlzLmxvYWRlZCB8fCAhdGhpcy5pc1Nob3dp bmcoKSkKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgdGhpcy5fdWlTb3VyY2VDb2RlLmNo ZWNrQ29udGVudFVwZGF0ZWQoKTsKKyAgICB9LAorCiAgICAgLyoqCiAgICAgICogQHBhcmFtIHtz dHJpbmd9IHRleHQKICAgICAgKi8KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvV29ya3NwYWNlLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9Xb3Jrc3BhY2UuanMKaW5kZXggNjUzMmEzY2Q0MmFlZDEyMTI3NjYyY2ZiYzgzY2M3MmVk ZjcxYjRlYS4uMDVkNGNmM2EwNDQxYWI3ZDc5MTA5YmUyMWQwYzcwNTI0ZmU5MzU0YiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Xb3Jrc3BhY2UuanMKKysr IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Xb3Jrc3BhY2UuanMKQEAgLTEw MSw2ICsxMDEsMTMgQEAgV2ViSW5zcGVjdG9yLlByb2plY3REZWxlZ2F0ZS5wcm90b3R5cGUgPSB7 CiAKICAgICAvKioKICAgICAgKiBAcGFyYW0ge0FycmF5LjxzdHJpbmc+fSBwYXRoCisgICAgICog QHBhcmFtIHtzdHJpbmd9IGN1cnJlbnRDb250ZW50CisgICAgICogQHBhcmFtIHtmdW5jdGlvbig/ c3RyaW5nKX0gY2FsbGJhY2sKKyAgICAgKi8KKyAgICByZXF1ZXN0VXBkYXRlZEZpbGVDb250ZW50 OiBmdW5jdGlvbihwYXRoLCBjdXJyZW50Q29udGVudCwgY2FsbGJhY2spIHsgfSwKKworICAgIC8q KgorICAgICAqIEBwYXJhbSB7QXJyYXkuPHN0cmluZz59IHBhdGgKICAgICAgKiBAcGFyYW0ge3N0 cmluZ30gbmV3Q29udGVudAogICAgICAqIEBwYXJhbSB7ZnVuY3Rpb24oP3N0cmluZyl9IGNhbGxi YWNrCiAgICAgICovCkBAIC0yNTYsNiArMjYzLDE1IEBAIFdlYkluc3BlY3Rvci5Qcm9qZWN0LnBy b3RvdHlwZSA9IHsKIAogICAgIC8qKgogICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlVJU291 cmNlQ29kZX0gdWlTb3VyY2VDb2RlCisgICAgICogQHBhcmFtIHtmdW5jdGlvbig/c3RyaW5nKX0g Y2FsbGJhY2sKKyAgICAgKi8KKyAgICByZXF1ZXN0VXBkYXRlZEZpbGVDb250ZW50OiBmdW5jdGlv bih1aVNvdXJjZUNvZGUsIGNhbGxiYWNrKQorICAgIHsKKyAgICAgICAgdGhpcy5fcHJvamVjdERl bGVnYXRlLnJlcXVlc3RVcGRhdGVkRmlsZUNvbnRlbnQodWlTb3VyY2VDb2RlLnBhdGgoKSwgdWlT b3VyY2VDb2RlLndvcmtpbmdDb3B5KCksIGNhbGxiYWNrKTsKKyAgICB9LAorCisgICAgLyoqCisg ICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlfSB1aVNvdXJjZUNvZGUKICAg ICAgKiBAcGFyYW0ge3N0cmluZ30gbmV3Q29udGVudAogICAgICAqIEBwYXJhbSB7ZnVuY3Rpb24o P3N0cmluZyl9IGNhbGxiYWNrCiAgICAgICovCg==