93940 2012-08-14 01:08:28 -0700 Web Inspector: Add delete button to FileSystemView 2012-08-27 23:42:13 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 91831 94071 68203 0 tzik tzik apavlov bweinstein joepeck keishi kinuko loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 694634 0 tzik 2012-08-14 01:08:28 -0700 Adding a status bar button to allow user to delete an entry. 695803 1 158517 tzik 2012-08-15 00:33:06 -0700 Created attachment 158517 Patch 702652 2 160074 tzik 2012-08-22 20:11:13 -0700 Created attachment 160074 Patch 704671 3 160074 vsevik 2012-08-25 02:54:33 -0700 Comment on attachment 160074 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=160074&action=review > Source/WebCore/inspector/front-end/FileSystemModel.js:277 > + if (errorCode === 0) if (!errorCode) > Source/WebCore/inspector/front-end/FileSystemModel.js:289 > + if (this._fileSystemsForOrigin[origin] && New line is not needed here. 704938 4 160625 tzik 2012-08-26 21:24:25 -0700 Created attachment 160625 Patch 705515 5 160625 webkit.review.bot 2012-08-27 12:26:51 -0700 Comment on attachment 160625 Patch Rejecting attachment 160625 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: Kit/chromium/third_party/yasm/source/patched-yasm --revision 134927 --non-interactive --force --accept theirs-conflict --ignore-externals' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' 50>At revision 134927. ________ 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://queues.webkit.org/results/13618303 706108 6 160074 tzik 2012-08-27 23:30:56 -0700 Comment on attachment 160074 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=160074&action=review Thanks! >> Source/WebCore/inspector/front-end/FileSystemModel.js:277 >> + if (errorCode === 0) > > if (!errorCode) Done >> Source/WebCore/inspector/front-end/FileSystemModel.js:289 >> + if (this._fileSystemsForOrigin[origin] && > > New line is not needed here. Done 706114 7 kinuko 2012-08-27 23:42:13 -0700 Committed r126847: <http://trac.webkit.org/changeset/126847> 158517 2012-08-15 00:33:06 -0700 2012-08-22 20:11:10 -0700 Patch bug-93940-20120815163232.patch text/plain 13154 tzik U3VidmVyc2lvbiBSZXZpc2lvbjogMTI1NjMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTEzYjA1NzQ0NzczYWMx MGY5NjY1YWMwNTgxNmI3NWQwZWY1ZThiNS4uODQ0MmNjMDM3MDRlYjk5OGRiMGYzZTA4MmU5MWY0 NzIwNGZjZmQ4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDEyLTA4LTE1ICBUYWlq dSBUc3Vpa2kgIDx0emlrQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBB ZGQgZGVsZXRlIGJ1dHRvbiB0byBGaWxlU3lzdGVtVmlldworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTM5NDAKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRpbmcgc3RhdHVzIGJhciBidXR0b24gdG8gYWxs b3cgdXNlciB0byBkZWxldGUgZW50cmllcyBpbiBGaWxlU3lzdGVtCisgICAgICAgIGZvciBkZWJ1 Z2dpbmcgdXNlLgorCisgICAgICAgIFRlc3Q6IGh0dHAvdGVzdHMvaW5zcGVjdG9yL2ZpbGVzeXN0 ZW0vZGVsZXRlLWVudHJ5Lmh0bWwKKworICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JGaWxl U3lzdGVtQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRmlsZVN5c3RlbUFn ZW50OjpkZWxldGVFbnRyeSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9GaWxlU3lz dGVtTW9kZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbU1vZGVsLnByb3Rv dHlwZS5kZWxldGVFbnRyeS5ob29rRmlsZVN5c3RlbURlbGV0aW9uKTogSG9va3MgZmlsZXN5c3Rl bSBkZWxldGlvbgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1Nb2RlbC5wcm90b3R5 cGUuZGVsZXRlRW50cnkpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1Nb2RlbC5w cm90b3R5cGUuX3JlbW92ZUZpbGVTeXN0ZW0pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZpbGVT eXN0ZW1Nb2RlbC5FbnRyeS5wcm90b3R5cGUuZGVsZXRlRW50cnkpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkZpbGVTeXN0ZW1SZXF1ZXN0TWFuYWdlcik6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu RmlsZVN5c3RlbVJlcXVlc3RNYW5hZ2VyLnByb3RvdHlwZS5kZWxldGVFbnRyeS5yZXF1ZXN0QWNj ZXB0ZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1SZXF1ZXN0TWFuYWdlci5w cm90b3R5cGUuZGVsZXRlRW50cnkpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1S ZXF1ZXN0TWFuYWdlci5wcm90b3R5cGUuX2RlbGV0aW9uQ29tcGxldGVkKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5GaWxlU3lzdGVtRGlzcGF0Y2hlci5wcm90b3R5cGUuZGVsZXRpb25Db21wbGV0 ZWQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRmlsZVN5c3RlbVZpZXcuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbVZpZXcpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkZpbGVTeXN0ZW1WaWV3LnByb3RvdHlwZS5nZXQgc3RhdHVzQmFySXRlbXMpOiBBZGQgZGVs ZXRlIGJ1dHRvbgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1WaWV3LnByb3RvdHlw ZS5fY29uZmlybURlbGV0ZSk6IEV2ZW50IGhhbmRsZXIgZm9yIGRlbGV0ZSBidXR0b24KKyAgICAg ICAgKFdlYkluc3BlY3Rvci5GaWxlU3lzdGVtVmlldy5wcm90b3R5cGUuX2RlbGV0ZSk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbVZpZXcuRW50cnlUcmVlRWxlbWVudC5wcm90b3R5 cGUucmVmcmVzaCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbVZpZXcuRW50cnlU cmVlRWxlbWVudC5wcm90b3R5cGUuZGVsZXRlRW50cnkpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkZpbGVTeXN0ZW1WaWV3LkVudHJ5VHJlZUVsZW1lbnQucHJvdG90eXBlLl9kZWxldGlvbkNvbXBs ZXRlZCk6CisKIDIwMTItMDgtMTMgIFRhaWp1IFRzdWlraSAgPHR6aWtAY2hyb21pdW0ub3JnPgog CiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IENvbXBsZXRpb24gZXZlbnRzIG9mIEluc3BlY3RvckZp bGVTeXN0ZW1BZ2VudCBzaG91bGQgYmUgZmlyZWQgYXN5bmNocm9ub3VzbHkuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRmlsZVN5c3RlbUFnZW50LmNwcCBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQuY3BwCmlu ZGV4IGYzOTUyZmQzMTk4ZTgzMTRhNDVjNjBlYmEzMTA2YjFlMzUzY2EyZWIuLjNiZmU0ZmZhMjFi ZTZjM2EyMmQ3NGVmYjE0MjRmYzc1YjE0MmQ0MDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQuY3BwCkBAIC03ODIsNyArNzgy LDYgQEAgdm9pZCBJbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQ6OmRlbGV0ZUVudHJ5KEVycm9yU3Ry aW5nKiBlcnJvciwgY29uc3QgU3RyaW5nJiB1cmwKICAgICBBU1NFUlQobV9mcm9udGVuZFByb3Zp ZGVyLT5mcm9udGVuZCgpKTsKIAogICAgIEtVUkwgdXJsKFBhcnNlZFVSTFN0cmluZywgdXJsU3Ry aW5nKTsKLQogICAgIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIHNjcmlwdEV4ZWN1dGlvbkNvbnRl eHQgPSBhc3NlcnRTY3JpcHRFeGVjdXRpb25Db250ZXh0Rm9yT3JpZ2luKGVycm9yLCBTZWN1cml0 eU9yaWdpbjo6Y3JlYXRlKHVybCkuZ2V0KCkpOwogICAgIGlmICghc2NyaXB0RXhlY3V0aW9uQ29u dGV4dCkKICAgICAgICAgcmV0dXJuOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9GaWxlU3lzdGVtTW9kZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0ZpbGVTeXN0ZW1Nb2RlbC5qcwppbmRleCAzMGVkZDg0ZThlYWY3NzM5ZGVj OTRkMWRiZjZmZmMxZTE3NmJiODE3Li4zNjk2MDc2MDBjZmE3ZDk4NGM0YmFhYTg4OTBhN2UxNTI5 MThhNGM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0Zp bGVTeXN0ZW1Nb2RlbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0ZpbGVTeXN0ZW1Nb2RlbC5qcwpAQCAtMjU3LDYgKzI1Nyw0MyBAQCBXZWJJbnNwZWN0b3IuRmls ZVN5c3RlbU1vZGVsLnByb3RvdHlwZSA9IHsKICAgICByZXF1ZXN0RmlsZUNvbnRlbnQ6IGZ1bmN0 aW9uKGZpbGUsIHJlYWRBc1RleHQsIHN0YXJ0LCBlbmQsIGNoYXJzZXQsIGNhbGxiYWNrKQogICAg IHsKICAgICAgICAgdGhpcy5fYWdlbnRXcmFwcGVyLnJlcXVlc3RGaWxlQ29udGVudChmaWxlLnVy bCwgcmVhZEFzVGV4dCwgc3RhcnQsIGVuZCwgY2hhcnNldCwgY2FsbGJhY2spOworICAgIH0sCisK KyAgICAvKioKKyAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5GaWxlU3lzdGVtTW9kZWwuRW50 cnl9IGVudHJ5CisgICAgICogQHBhcmFtIHtmdW5jdGlvbihudW1iZXIpPX0gY2FsbGJhY2sKKyAg ICAgKi8KKyAgICBkZWxldGVFbnRyeTogZnVuY3Rpb24oZW50cnksIGNhbGxiYWNrKQorICAgIHsK KyAgICAgICAgdmFyIGZpbGVTeXN0ZW1Nb2RlbCA9IHRoaXM7CisgICAgICAgIGlmIChlbnRyeSA9 PT0gZW50cnkuZmlsZVN5c3RlbS5yb290KQorICAgICAgICAgICAgdGhpcy5fYWdlbnRXcmFwcGVy LmRlbGV0ZUVudHJ5KGVudHJ5LnVybCwgaG9va0ZpbGVTeXN0ZW1EZWxldGlvbik7CisgICAgICAg IGVsc2UKKyAgICAgICAgICAgIHRoaXMuX2FnZW50V3JhcHBlci5kZWxldGVFbnRyeShlbnRyeS51 cmwsIGNhbGxiYWNrKTsKKworICAgICAgICBmdW5jdGlvbiBob29rRmlsZVN5c3RlbURlbGV0aW9u KGVycm9yQ29kZSkKKyAgICAgICAgeworICAgICAgICAgICAgY2FsbGJhY2soZXJyb3JDb2RlKTsK KyAgICAgICAgICAgIGlmIChlcnJvckNvZGUgPT09IDApCisgICAgICAgICAgICAgICAgZmlsZVN5 c3RlbU1vZGVsLl9yZW1vdmVGaWxlU3lzdGVtKGVudHJ5LmZpbGVTeXN0ZW0pOworICAgICAgICB9 CisgICAgfSwKKworICAgIC8qKgorICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLkZpbGVTeXN0 ZW1Nb2RlbC5GaWxlU3lzdGVtfSBmaWxlU3lzdGVtCisgICAgICovCisgICAgX3JlbW92ZUZpbGVT eXN0ZW06IGZ1bmN0aW9uKGZpbGVTeXN0ZW0pCisgICAgeworICAgICAgICB2YXIgb3JpZ2luID0g ZmlsZVN5c3RlbS5vcmlnaW47CisgICAgICAgIHZhciB0eXBlID0gZmlsZVN5c3RlbS50eXBlOwor ICAgICAgICBpZiAodGhpcy5fZmlsZVN5c3RlbXNGb3JPcmlnaW5bb3JpZ2luXSAmJgorICAgICAg ICAgICAgdGhpcy5fZmlsZVN5c3RlbXNGb3JPcmlnaW5bb3JpZ2luXVt0eXBlXSkgeworICAgICAg ICAgICAgZGVsZXRlIHRoaXMuX2ZpbGVTeXN0ZW1zRm9yT3JpZ2luW29yaWdpbl1bdHlwZV07Cisg ICAgICAgICAgICB0aGlzLl9maWxlU3lzdGVtUmVtb3ZlZChmaWxlU3lzdGVtKTsKKworICAgICAg ICAgICAgaWYgKE9iamVjdC5pc0VtcHR5KHRoaXMuX2ZpbGVTeXN0ZW1zRm9yT3JpZ2luW29yaWdp bl0pKQorICAgICAgICAgICAgICAgIGRlbGV0ZSB0aGlzLl9maWxlU3lzdGVtc0Zvck9yaWdpbltv cmlnaW5dOworICAgICAgICB9CiAgICAgfQogfQogCkBAIC0zNjcsNiArNDA0LDE0IEBAIFdlYklu c3BlY3Rvci5GaWxlU3lzdGVtTW9kZWwuRW50cnkucHJvdG90eXBlID0gewogICAgIHJlcXVlc3RN ZXRhZGF0YTogZnVuY3Rpb24oY2FsbGJhY2spCiAgICAgewogICAgICAgICB0aGlzLmZpbGVTeXN0 ZW1Nb2RlbC5yZXF1ZXN0TWV0YWRhdGEodGhpcywgY2FsbGJhY2spOworICAgIH0sCisKKyAgICAv KioKKyAgICAgKiBAcGFyYW0ge2Z1bmN0aW9uKG51bWJlcil9IGNhbGxiYWNrCisgICAgICovCisg ICAgZGVsZXRlRW50cnk6IGZ1bmN0aW9uKGNhbGxiYWNrKQorICAgIHsKKyAgICAgICAgdGhpcy5m aWxlU3lzdGVtTW9kZWwuZGVsZXRlRW50cnkodGhpcywgY2FsbGJhY2spOwogICAgIH0KIH0KIApA QCAtNDU5LDYgKzUwNCw3IEBAIFdlYkluc3BlY3Rvci5GaWxlU3lzdGVtUmVxdWVzdE1hbmFnZXIg PSBmdW5jdGlvbigpCiAgICAgdGhpcy5fcGVuZGluZ0RpcmVjdG9yeUNvbnRlbnRSZXF1ZXN0cyA9 IHt9OwogICAgIHRoaXMuX3BlbmRpbmdNZXRhZGF0YVJlcXVlc3RzID0ge307CiAgICAgdGhpcy5f cGVuZGluZ0ZpbGVDb250ZW50UmVxdWVzdHMgPSB7fTsKKyAgICB0aGlzLl9wZW5kaW5nRGVsZXRl RW50cnlSZXF1ZXN0cyA9IHt9OwogCiAgICAgSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckZpbGVT eXN0ZW1EaXNwYXRjaGVyKG5ldyBXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbURpc3BhdGNoZXIodGhp cykpOwogICAgIEZpbGVTeXN0ZW1BZ2VudC5lbmFibGUoKTsKQEAgLTU5Miw2ICs2MzgsMzcgQEAg V2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1SZXF1ZXN0TWFuYWdlci5wcm90b3R5cGUgPSB7CiAgICAg ICAgICAgICByZXR1cm47CiAgICAgICAgIGRlbGV0ZSB0aGlzLl9wZW5kaW5nRmlsZUNvbnRlbnRS ZXF1ZXN0c1tyZXF1ZXN0SWRdOwogICAgICAgICBjYWxsYmFjayhlcnJvckNvZGUsIGNvbnRlbnQs IGNoYXJzZXQpOworICAgIH0sCisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge3N0cmluZ30gdXJs CisgICAgICogQHBhcmFtIHtmdW5jdGlvbihudW1iZXIpPX0gY2FsbGJhY2sKKyAgICAgKi8KKyAg ICBkZWxldGVFbnRyeTogZnVuY3Rpb24odXJsLCBjYWxsYmFjaykKKyAgICB7CisgICAgICAgIHZh ciBzdG9yZSA9IHRoaXMuX3BlbmRpbmdEZWxldGVFbnRyeVJlcXVlc3RzOworICAgICAgICBGaWxl U3lzdGVtQWdlbnQuZGVsZXRlRW50cnkodXJsLCByZXF1ZXN0QWNjZXB0ZWQpOworCisgICAgICAg IGZ1bmN0aW9uIHJlcXVlc3RBY2NlcHRlZChlcnJvciwgcmVxdWVzdElkKQorICAgICAgICB7Cisg ICAgICAgICAgICBpZiAoZXJyb3IpCisgICAgICAgICAgICAgICAgY2FsbGJhY2soRmlsZUVycm9y LlNFQ1VSSVRZX0VSUik7CisgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgc3RvcmVb cmVxdWVzdElkXSA9IGNhbGxiYWNrIHx8IGZ1bmN0aW9uKCkge307CisgICAgICAgIH0KKyAgICB9 LAorCisgICAgLyoqCisgICAgICogQHBhcmFtIHtudW1iZXJ9IHJlcXVlc3RJZAorICAgICAqIEBw YXJhbSB7bnVtYmVyfSBlcnJvckNvZGUKKyAgICAgKi8KKyAgICBfZGVsZXRpb25Db21wbGV0ZWQ6 IGZ1bmN0aW9uKHJlcXVlc3RJZCwgZXJyb3JDb2RlKQorICAgIHsKKyAgICAgICAgdmFyIGNhbGxi YWNrID0gLyoqIEB0eXBlIHtmdW5jdGlvbihudW1iZXIpfSAqLyB0aGlzLl9wZW5kaW5nRGVsZXRl RW50cnlSZXF1ZXN0c1tyZXF1ZXN0SWRdOworICAgICAgICBpZiAoIWNhbGxiYWNrKQorICAgICAg ICAgICAgcmV0dXJuOworICAgICAgICBkZWxldGUgdGhpcy5fcGVuZGluZ0RlbGV0ZUVudHJ5UmVx dWVzdHNbcmVxdWVzdElkXTsKKyAgICAgICAgY2FsbGJhY2soZXJyb3JDb2RlKTsKICAgICB9CiB9 CiAKQEAgLTY1Myw2ICs3MzAsNiBAQCBXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbURpc3BhdGNoZXIu cHJvdG90eXBlID0gewogICAgICAqLwogICAgIGRlbGV0aW9uQ29tcGxldGVkOiBmdW5jdGlvbihy ZXF1ZXN0SWQsIGVycm9yQ29kZSkKICAgICB7Ci0gICAgICAgIGNvbnNvbGUuZXJyb3IoIk5vdCBp bXBsZW1lbnRlZCIpOworICAgICAgICB0aGlzLl9hZ2VudFdyYXBwZXIuX2RlbGV0aW9uQ29tcGxl dGVkKHJlcXVlc3RJZCwgZXJyb3JDb2RlKTsKICAgICB9CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0ZpbGVTeXN0ZW1WaWV3LmpzIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9GaWxlU3lzdGVtVmlldy5qcwppbmRleCA5Yjg5YmVh YjEzYmMzNjRmM2JmMzI0YjI5MDBiYjNmMmI0YjliMjFjLi42MGI5ZjQyNTliMGIzZGI0ZTczODg3 Y2NlYmUyYTEwNzA3MjkwYmU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0ZpbGVTeXN0ZW1WaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvRmlsZVN5c3RlbVZpZXcuanMKQEAgLTUzLDYgKzUzLDEwIEBAIFdlYkluc3Bl Y3Rvci5GaWxlU3lzdGVtVmlldyA9IGZ1bmN0aW9uKGZpbGVTeXN0ZW0pCiAgICAgdGhpcy5fcmVm cmVzaEJ1dHRvbiA9IG5ldyBXZWJJbnNwZWN0b3IuU3RhdHVzQmFyQnV0dG9uKFdlYkluc3BlY3Rv ci5VSVN0cmluZygiUmVmcmVzaCIpLCAicmVmcmVzaC1zdG9yYWdlLXN0YXR1cy1iYXItaXRlbSIp OwogICAgIHRoaXMuX3JlZnJlc2hCdXR0b24udmlzaWJsZSA9IHRydWU7CiAgICAgdGhpcy5fcmVm cmVzaEJ1dHRvbi5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuX3JlZnJlc2gsIHRoaXMp OworCisgICAgdGhpcy5fZGVsZXRlQnV0dG9uID0gbmV3IFdlYkluc3BlY3Rvci5TdGF0dXNCYXJC dXR0b24oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJEZWxldGUiKSwgImRlbGV0ZS1zdG9yYWdlLXN0 YXR1cy1iYXItaXRlbSIpOworICAgIHRoaXMuX2RlbGV0ZUJ1dHRvbi52aXNpYmxlID0gdHJ1ZTsK KyAgICB0aGlzLl9kZWxldGVCdXR0b24uYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0aGlzLl9j b25maXJtRGVsZXRlLCB0aGlzKTsKIH0KIAogV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1WaWV3LnBy b3RvdHlwZSA9IHsKQEAgLTYxLDcgKzY1LDcgQEAgV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1WaWV3 LnByb3RvdHlwZSA9IHsKICAgICAgKi8KICAgICBnZXQgc3RhdHVzQmFySXRlbXMoKQogICAgIHsK LSAgICAgICAgcmV0dXJuIFt0aGlzLl9yZWZyZXNoQnV0dG9uLmVsZW1lbnRdOworICAgICAgICBy ZXR1cm4gW3RoaXMuX3JlZnJlc2hCdXR0b24uZWxlbWVudCwgdGhpcy5fZGVsZXRlQnV0dG9uLmVs ZW1lbnRdOwogICAgIH0sCiAKICAgICAvKioKQEAgLTg4LDYgKzkyLDE3IEBAIFdlYkluc3BlY3Rv ci5GaWxlU3lzdGVtVmlldy5wcm90b3R5cGUgPSB7CiAgICAgX3JlZnJlc2g6IGZ1bmN0aW9uKCkK ICAgICB7CiAgICAgICAgIHRoaXMuX2RpcmVjdG9yeVRyZWUuY2hpbGRyZW5bMF0ucmVmcmVzaCgp OworICAgIH0sCisKKyAgICBfY29uZmlybURlbGV0ZTogZnVuY3Rpb24oKQorICAgIHsKKyAgICAg ICAgaWYgKGNvbmZpcm0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJBcmUgeW91IHN1cmUgeW91IHdh bnQgdG8gZGVsZXRlIHRoZSBzZWxlY3RlZCBlbnRyeT8iKSkpCisgICAgICAgICAgICB0aGlzLl9k ZWxldGUoKTsKKyAgICB9LAorCisgICAgX2RlbGV0ZTogZnVuY3Rpb24oKQorICAgIHsKKyAgICAg ICAgdGhpcy5fZGlyZWN0b3J5VHJlZS5zZWxlY3RlZFRyZWVFbGVtZW50LmRlbGV0ZUVudHJ5KCk7 CiAgICAgfQogfQogCkBAIC0yMDEsNiArMjE2LDE3IEBAIFdlYkluc3BlY3Rvci5GaWxlU3lzdGVt Vmlldy5FbnRyeVRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIH0KICAgICAg ICAgfSBlbHNlCiAgICAgICAgICAgICB0aGlzLl9lbnRyeS5yZXF1ZXN0RGlyZWN0b3J5Q29udGVu dCh0aGlzLl9kaXJlY3RvcnlDb250ZW50UmVjZWl2ZWQuYmluZCh0aGlzKSk7CisgICAgfSwKKwor ICAgIGRlbGV0ZUVudHJ5OiBmdW5jdGlvbigpCisgICAgeworICAgICAgICB0aGlzLl9lbnRyeS5k ZWxldGVFbnRyeSh0aGlzLl9kZWxldGlvbkNvbXBsZXRlZC5iaW5kKHRoaXMpKTsKKyAgICB9LAor CisgICAgX2RlbGV0aW9uQ29tcGxldGVkOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICBpZiAo dGhpcy5fZW50cnkgIT0gdGhpcy5fZW50cnkuZmlsZVN5c3RlbS5yb290KQorICAgICAgICAgICAg dGhpcy5wYXJlbnQucmVmcmVzaCgpOwogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGViMzRjZDM4YTA1MTk0 M2I2OTg3YjRlYzJmYTBkYzVmYTA5OGYwMWMuLmJjNzExNTYxOGNhZTQ2NTMxMTg4MDYzYjNjMmNh ZWNmMGZmYjgyMDYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMi0wOC0xNSAgVGFpanUgVHN1 aWtpICA8dHppa0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQWRkIGRl bGV0ZSBidXR0b24gdG8gRmlsZVN5c3RlbVZpZXcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTkzOTQwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgQWRkaW5nIHN0YXR1cyBiYXIgYnV0dG9uIHRvIGFsbG93IHVz ZXIgdG8gZGVsZXRlIGVudHJpZXMgaW4gRmlsZVN5c3RlbQorICAgICAgICBmb3IgZGVidWdnaW5n IHVzZS4KKworICAgICAgICAqIGh0dHAvdGVzdHMvaW5zcGVjdG9yL2ZpbGVzeXN0ZW0vZGVsZXRl LWVudHJ5LWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogaHR0cC90ZXN0cy9pbnNwZWN0 b3IvZmlsZXN5c3RlbS9kZWxldGUtZW50cnkuaHRtbDogQWRkZWQuCisKIDIwMTItMDgtMTMgIFRh aWp1IFRzdWlraSAgPHR6aWtAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6 IENvbXBsZXRpb24gZXZlbnRzIG9mIEluc3BlY3RvckZpbGVTeXN0ZW1BZ2VudCBzaG91bGQgYmUg ZmlyZWQgYXN5bmNocm9ub3VzbHkuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3Rz L2luc3BlY3Rvci9maWxlc3lzdGVtL2RlbGV0ZS1lbnRyeS1leHBlY3RlZC50eHQgYi9MYXlvdXRU ZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9maWxlc3lzdGVtL2RlbGV0ZS1lbnRyeS1leHBlY3Rl ZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMC4uMzY1MzY3ZDYxZTVhYjI0NTBkNWI1N2EwYTU4YjZmN2QwMTk0OWQ3 ZgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2Zp bGVzeXN0ZW0vZGVsZXRlLWVudHJ5LWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDExIEBACitUZXN0 cyBkZWxldGVFbnRyeSBjb21tYW5kLgorCitlcnJvckNvZGU6IDIKK2Vycm9yQ29kZTogOAorZXJy b3JDb2RlOiAwCitlcnJvckNvZGU6IDAKK2Vycm9yQ29kZTogMAorZXJyb3JDb2RlOiAxCitiYWNr ZW5kUm9vdEVudHJ5OiAobnVsbCkKKworCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rl c3RzL2luc3BlY3Rvci9maWxlc3lzdGVtL2RlbGV0ZS1lbnRyeS5odG1sIGIvTGF5b3V0VGVzdHMv aHR0cC90ZXN0cy9pbnNwZWN0b3IvZmlsZXN5c3RlbS9kZWxldGUtZW50cnkuaHRtbApuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwLi5mNDNlMWI0YTRkMThhOWU1NTRiYTI2MDI1NjYyYWNhYWZkZjAzZjBmCi0tLSAvZGV2L251 bGwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvZmlsZXN5c3RlbS9kZWxl dGUtZW50cnkuaHRtbApAQCAtMCwwICsxLDgzIEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgor PGhlYWQ+Cis8bWV0YSBjaGFyc2V0PSJVVEYtOCI+Cis8c2NyaXB0IHNyYz0iLi4vaW5zcGVjdG9y LXRlc3QuanMiPjwvc2NyaXB0PgorPHNjcmlwdCBzcmM9ImZpbGVzeXN0ZW0tdGVzdC5qcyI+PC9z Y3JpcHQ+Cis8c2NyaXB0PgorZG9jdW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiRE9NQ29udGVudExv YWRlZCIsIHJ1blRlc3QpOworZnVuY3Rpb24gdGVzdCgpCit7CisgICAgdmFyIGZpbGVTeXN0ZW1S ZXF1ZXN0TWFuYWdlciA9IG5ldyBXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbVJlcXVlc3RNYW5hZ2Vy KCk7CisKKyAgICB2YXIgdGVzdFN0ZXAgPSBbCisgICAgICAgIGZ1bmN0aW9uKCkKKyAgICAgICAg eworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5jcmVhdGVGaWxlKCIvaG9nZSIsIHRlc3RTdGVw LnNoaWZ0KCkpOworICAgICAgICB9LAorCisgICAgICAgIGZ1bmN0aW9uKCkKKyAgICAgICAgewor ICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5jcmVhdGVEaXJlY3RvcnkoIi9mdWdhIiwgdGVzdFN0 ZXAuc2hpZnQoKSk7CisgICAgICAgIH0sCisKKyAgICAgICAgZnVuY3Rpb24oKQorICAgICAgICB7 CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmNyZWF0ZUZpbGUoIi9mdWdhL3BpeW8iLCB0ZXN0 U3RlcC5zaGlmdCgpKTsKKyAgICAgICAgfSwKKworICAgICAgICBmdW5jdGlvbigpCisgICAgICAg IHsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuY3JlYXRlRGlyZWN0b3J5KCIvZm9vIiwgdGVz dFN0ZXAuc2hpZnQoKSk7CisgICAgICAgIH0sCisKKyAgICAgICAgZnVuY3Rpb24oKQorICAgICAg ICB7CisgICAgICAgICAgICBmaWxlU3lzdGVtUmVxdWVzdE1hbmFnZXIuZGVsZXRlRW50cnkoIklu dmFsaWRVUkwiLCB0ZXN0U3RlcC5zaGlmdCgpKTsKKyAgICAgICAgfSwKKworICAgICAgICBmdW5j dGlvbihlcnJvckNvZGUpCisgICAgICAgIHsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYWRk UmVzdWx0KCJlcnJvckNvZGU6ICIgKyBlcnJvckNvZGUpOworICAgICAgICAgICAgZmlsZVN5c3Rl bVJlcXVlc3RNYW5hZ2VyLmRlbGV0ZUVudHJ5KCJmaWxlc3lzdGVtOmh0dHA6Ly8xMjcuMC4wLjE6 ODAwMC9JbnZhbGlkVHlwZS9mdWdhIiwgdGVzdFN0ZXAuc2hpZnQoKSk7CisgICAgICAgIH0sCisK KyAgICAgICAgZnVuY3Rpb24oZXJyb3JDb2RlKQorICAgICAgICB7CisgICAgICAgICAgICBJbnNw ZWN0b3JUZXN0LmFkZFJlc3VsdCgiZXJyb3JDb2RlOiAiICsgZXJyb3JDb2RlKTsKKyAgICAgICAg ICAgIGZpbGVTeXN0ZW1SZXF1ZXN0TWFuYWdlci5kZWxldGVFbnRyeSgiZmlsZXN5c3RlbTpodHRw Oi8vMTI3LjAuMC4xOjgwMDAvdGVtcG9yYXJ5L2hvZ2UiLCB0ZXN0U3RlcC5zaGlmdCgpKTsKKyAg ICAgICAgfSwKKworICAgICAgICBmdW5jdGlvbihlcnJvckNvZGUpCisgICAgICAgIHsKKyAgICAg ICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KCJlcnJvckNvZGU6ICIgKyBlcnJvckNvZGUp OworICAgICAgICAgICAgZmlsZVN5c3RlbVJlcXVlc3RNYW5hZ2VyLmRlbGV0ZUVudHJ5KCJmaWxl c3lzdGVtOmh0dHA6Ly8xMjcuMC4wLjE6ODAwMC90ZW1wb3JhcnkvZnVnYSIsIHRlc3RTdGVwLnNo aWZ0KCkpOworICAgICAgICB9LAorCisgICAgICAgIGZ1bmN0aW9uKGVycm9yQ29kZSkKKyAgICAg ICAgeworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoImVycm9yQ29kZTogIiAr IGVycm9yQ29kZSk7CisgICAgICAgICAgICBmaWxlU3lzdGVtUmVxdWVzdE1hbmFnZXIuZGVsZXRl RW50cnkoImZpbGVzeXN0ZW06aHR0cDovLzEyNy4wLjAuMTo4MDAwL3RlbXBvcmFyeS8iLCB0ZXN0 U3RlcC5zaGlmdCgpKTsKKyAgICAgICAgfSwKKworICAgICAgICBmdW5jdGlvbihlcnJvckNvZGUp CisgICAgICAgIHsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KCJlcnJvckNv ZGU6ICIgKyBlcnJvckNvZGUpOworICAgICAgICAgICAgZmlsZVN5c3RlbVJlcXVlc3RNYW5hZ2Vy LnJlcXVlc3RGaWxlU3lzdGVtUm9vdCgiaHR0cDovLzEyNy4wLjAuMTo4MDAwIiwgInRlbXBvcmFy eSIsIHRlc3RTdGVwLnNoaWZ0KCkpOworICAgICAgICB9LAorCisgICAgICAgIGZ1bmN0aW9uKGVy cm9yQ29kZSwgYmFja2VuZFJvb3RFbnRyeSkKKyAgICAgICAgeworICAgICAgICAgICAgSW5zcGVj dG9yVGVzdC5kdW1wRmlsZVN5c3RlbVJvb3RSZXF1ZXN0UmVzdWx0KGVycm9yQ29kZSwgYmFja2Vu ZFJvb3RFbnRyeSk7CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmNvbXBsZXRlVGVzdCgpOwor ICAgICAgICB9CisgICAgXTsKKworICAgIEluc3BlY3RvclRlc3QuY2xlYXJGaWxlU3lzdGVtKHRl c3RTdGVwLnNoaWZ0KCkpOworfQorPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keT4KKzxwPlRlc3Rz IGRlbGV0ZUVudHJ5IGNvbW1hbmQuPC9wPgorPC9ib2R5PgorPC9odG1sPgo= 160074 2012-08-22 20:11:13 -0700 2012-08-27 23:30:56 -0700 Patch bug-93940-20120823121110.patch text/plain 12254 tzik U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2MzgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2UxYjk0MmEwMWU3MDg3 ZjNkMGMwMDA0YWNjNjI2MzY4ZWU4NGY5Mi4uZGZlODNjYzNhY2I5MzQ3NTk3ODQ3Y2I5MWJiZGY1 ZDczNDg3ZWQ3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDEyLTA4LTIyICBUYWlq dSBUc3Vpa2kgIDx0emlrQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBB ZGQgZGVsZXRlIGJ1dHRvbiB0byBGaWxlU3lzdGVtVmlldworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTM5NDAKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRpbmcgc3RhdHVzIGJhciBidXR0b24gdG8gYWxs b3cgdXNlciB0byBkZWxldGUgZW50cmllcyBpbiBGaWxlU3lzdGVtCisgICAgICAgIGZvciBkZWJ1 Z2dpbmcgdXNlLgorCisgICAgICAgIFRlc3Q6IGh0dHAvdGVzdHMvaW5zcGVjdG9yL2ZpbGVzeXN0 ZW0vZGVsZXRlLWVudHJ5Lmh0bWwKKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRmls ZVN5c3RlbU1vZGVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1Nb2RlbC5w cm90b3R5cGUucmVxdWVzdEZpbGVDb250ZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5GaWxl U3lzdGVtTW9kZWwucHJvdG90eXBlLmRlbGV0ZUVudHJ5Lmhvb2tGaWxlU3lzdGVtRGVsZXRpb24p OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1Nb2RlbC5wcm90b3R5cGUuZGVsZXRl RW50cnkpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1Nb2RlbC5wcm90b3R5cGUu X3JlbW92ZUZpbGVTeXN0ZW0pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1Nb2Rl bC5FbnRyeS5wcm90b3R5cGUuZGVsZXRlRW50cnkpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZp bGVTeXN0ZW1SZXF1ZXN0TWFuYWdlcik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRmlsZVN5c3Rl bVJlcXVlc3RNYW5hZ2VyLnByb3RvdHlwZS5kZWxldGVFbnRyeS5yZXF1ZXN0QWNjZXB0ZWQpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1SZXF1ZXN0TWFuYWdlci5wcm90b3R5cGUu ZGVsZXRlRW50cnkpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1SZXF1ZXN0TWFu YWdlci5wcm90b3R5cGUuX2RlbGV0aW9uQ29tcGxldGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5GaWxlU3lzdGVtRGlzcGF0Y2hlci5wcm90b3R5cGUuZGVsZXRpb25Db21wbGV0ZWQpOgorICAg ICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRmlsZVN5c3RlbVZpZXcuanM6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuRmlsZVN5c3RlbVZpZXcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZpbGVT eXN0ZW1WaWV3LnByb3RvdHlwZS5nZXQgc3RhdHVzQmFySXRlbXMpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkZpbGVTeXN0ZW1WaWV3LnByb3RvdHlwZS5fcmVmcmVzaCk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuRmlsZVN5c3RlbVZpZXcucHJvdG90eXBlLl9jb25maXJtRGVsZXRlKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5GaWxlU3lzdGVtVmlldy5wcm90b3R5cGUuX2RlbGV0ZSk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbVZpZXcuRW50cnlUcmVlRWxlbWVudC5wcm90b3R5 cGUuZGVsZXRlRW50cnkpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1WaWV3LkVu dHJ5VHJlZUVsZW1lbnQucHJvdG90eXBlLl9kZWxldGlvbkNvbXBsZXRlZCk6CisKIDIwMTItMDgt MjIgIEphbWVzIFJvYmluc29uICA8amFtZXNyQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbY2hy b21pdW1dIENoYW5nZSBXZWJMYXllciBmcm9tIGEgY29uY3JldGUgdHlwZSB0byBhIHB1cmUgdmly dHVhbCBpbnRlcmZhY2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvRmlsZVN5c3RlbU1vZGVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9GaWxlU3lzdGVtTW9kZWwuanMKaW5kZXggMzBlZGQ4NGU4ZWFmNzczOWRlYzk0ZDFkYmY2 ZmZjMWUxNzZiYjgxNy4uMzY5NjA3NjAwY2ZhN2Q5ODRjNGJhYWE4ODkwYTdlMTUyOTE4YTRjOCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9GaWxlU3lzdGVt TW9kZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9GaWxlU3lz dGVtTW9kZWwuanMKQEAgLTI1Nyw2ICsyNTcsNDMgQEAgV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1N b2RlbC5wcm90b3R5cGUgPSB7CiAgICAgcmVxdWVzdEZpbGVDb250ZW50OiBmdW5jdGlvbihmaWxl LCByZWFkQXNUZXh0LCBzdGFydCwgZW5kLCBjaGFyc2V0LCBjYWxsYmFjaykKICAgICB7CiAgICAg ICAgIHRoaXMuX2FnZW50V3JhcHBlci5yZXF1ZXN0RmlsZUNvbnRlbnQoZmlsZS51cmwsIHJlYWRB c1RleHQsIHN0YXJ0LCBlbmQsIGNoYXJzZXQsIGNhbGxiYWNrKTsKKyAgICB9LAorCisgICAgLyoq CisgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbU1vZGVsLkVudHJ5fSBlbnRy eQorICAgICAqIEBwYXJhbSB7ZnVuY3Rpb24obnVtYmVyKT19IGNhbGxiYWNrCisgICAgICovCisg ICAgZGVsZXRlRW50cnk6IGZ1bmN0aW9uKGVudHJ5LCBjYWxsYmFjaykKKyAgICB7CisgICAgICAg IHZhciBmaWxlU3lzdGVtTW9kZWwgPSB0aGlzOworICAgICAgICBpZiAoZW50cnkgPT09IGVudHJ5 LmZpbGVTeXN0ZW0ucm9vdCkKKyAgICAgICAgICAgIHRoaXMuX2FnZW50V3JhcHBlci5kZWxldGVF bnRyeShlbnRyeS51cmwsIGhvb2tGaWxlU3lzdGVtRGVsZXRpb24pOworICAgICAgICBlbHNlCisg ICAgICAgICAgICB0aGlzLl9hZ2VudFdyYXBwZXIuZGVsZXRlRW50cnkoZW50cnkudXJsLCBjYWxs YmFjayk7CisKKyAgICAgICAgZnVuY3Rpb24gaG9va0ZpbGVTeXN0ZW1EZWxldGlvbihlcnJvckNv ZGUpCisgICAgICAgIHsKKyAgICAgICAgICAgIGNhbGxiYWNrKGVycm9yQ29kZSk7CisgICAgICAg ICAgICBpZiAoZXJyb3JDb2RlID09PSAwKQorICAgICAgICAgICAgICAgIGZpbGVTeXN0ZW1Nb2Rl bC5fcmVtb3ZlRmlsZVN5c3RlbShlbnRyeS5maWxlU3lzdGVtKTsKKyAgICAgICAgfQorICAgIH0s CisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5GaWxlU3lzdGVtTW9kZWwu RmlsZVN5c3RlbX0gZmlsZVN5c3RlbQorICAgICAqLworICAgIF9yZW1vdmVGaWxlU3lzdGVtOiBm dW5jdGlvbihmaWxlU3lzdGVtKQorICAgIHsKKyAgICAgICAgdmFyIG9yaWdpbiA9IGZpbGVTeXN0 ZW0ub3JpZ2luOworICAgICAgICB2YXIgdHlwZSA9IGZpbGVTeXN0ZW0udHlwZTsKKyAgICAgICAg aWYgKHRoaXMuX2ZpbGVTeXN0ZW1zRm9yT3JpZ2luW29yaWdpbl0gJiYKKyAgICAgICAgICAgIHRo aXMuX2ZpbGVTeXN0ZW1zRm9yT3JpZ2luW29yaWdpbl1bdHlwZV0pIHsKKyAgICAgICAgICAgIGRl bGV0ZSB0aGlzLl9maWxlU3lzdGVtc0Zvck9yaWdpbltvcmlnaW5dW3R5cGVdOworICAgICAgICAg ICAgdGhpcy5fZmlsZVN5c3RlbVJlbW92ZWQoZmlsZVN5c3RlbSk7CisKKyAgICAgICAgICAgIGlm IChPYmplY3QuaXNFbXB0eSh0aGlzLl9maWxlU3lzdGVtc0Zvck9yaWdpbltvcmlnaW5dKSkKKyAg ICAgICAgICAgICAgICBkZWxldGUgdGhpcy5fZmlsZVN5c3RlbXNGb3JPcmlnaW5bb3JpZ2luXTsK KyAgICAgICAgfQogICAgIH0KIH0KIApAQCAtMzY3LDYgKzQwNCwxNCBAQCBXZWJJbnNwZWN0b3Iu RmlsZVN5c3RlbU1vZGVsLkVudHJ5LnByb3RvdHlwZSA9IHsKICAgICByZXF1ZXN0TWV0YWRhdGE6 IGZ1bmN0aW9uKGNhbGxiYWNrKQogICAgIHsKICAgICAgICAgdGhpcy5maWxlU3lzdGVtTW9kZWwu cmVxdWVzdE1ldGFkYXRhKHRoaXMsIGNhbGxiYWNrKTsKKyAgICB9LAorCisgICAgLyoqCisgICAg ICogQHBhcmFtIHtmdW5jdGlvbihudW1iZXIpfSBjYWxsYmFjaworICAgICAqLworICAgIGRlbGV0 ZUVudHJ5OiBmdW5jdGlvbihjYWxsYmFjaykKKyAgICB7CisgICAgICAgIHRoaXMuZmlsZVN5c3Rl bU1vZGVsLmRlbGV0ZUVudHJ5KHRoaXMsIGNhbGxiYWNrKTsKICAgICB9CiB9CiAKQEAgLTQ1OSw2 ICs1MDQsNyBAQCBXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbVJlcXVlc3RNYW5hZ2VyID0gZnVuY3Rp b24oKQogICAgIHRoaXMuX3BlbmRpbmdEaXJlY3RvcnlDb250ZW50UmVxdWVzdHMgPSB7fTsKICAg ICB0aGlzLl9wZW5kaW5nTWV0YWRhdGFSZXF1ZXN0cyA9IHt9OwogICAgIHRoaXMuX3BlbmRpbmdG aWxlQ29udGVudFJlcXVlc3RzID0ge307CisgICAgdGhpcy5fcGVuZGluZ0RlbGV0ZUVudHJ5UmVx dWVzdHMgPSB7fTsKIAogICAgIEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJGaWxlU3lzdGVtRGlz cGF0Y2hlcihuZXcgV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1EaXNwYXRjaGVyKHRoaXMpKTsKICAg ICBGaWxlU3lzdGVtQWdlbnQuZW5hYmxlKCk7CkBAIC01OTIsNiArNjM4LDM3IEBAIFdlYkluc3Bl Y3Rvci5GaWxlU3lzdGVtUmVxdWVzdE1hbmFnZXIucHJvdG90eXBlID0gewogICAgICAgICAgICAg cmV0dXJuOwogICAgICAgICBkZWxldGUgdGhpcy5fcGVuZGluZ0ZpbGVDb250ZW50UmVxdWVzdHNb cmVxdWVzdElkXTsKICAgICAgICAgY2FsbGJhY2soZXJyb3JDb2RlLCBjb250ZW50LCBjaGFyc2V0 KTsKKyAgICB9LAorCisgICAgLyoqCisgICAgICogQHBhcmFtIHtzdHJpbmd9IHVybAorICAgICAq IEBwYXJhbSB7ZnVuY3Rpb24obnVtYmVyKT19IGNhbGxiYWNrCisgICAgICovCisgICAgZGVsZXRl RW50cnk6IGZ1bmN0aW9uKHVybCwgY2FsbGJhY2spCisgICAgeworICAgICAgICB2YXIgc3RvcmUg PSB0aGlzLl9wZW5kaW5nRGVsZXRlRW50cnlSZXF1ZXN0czsKKyAgICAgICAgRmlsZVN5c3RlbUFn ZW50LmRlbGV0ZUVudHJ5KHVybCwgcmVxdWVzdEFjY2VwdGVkKTsKKworICAgICAgICBmdW5jdGlv biByZXF1ZXN0QWNjZXB0ZWQoZXJyb3IsIHJlcXVlc3RJZCkKKyAgICAgICAgeworICAgICAgICAg ICAgaWYgKGVycm9yKQorICAgICAgICAgICAgICAgIGNhbGxiYWNrKEZpbGVFcnJvci5TRUNVUklU WV9FUlIpOworICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgIHN0b3JlW3JlcXVlc3RJ ZF0gPSBjYWxsYmFjayB8fCBmdW5jdGlvbigpIHt9OworICAgICAgICB9CisgICAgfSwKKworICAg IC8qKgorICAgICAqIEBwYXJhbSB7bnVtYmVyfSByZXF1ZXN0SWQKKyAgICAgKiBAcGFyYW0ge251 bWJlcn0gZXJyb3JDb2RlCisgICAgICovCisgICAgX2RlbGV0aW9uQ29tcGxldGVkOiBmdW5jdGlv bihyZXF1ZXN0SWQsIGVycm9yQ29kZSkKKyAgICB7CisgICAgICAgIHZhciBjYWxsYmFjayA9IC8q KiBAdHlwZSB7ZnVuY3Rpb24obnVtYmVyKX0gKi8gdGhpcy5fcGVuZGluZ0RlbGV0ZUVudHJ5UmVx dWVzdHNbcmVxdWVzdElkXTsKKyAgICAgICAgaWYgKCFjYWxsYmFjaykKKyAgICAgICAgICAgIHJl dHVybjsKKyAgICAgICAgZGVsZXRlIHRoaXMuX3BlbmRpbmdEZWxldGVFbnRyeVJlcXVlc3RzW3Jl cXVlc3RJZF07CisgICAgICAgIGNhbGxiYWNrKGVycm9yQ29kZSk7CiAgICAgfQogfQogCkBAIC02 NTMsNiArNzMwLDYgQEAgV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1EaXNwYXRjaGVyLnByb3RvdHlw ZSA9IHsKICAgICAgKi8KICAgICBkZWxldGlvbkNvbXBsZXRlZDogZnVuY3Rpb24ocmVxdWVzdElk LCBlcnJvckNvZGUpCiAgICAgewotICAgICAgICBjb25zb2xlLmVycm9yKCJOb3QgaW1wbGVtZW50 ZWQiKTsKKyAgICAgICAgdGhpcy5fYWdlbnRXcmFwcGVyLl9kZWxldGlvbkNvbXBsZXRlZChyZXF1 ZXN0SWQsIGVycm9yQ29kZSk7CiAgICAgfQogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9GaWxlU3lzdGVtVmlldy5qcyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvRmlsZVN5c3RlbVZpZXcuanMKaW5kZXggOWI4OWJlYWIxM2JjMzY0 ZjNiZjMyNGIyOTAwYmIzZjJiNGI5YjIxYy4uNjBiOWY0MjU5YjBiM2RiNGU3Mzg4N2NjZWJlMmEx MDcwNzI5MGJlNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9GaWxlU3lzdGVtVmlldy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0ZpbGVTeXN0ZW1WaWV3LmpzCkBAIC01Myw2ICs1MywxMCBAQCBXZWJJbnNwZWN0b3IuRmls ZVN5c3RlbVZpZXcgPSBmdW5jdGlvbihmaWxlU3lzdGVtKQogICAgIHRoaXMuX3JlZnJlc2hCdXR0 b24gPSBuZXcgV2ViSW5zcGVjdG9yLlN0YXR1c0JhckJ1dHRvbihXZWJJbnNwZWN0b3IuVUlTdHJp bmcoIlJlZnJlc2giKSwgInJlZnJlc2gtc3RvcmFnZS1zdGF0dXMtYmFyLWl0ZW0iKTsKICAgICB0 aGlzLl9yZWZyZXNoQnV0dG9uLnZpc2libGUgPSB0cnVlOwogICAgIHRoaXMuX3JlZnJlc2hCdXR0 b24uYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0aGlzLl9yZWZyZXNoLCB0aGlzKTsKKworICAg IHRoaXMuX2RlbGV0ZUJ1dHRvbiA9IG5ldyBXZWJJbnNwZWN0b3IuU3RhdHVzQmFyQnV0dG9uKFdl Ykluc3BlY3Rvci5VSVN0cmluZygiRGVsZXRlIiksICJkZWxldGUtc3RvcmFnZS1zdGF0dXMtYmFy LWl0ZW0iKTsKKyAgICB0aGlzLl9kZWxldGVCdXR0b24udmlzaWJsZSA9IHRydWU7CisgICAgdGhp cy5fZGVsZXRlQnV0dG9uLmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5fY29uZmlybURl bGV0ZSwgdGhpcyk7CiB9CiAKIFdlYkluc3BlY3Rvci5GaWxlU3lzdGVtVmlldy5wcm90b3R5cGUg PSB7CkBAIC02MSw3ICs2NSw3IEBAIFdlYkluc3BlY3Rvci5GaWxlU3lzdGVtVmlldy5wcm90b3R5 cGUgPSB7CiAgICAgICovCiAgICAgZ2V0IHN0YXR1c0Jhckl0ZW1zKCkKICAgICB7Ci0gICAgICAg IHJldHVybiBbdGhpcy5fcmVmcmVzaEJ1dHRvbi5lbGVtZW50XTsKKyAgICAgICAgcmV0dXJuIFt0 aGlzLl9yZWZyZXNoQnV0dG9uLmVsZW1lbnQsIHRoaXMuX2RlbGV0ZUJ1dHRvbi5lbGVtZW50XTsK ICAgICB9LAogCiAgICAgLyoqCkBAIC04OCw2ICs5MiwxNyBAQCBXZWJJbnNwZWN0b3IuRmlsZVN5 c3RlbVZpZXcucHJvdG90eXBlID0gewogICAgIF9yZWZyZXNoOiBmdW5jdGlvbigpCiAgICAgewog ICAgICAgICB0aGlzLl9kaXJlY3RvcnlUcmVlLmNoaWxkcmVuWzBdLnJlZnJlc2goKTsKKyAgICB9 LAorCisgICAgX2NvbmZpcm1EZWxldGU6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIGlmIChj b25maXJtKFdlYkluc3BlY3Rvci5VSVN0cmluZygiQXJlIHlvdSBzdXJlIHlvdSB3YW50IHRvIGRl bGV0ZSB0aGUgc2VsZWN0ZWQgZW50cnk/IikpKQorICAgICAgICAgICAgdGhpcy5fZGVsZXRlKCk7 CisgICAgfSwKKworICAgIF9kZWxldGU6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHRoaXMu X2RpcmVjdG9yeVRyZWUuc2VsZWN0ZWRUcmVlRWxlbWVudC5kZWxldGVFbnRyeSgpOwogICAgIH0K IH0KIApAQCAtMjAxLDYgKzIxNiwxNyBAQCBXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbVZpZXcuRW50 cnlUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0gZWxz ZQogICAgICAgICAgICAgdGhpcy5fZW50cnkucmVxdWVzdERpcmVjdG9yeUNvbnRlbnQodGhpcy5f ZGlyZWN0b3J5Q29udGVudFJlY2VpdmVkLmJpbmQodGhpcykpOworICAgIH0sCisKKyAgICBkZWxl dGVFbnRyeTogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgdGhpcy5fZW50cnkuZGVsZXRlRW50 cnkodGhpcy5fZGVsZXRpb25Db21wbGV0ZWQuYmluZCh0aGlzKSk7CisgICAgfSwKKworICAgIF9k ZWxldGlvbkNvbXBsZXRlZDogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgaWYgKHRoaXMuX2Vu dHJ5ICE9IHRoaXMuX2VudHJ5LmZpbGVTeXN0ZW0ucm9vdCkKKyAgICAgICAgICAgIHRoaXMucGFy ZW50LnJlZnJlc2goKTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA0ODBjMmVhMDRkMTFjOGQ0NWVkN2Iy YzQ5M2VkMGYwODQ3YmI3OTE4Li4zNTkxZjJiZTE3ODg0YWE1MWRkMjNiZTQ3OTlhM2I1ZTkwMzRh ODRkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTItMDgtMjIgIFRhaWp1IFRzdWlraSAgPHR6 aWtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IEFkZCBkZWxldGUgYnV0 dG9uIHRvIEZpbGVTeXN0ZW1WaWV3CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD05Mzk0MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEFkZGluZyBzdGF0dXMgYmFyIGJ1dHRvbiB0byBhbGxvdyB1c2VyIHRvIGRl bGV0ZSBlbnRyaWVzIGluIEZpbGVTeXN0ZW0KKyAgICAgICAgZm9yIGRlYnVnZ2luZyB1c2UuCisK KyAgICAgICAgKiBodHRwL3Rlc3RzL2luc3BlY3Rvci9maWxlc3lzdGVtL2RlbGV0ZS1lbnRyeS1l eHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGh0dHAvdGVzdHMvaW5zcGVjdG9yL2ZpbGVz eXN0ZW0vZGVsZXRlLWVudHJ5Lmh0bWw6IEFkZGVkLgorCiAyMDEyLTA4LTIyICBWaWN0b3IgQ2Fy YnVuZSAgPHZpY3RvckByb3NlZHUub3JnPgogCiAgICAgICAgIERpc3BsYXkgYSBUZXh0VHJhY2tD dWUgd2hlbiBzbmFwLXRvLWxpbmVzIGZsYWcgaXMgc2V0CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9maWxlc3lzdGVtL2RlbGV0ZS1lbnRyeS1leHBlY3RlZC50 eHQgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9maWxlc3lzdGVtL2RlbGV0ZS1l bnRyeS1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMzY1MzY3ZDYxZTVhYjI0NTBkNWI1N2EwYTU4 YjZmN2QwMTk0OWQ3ZgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMv aW5zcGVjdG9yL2ZpbGVzeXN0ZW0vZGVsZXRlLWVudHJ5LWV4cGVjdGVkLnR4dApAQCAtMCwwICsx LDExIEBACitUZXN0cyBkZWxldGVFbnRyeSBjb21tYW5kLgorCitlcnJvckNvZGU6IDIKK2Vycm9y Q29kZTogOAorZXJyb3JDb2RlOiAwCitlcnJvckNvZGU6IDAKK2Vycm9yQ29kZTogMAorZXJyb3JD b2RlOiAxCitiYWNrZW5kUm9vdEVudHJ5OiAobnVsbCkKKworCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9maWxlc3lzdGVtL2RlbGV0ZS1lbnRyeS5odG1sIGIv TGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvZmlsZXN5c3RlbS9kZWxldGUtZW50cnku aHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwLi5mNDNlMWI0YTRkMThhOWU1NTRiYTI2MDI1NjYyYWNhYWZkZjAzZjBm Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvZmls ZXN5c3RlbS9kZWxldGUtZW50cnkuaHRtbApAQCAtMCwwICsxLDgzIEBACis8IURPQ1RZUEUgaHRt bD4KKzxodG1sPgorPGhlYWQ+Cis8bWV0YSBjaGFyc2V0PSJVVEYtOCI+Cis8c2NyaXB0IHNyYz0i Li4vaW5zcGVjdG9yLXRlc3QuanMiPjwvc2NyaXB0PgorPHNjcmlwdCBzcmM9ImZpbGVzeXN0ZW0t dGVzdC5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0PgorZG9jdW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigi RE9NQ29udGVudExvYWRlZCIsIHJ1blRlc3QpOworZnVuY3Rpb24gdGVzdCgpCit7CisgICAgdmFy IGZpbGVTeXN0ZW1SZXF1ZXN0TWFuYWdlciA9IG5ldyBXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbVJl cXVlc3RNYW5hZ2VyKCk7CisKKyAgICB2YXIgdGVzdFN0ZXAgPSBbCisgICAgICAgIGZ1bmN0aW9u KCkKKyAgICAgICAgeworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5jcmVhdGVGaWxlKCIvaG9n ZSIsIHRlc3RTdGVwLnNoaWZ0KCkpOworICAgICAgICB9LAorCisgICAgICAgIGZ1bmN0aW9uKCkK KyAgICAgICAgeworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5jcmVhdGVEaXJlY3RvcnkoIi9m dWdhIiwgdGVzdFN0ZXAuc2hpZnQoKSk7CisgICAgICAgIH0sCisKKyAgICAgICAgZnVuY3Rpb24o KQorICAgICAgICB7CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmNyZWF0ZUZpbGUoIi9mdWdh L3BpeW8iLCB0ZXN0U3RlcC5zaGlmdCgpKTsKKyAgICAgICAgfSwKKworICAgICAgICBmdW5jdGlv bigpCisgICAgICAgIHsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuY3JlYXRlRGlyZWN0b3J5 KCIvZm9vIiwgdGVzdFN0ZXAuc2hpZnQoKSk7CisgICAgICAgIH0sCisKKyAgICAgICAgZnVuY3Rp b24oKQorICAgICAgICB7CisgICAgICAgICAgICBmaWxlU3lzdGVtUmVxdWVzdE1hbmFnZXIuZGVs ZXRlRW50cnkoIkludmFsaWRVUkwiLCB0ZXN0U3RlcC5zaGlmdCgpKTsKKyAgICAgICAgfSwKKwor ICAgICAgICBmdW5jdGlvbihlcnJvckNvZGUpCisgICAgICAgIHsKKyAgICAgICAgICAgIEluc3Bl Y3RvclRlc3QuYWRkUmVzdWx0KCJlcnJvckNvZGU6ICIgKyBlcnJvckNvZGUpOworICAgICAgICAg ICAgZmlsZVN5c3RlbVJlcXVlc3RNYW5hZ2VyLmRlbGV0ZUVudHJ5KCJmaWxlc3lzdGVtOmh0dHA6 Ly8xMjcuMC4wLjE6ODAwMC9JbnZhbGlkVHlwZS9mdWdhIiwgdGVzdFN0ZXAuc2hpZnQoKSk7Cisg ICAgICAgIH0sCisKKyAgICAgICAgZnVuY3Rpb24oZXJyb3JDb2RlKQorICAgICAgICB7CisgICAg ICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdCgiZXJyb3JDb2RlOiAiICsgZXJyb3JDb2Rl KTsKKyAgICAgICAgICAgIGZpbGVTeXN0ZW1SZXF1ZXN0TWFuYWdlci5kZWxldGVFbnRyeSgiZmls ZXN5c3RlbTpodHRwOi8vMTI3LjAuMC4xOjgwMDAvdGVtcG9yYXJ5L2hvZ2UiLCB0ZXN0U3RlcC5z aGlmdCgpKTsKKyAgICAgICAgfSwKKworICAgICAgICBmdW5jdGlvbihlcnJvckNvZGUpCisgICAg ICAgIHsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KCJlcnJvckNvZGU6ICIg KyBlcnJvckNvZGUpOworICAgICAgICAgICAgZmlsZVN5c3RlbVJlcXVlc3RNYW5hZ2VyLmRlbGV0 ZUVudHJ5KCJmaWxlc3lzdGVtOmh0dHA6Ly8xMjcuMC4wLjE6ODAwMC90ZW1wb3JhcnkvZnVnYSIs IHRlc3RTdGVwLnNoaWZ0KCkpOworICAgICAgICB9LAorCisgICAgICAgIGZ1bmN0aW9uKGVycm9y Q29kZSkKKyAgICAgICAgeworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoImVy cm9yQ29kZTogIiArIGVycm9yQ29kZSk7CisgICAgICAgICAgICBmaWxlU3lzdGVtUmVxdWVzdE1h bmFnZXIuZGVsZXRlRW50cnkoImZpbGVzeXN0ZW06aHR0cDovLzEyNy4wLjAuMTo4MDAwL3RlbXBv cmFyeS8iLCB0ZXN0U3RlcC5zaGlmdCgpKTsKKyAgICAgICAgfSwKKworICAgICAgICBmdW5jdGlv bihlcnJvckNvZGUpCisgICAgICAgIHsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVz dWx0KCJlcnJvckNvZGU6ICIgKyBlcnJvckNvZGUpOworICAgICAgICAgICAgZmlsZVN5c3RlbVJl cXVlc3RNYW5hZ2VyLnJlcXVlc3RGaWxlU3lzdGVtUm9vdCgiaHR0cDovLzEyNy4wLjAuMTo4MDAw IiwgInRlbXBvcmFyeSIsIHRlc3RTdGVwLnNoaWZ0KCkpOworICAgICAgICB9LAorCisgICAgICAg IGZ1bmN0aW9uKGVycm9yQ29kZSwgYmFja2VuZFJvb3RFbnRyeSkKKyAgICAgICAgeworICAgICAg ICAgICAgSW5zcGVjdG9yVGVzdC5kdW1wRmlsZVN5c3RlbVJvb3RSZXF1ZXN0UmVzdWx0KGVycm9y Q29kZSwgYmFja2VuZFJvb3RFbnRyeSk7CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmNvbXBs ZXRlVGVzdCgpOworICAgICAgICB9CisgICAgXTsKKworICAgIEluc3BlY3RvclRlc3QuY2xlYXJG aWxlU3lzdGVtKHRlc3RTdGVwLnNoaWZ0KCkpOworfQorPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9k eT4KKzxwPlRlc3RzIGRlbGV0ZUVudHJ5IGNvbW1hbmQuPC9wPgorPC9ib2R5PgorPC9odG1sPgo= 160625 2012-08-26 21:24:25 -0700 2012-08-27 12:26:51 -0700 Patch bug-93940-20120827132417.patch text/plain 13791 tzik U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2NzE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmVlMDEzZWFkMDkzOGM4 YTQxZTc3NmRmZjExMjdjOTAxZGU2ZTJiNi4uM2Y3NDdmZjljZTQ5YzcwNTk4M2M3ZWRmMDI2OTM3 MGY0Y2I4ZDA5NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDEyLTA4LTIyICBUYWlq dSBUc3Vpa2kgIDx0emlrQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBB ZGQgZGVsZXRlIGJ1dHRvbiB0byBGaWxlU3lzdGVtVmlldworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTM5NDAKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRpbmcgc3RhdHVzIGJhciBidXR0b24gdG8gYWxs b3cgdXNlciB0byBkZWxldGUgZW50cmllcyBpbiBGaWxlU3lzdGVtCisgICAgICAgIGZvciBkZWJ1 Z2dpbmcgdXNlLgorCisgICAgICAgIFRlc3Q6IGh0dHAvdGVzdHMvaW5zcGVjdG9yL2ZpbGVzeXN0 ZW0vZGVsZXRlLWVudHJ5Lmh0bWwKKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRmls ZVN5c3RlbU1vZGVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1Nb2RlbC5w cm90b3R5cGUucmVxdWVzdEZpbGVDb250ZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5GaWxl U3lzdGVtTW9kZWwucHJvdG90eXBlLmRlbGV0ZUVudHJ5Lmhvb2tGaWxlU3lzdGVtRGVsZXRpb24p OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1Nb2RlbC5wcm90b3R5cGUuZGVsZXRl RW50cnkpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1Nb2RlbC5wcm90b3R5cGUu X3JlbW92ZUZpbGVTeXN0ZW0pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1Nb2Rl bC5FbnRyeS5wcm90b3R5cGUuZGVsZXRlRW50cnkpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZp bGVTeXN0ZW1SZXF1ZXN0TWFuYWdlcik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRmlsZVN5c3Rl bVJlcXVlc3RNYW5hZ2VyLnByb3RvdHlwZS5kZWxldGVFbnRyeS5yZXF1ZXN0QWNjZXB0ZWQpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1SZXF1ZXN0TWFuYWdlci5wcm90b3R5cGUu ZGVsZXRlRW50cnkpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1SZXF1ZXN0TWFu YWdlci5wcm90b3R5cGUuX2RlbGV0aW9uQ29tcGxldGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5GaWxlU3lzdGVtRGlzcGF0Y2hlci5wcm90b3R5cGUuZGVsZXRpb25Db21wbGV0ZWQpOgorICAg ICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRmlsZVN5c3RlbVZpZXcuanM6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuRmlsZVN5c3RlbVZpZXcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZpbGVT eXN0ZW1WaWV3LnByb3RvdHlwZS5nZXQgc3RhdHVzQmFySXRlbXMpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkZpbGVTeXN0ZW1WaWV3LnByb3RvdHlwZS5fcmVmcmVzaCk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuRmlsZVN5c3RlbVZpZXcucHJvdG90eXBlLl9jb25maXJtRGVsZXRlKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5GaWxlU3lzdGVtVmlldy5wcm90b3R5cGUuX2RlbGV0ZSk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbVZpZXcuRW50cnlUcmVlRWxlbWVudC5wcm90b3R5 cGUuZGVsZXRlRW50cnkpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1WaWV3LkVu dHJ5VHJlZUVsZW1lbnQucHJvdG90eXBlLl9kZWxldGlvbkNvbXBsZXRlZCk6CisKIDIwMTItMDgt MjYgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSBw YXJlbnQgcG9pbnRlciBmcm9tIFN0eWxlU2hlZXRDb250ZW50cyBhbmQgU3R5bGVSdWxlSW1wb3J0 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0ZpbGVTeXN0 ZW1Nb2RlbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRmlsZVN5c3Rl bU1vZGVsLmpzCmluZGV4IDMwZWRkODRlOGVhZjc3MzlkZWM5NGQxZGJmNmZmYzFlMTc2YmI4MTcu LmEwNmVkNjkwOTZhZjVmZjhjMWExNWFmMjI3NWFmYjkwZDYyYmUyNTcgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRmlsZVN5c3RlbU1vZGVsLmpzCisrKyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRmlsZVN5c3RlbU1vZGVsLmpzCkBA IC0xOTcsNyArMTk3LDcgQEAgV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1Nb2RlbC5wcm90b3R5cGUg PSB7CiAgICAgICovCiAgICAgX2ZpbGVTeXN0ZW1Sb290UmVjZWl2ZWQ6IGZ1bmN0aW9uKG9yaWdp biwgdHlwZSwgc3RvcmUsIGVycm9yQ29kZSwgYmFja2VuZFJvb3RFbnRyeSkKICAgICB7Ci0gICAg ICAgIGlmIChlcnJvckNvZGUgPT09IDAgJiYgYmFja2VuZFJvb3RFbnRyeSAmJiB0aGlzLl9maWxl U3lzdGVtc0Zvck9yaWdpbltvcmlnaW5dID09PSBzdG9yZSkgeworICAgICAgICBpZiAoIWVycm9y Q29kZSAmJiBiYWNrZW5kUm9vdEVudHJ5ICYmIHRoaXMuX2ZpbGVTeXN0ZW1zRm9yT3JpZ2luW29y aWdpbl0gPT09IHN0b3JlKSB7CiAgICAgICAgICAgICB2YXIgZmlsZVN5c3RlbSA9IG5ldyBXZWJJ bnNwZWN0b3IuRmlsZVN5c3RlbU1vZGVsLkZpbGVTeXN0ZW0odGhpcywgb3JpZ2luLCB0eXBlLCBi YWNrZW5kUm9vdEVudHJ5KTsKICAgICAgICAgICAgIHN0b3JlW3R5cGVdID0gZmlsZVN5c3RlbTsK ICAgICAgICAgICAgIHRoaXMuX2ZpbGVTeXN0ZW1BZGRlZChmaWxlU3lzdGVtKTsKQEAgLTI1Nyw2 ICsyNTcsNDIgQEAgV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1Nb2RlbC5wcm90b3R5cGUgPSB7CiAg ICAgcmVxdWVzdEZpbGVDb250ZW50OiBmdW5jdGlvbihmaWxlLCByZWFkQXNUZXh0LCBzdGFydCwg ZW5kLCBjaGFyc2V0LCBjYWxsYmFjaykKICAgICB7CiAgICAgICAgIHRoaXMuX2FnZW50V3JhcHBl ci5yZXF1ZXN0RmlsZUNvbnRlbnQoZmlsZS51cmwsIHJlYWRBc1RleHQsIHN0YXJ0LCBlbmQsIGNo YXJzZXQsIGNhbGxiYWNrKTsKKyAgICB9LAorCisgICAgLyoqCisgICAgICogQHBhcmFtIHtXZWJJ bnNwZWN0b3IuRmlsZVN5c3RlbU1vZGVsLkVudHJ5fSBlbnRyeQorICAgICAqIEBwYXJhbSB7ZnVu Y3Rpb24obnVtYmVyKT19IGNhbGxiYWNrCisgICAgICovCisgICAgZGVsZXRlRW50cnk6IGZ1bmN0 aW9uKGVudHJ5LCBjYWxsYmFjaykKKyAgICB7CisgICAgICAgIHZhciBmaWxlU3lzdGVtTW9kZWwg PSB0aGlzOworICAgICAgICBpZiAoZW50cnkgPT09IGVudHJ5LmZpbGVTeXN0ZW0ucm9vdCkKKyAg ICAgICAgICAgIHRoaXMuX2FnZW50V3JhcHBlci5kZWxldGVFbnRyeShlbnRyeS51cmwsIGhvb2tG aWxlU3lzdGVtRGVsZXRpb24pOworICAgICAgICBlbHNlCisgICAgICAgICAgICB0aGlzLl9hZ2Vu dFdyYXBwZXIuZGVsZXRlRW50cnkoZW50cnkudXJsLCBjYWxsYmFjayk7CisKKyAgICAgICAgZnVu Y3Rpb24gaG9va0ZpbGVTeXN0ZW1EZWxldGlvbihlcnJvckNvZGUpCisgICAgICAgIHsKKyAgICAg ICAgICAgIGNhbGxiYWNrKGVycm9yQ29kZSk7CisgICAgICAgICAgICBpZiAoIWVycm9yQ29kZSkK KyAgICAgICAgICAgICAgICBmaWxlU3lzdGVtTW9kZWwuX3JlbW92ZUZpbGVTeXN0ZW0oZW50cnku ZmlsZVN5c3RlbSk7CisgICAgICAgIH0KKyAgICB9LAorCisgICAgLyoqCisgICAgICogQHBhcmFt IHtXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbU1vZGVsLkZpbGVTeXN0ZW19IGZpbGVTeXN0ZW0KKyAg ICAgKi8KKyAgICBfcmVtb3ZlRmlsZVN5c3RlbTogZnVuY3Rpb24oZmlsZVN5c3RlbSkKKyAgICB7 CisgICAgICAgIHZhciBvcmlnaW4gPSBmaWxlU3lzdGVtLm9yaWdpbjsKKyAgICAgICAgdmFyIHR5 cGUgPSBmaWxlU3lzdGVtLnR5cGU7CisgICAgICAgIGlmICh0aGlzLl9maWxlU3lzdGVtc0Zvck9y aWdpbltvcmlnaW5dICYmIHRoaXMuX2ZpbGVTeXN0ZW1zRm9yT3JpZ2luW29yaWdpbl1bdHlwZV0p IHsKKyAgICAgICAgICAgIGRlbGV0ZSB0aGlzLl9maWxlU3lzdGVtc0Zvck9yaWdpbltvcmlnaW5d W3R5cGVdOworICAgICAgICAgICAgdGhpcy5fZmlsZVN5c3RlbVJlbW92ZWQoZmlsZVN5c3RlbSk7 CisKKyAgICAgICAgICAgIGlmIChPYmplY3QuaXNFbXB0eSh0aGlzLl9maWxlU3lzdGVtc0Zvck9y aWdpbltvcmlnaW5dKSkKKyAgICAgICAgICAgICAgICBkZWxldGUgdGhpcy5fZmlsZVN5c3RlbXNG b3JPcmlnaW5bb3JpZ2luXTsKKyAgICAgICAgfQogICAgIH0KIH0KIApAQCAtMzY3LDYgKzQwMywx NCBAQCBXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbU1vZGVsLkVudHJ5LnByb3RvdHlwZSA9IHsKICAg ICByZXF1ZXN0TWV0YWRhdGE6IGZ1bmN0aW9uKGNhbGxiYWNrKQogICAgIHsKICAgICAgICAgdGhp cy5maWxlU3lzdGVtTW9kZWwucmVxdWVzdE1ldGFkYXRhKHRoaXMsIGNhbGxiYWNrKTsKKyAgICB9 LAorCisgICAgLyoqCisgICAgICogQHBhcmFtIHtmdW5jdGlvbihudW1iZXIpfSBjYWxsYmFjawor ICAgICAqLworICAgIGRlbGV0ZUVudHJ5OiBmdW5jdGlvbihjYWxsYmFjaykKKyAgICB7CisgICAg ICAgIHRoaXMuZmlsZVN5c3RlbU1vZGVsLmRlbGV0ZUVudHJ5KHRoaXMsIGNhbGxiYWNrKTsKICAg ICB9CiB9CiAKQEAgLTQ1OSw2ICs1MDMsNyBAQCBXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbVJlcXVl c3RNYW5hZ2VyID0gZnVuY3Rpb24oKQogICAgIHRoaXMuX3BlbmRpbmdEaXJlY3RvcnlDb250ZW50 UmVxdWVzdHMgPSB7fTsKICAgICB0aGlzLl9wZW5kaW5nTWV0YWRhdGFSZXF1ZXN0cyA9IHt9Owog ICAgIHRoaXMuX3BlbmRpbmdGaWxlQ29udGVudFJlcXVlc3RzID0ge307CisgICAgdGhpcy5fcGVu ZGluZ0RlbGV0ZUVudHJ5UmVxdWVzdHMgPSB7fTsKIAogICAgIEluc3BlY3RvckJhY2tlbmQucmVn aXN0ZXJGaWxlU3lzdGVtRGlzcGF0Y2hlcihuZXcgV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1EaXNw YXRjaGVyKHRoaXMpKTsKICAgICBGaWxlU3lzdGVtQWdlbnQuZW5hYmxlKCk7CkBAIC01OTIsNiAr NjM3LDM3IEBAIFdlYkluc3BlY3Rvci5GaWxlU3lzdGVtUmVxdWVzdE1hbmFnZXIucHJvdG90eXBl ID0gewogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICBkZWxldGUgdGhpcy5fcGVuZGluZ0Zp bGVDb250ZW50UmVxdWVzdHNbcmVxdWVzdElkXTsKICAgICAgICAgY2FsbGJhY2soZXJyb3JDb2Rl LCBjb250ZW50LCBjaGFyc2V0KTsKKyAgICB9LAorCisgICAgLyoqCisgICAgICogQHBhcmFtIHtz dHJpbmd9IHVybAorICAgICAqIEBwYXJhbSB7ZnVuY3Rpb24obnVtYmVyKT19IGNhbGxiYWNrCisg ICAgICovCisgICAgZGVsZXRlRW50cnk6IGZ1bmN0aW9uKHVybCwgY2FsbGJhY2spCisgICAgewor ICAgICAgICB2YXIgc3RvcmUgPSB0aGlzLl9wZW5kaW5nRGVsZXRlRW50cnlSZXF1ZXN0czsKKyAg ICAgICAgRmlsZVN5c3RlbUFnZW50LmRlbGV0ZUVudHJ5KHVybCwgcmVxdWVzdEFjY2VwdGVkKTsK KworICAgICAgICBmdW5jdGlvbiByZXF1ZXN0QWNjZXB0ZWQoZXJyb3IsIHJlcXVlc3RJZCkKKyAg ICAgICAgeworICAgICAgICAgICAgaWYgKGVycm9yKQorICAgICAgICAgICAgICAgIGNhbGxiYWNr KEZpbGVFcnJvci5TRUNVUklUWV9FUlIpOworICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAg ICAgIHN0b3JlW3JlcXVlc3RJZF0gPSBjYWxsYmFjayB8fCBmdW5jdGlvbigpIHt9OworICAgICAg ICB9CisgICAgfSwKKworICAgIC8qKgorICAgICAqIEBwYXJhbSB7bnVtYmVyfSByZXF1ZXN0SWQK KyAgICAgKiBAcGFyYW0ge251bWJlcn0gZXJyb3JDb2RlCisgICAgICovCisgICAgX2RlbGV0aW9u Q29tcGxldGVkOiBmdW5jdGlvbihyZXF1ZXN0SWQsIGVycm9yQ29kZSkKKyAgICB7CisgICAgICAg IHZhciBjYWxsYmFjayA9IC8qKiBAdHlwZSB7ZnVuY3Rpb24obnVtYmVyKX0gKi8gdGhpcy5fcGVu ZGluZ0RlbGV0ZUVudHJ5UmVxdWVzdHNbcmVxdWVzdElkXTsKKyAgICAgICAgaWYgKCFjYWxsYmFj aykKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgZGVsZXRlIHRoaXMuX3BlbmRpbmdEZWxl dGVFbnRyeVJlcXVlc3RzW3JlcXVlc3RJZF07CisgICAgICAgIGNhbGxiYWNrKGVycm9yQ29kZSk7 CiAgICAgfQogfQogCkBAIC02NTMsNiArNzI5LDYgQEAgV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1E aXNwYXRjaGVyLnByb3RvdHlwZSA9IHsKICAgICAgKi8KICAgICBkZWxldGlvbkNvbXBsZXRlZDog ZnVuY3Rpb24ocmVxdWVzdElkLCBlcnJvckNvZGUpCiAgICAgewotICAgICAgICBjb25zb2xlLmVy cm9yKCJOb3QgaW1wbGVtZW50ZWQiKTsKKyAgICAgICAgdGhpcy5fYWdlbnRXcmFwcGVyLl9kZWxl dGlvbkNvbXBsZXRlZChyZXF1ZXN0SWQsIGVycm9yQ29kZSk7CiAgICAgfQogfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9GaWxlU3lzdGVtVmlldy5qcyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRmlsZVN5c3RlbVZpZXcuanMKaW5k ZXggOWI4OWJlYWIxM2JjMzY0ZjNiZjMyNGIyOTAwYmIzZjJiNGI5YjIxYy4uNjBiOWY0MjU5YjBi M2RiNGU3Mzg4N2NjZWJlMmExMDcwNzI5MGJlNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9GaWxlU3lzdGVtVmlldy5qcworKysgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0ZpbGVTeXN0ZW1WaWV3LmpzCkBAIC01Myw2ICs1MywxMCBA QCBXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbVZpZXcgPSBmdW5jdGlvbihmaWxlU3lzdGVtKQogICAg IHRoaXMuX3JlZnJlc2hCdXR0b24gPSBuZXcgV2ViSW5zcGVjdG9yLlN0YXR1c0JhckJ1dHRvbihX ZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlJlZnJlc2giKSwgInJlZnJlc2gtc3RvcmFnZS1zdGF0dXMt YmFyLWl0ZW0iKTsKICAgICB0aGlzLl9yZWZyZXNoQnV0dG9uLnZpc2libGUgPSB0cnVlOwogICAg IHRoaXMuX3JlZnJlc2hCdXR0b24uYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0aGlzLl9yZWZy ZXNoLCB0aGlzKTsKKworICAgIHRoaXMuX2RlbGV0ZUJ1dHRvbiA9IG5ldyBXZWJJbnNwZWN0b3Iu U3RhdHVzQmFyQnV0dG9uKFdlYkluc3BlY3Rvci5VSVN0cmluZygiRGVsZXRlIiksICJkZWxldGUt c3RvcmFnZS1zdGF0dXMtYmFyLWl0ZW0iKTsKKyAgICB0aGlzLl9kZWxldGVCdXR0b24udmlzaWJs ZSA9IHRydWU7CisgICAgdGhpcy5fZGVsZXRlQnV0dG9uLmFkZEV2ZW50TGlzdGVuZXIoImNsaWNr IiwgdGhpcy5fY29uZmlybURlbGV0ZSwgdGhpcyk7CiB9CiAKIFdlYkluc3BlY3Rvci5GaWxlU3lz dGVtVmlldy5wcm90b3R5cGUgPSB7CkBAIC02MSw3ICs2NSw3IEBAIFdlYkluc3BlY3Rvci5GaWxl U3lzdGVtVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICovCiAgICAgZ2V0IHN0YXR1c0Jhckl0ZW1z KCkKICAgICB7Ci0gICAgICAgIHJldHVybiBbdGhpcy5fcmVmcmVzaEJ1dHRvbi5lbGVtZW50XTsK KyAgICAgICAgcmV0dXJuIFt0aGlzLl9yZWZyZXNoQnV0dG9uLmVsZW1lbnQsIHRoaXMuX2RlbGV0 ZUJ1dHRvbi5lbGVtZW50XTsKICAgICB9LAogCiAgICAgLyoqCkBAIC04OCw2ICs5MiwxNyBAQCBX ZWJJbnNwZWN0b3IuRmlsZVN5c3RlbVZpZXcucHJvdG90eXBlID0gewogICAgIF9yZWZyZXNoOiBm dW5jdGlvbigpCiAgICAgewogICAgICAgICB0aGlzLl9kaXJlY3RvcnlUcmVlLmNoaWxkcmVuWzBd LnJlZnJlc2goKTsKKyAgICB9LAorCisgICAgX2NvbmZpcm1EZWxldGU6IGZ1bmN0aW9uKCkKKyAg ICB7CisgICAgICAgIGlmIChjb25maXJtKFdlYkluc3BlY3Rvci5VSVN0cmluZygiQXJlIHlvdSBz dXJlIHlvdSB3YW50IHRvIGRlbGV0ZSB0aGUgc2VsZWN0ZWQgZW50cnk/IikpKQorICAgICAgICAg ICAgdGhpcy5fZGVsZXRlKCk7CisgICAgfSwKKworICAgIF9kZWxldGU6IGZ1bmN0aW9uKCkKKyAg ICB7CisgICAgICAgIHRoaXMuX2RpcmVjdG9yeVRyZWUuc2VsZWN0ZWRUcmVlRWxlbWVudC5kZWxl dGVFbnRyeSgpOwogICAgIH0KIH0KIApAQCAtMjAxLDYgKzIxNiwxNyBAQCBXZWJJbnNwZWN0b3Iu RmlsZVN5c3RlbVZpZXcuRW50cnlUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAg ICB9CiAgICAgICAgIH0gZWxzZQogICAgICAgICAgICAgdGhpcy5fZW50cnkucmVxdWVzdERpcmVj dG9yeUNvbnRlbnQodGhpcy5fZGlyZWN0b3J5Q29udGVudFJlY2VpdmVkLmJpbmQodGhpcykpOwor ICAgIH0sCisKKyAgICBkZWxldGVFbnRyeTogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgdGhp cy5fZW50cnkuZGVsZXRlRW50cnkodGhpcy5fZGVsZXRpb25Db21wbGV0ZWQuYmluZCh0aGlzKSk7 CisgICAgfSwKKworICAgIF9kZWxldGlvbkNvbXBsZXRlZDogZnVuY3Rpb24oKQorICAgIHsKKyAg ICAgICAgaWYgKHRoaXMuX2VudHJ5ICE9IHRoaXMuX2VudHJ5LmZpbGVTeXN0ZW0ucm9vdCkKKyAg ICAgICAgICAgIHRoaXMucGFyZW50LnJlZnJlc2goKTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBmMTEx ZTM1ZDgxYjY1MjdmMWQwYWQwNjBkMzcyM2E2YjEwZmIzZWJiLi5iYWU1Njg0ZTc3MDdmYmUzODQ2 OTM5ZWM0YWE5YmMzMzMzNjcyNmMyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK KysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTItMDgtMjYg IFRhaWp1IFRzdWlraSAgPHR6aWtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IEFkZCBkZWxldGUgYnV0dG9uIHRvIEZpbGVTeXN0ZW1WaWV3CisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05Mzk0MAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZGluZyBzdGF0dXMgYmFyIGJ1dHRvbiB0 byBhbGxvdyB1c2VyIHRvIGRlbGV0ZSBlbnRyaWVzIGluIEZpbGVTeXN0ZW0KKyAgICAgICAgZm9y IGRlYnVnZ2luZyB1c2UuCisKKyAgICAgICAgKiBodHRwL3Rlc3RzL2luc3BlY3Rvci9maWxlc3lz dGVtL2RlbGV0ZS1lbnRyeS1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGh0dHAvdGVz dHMvaW5zcGVjdG9yL2ZpbGVzeXN0ZW0vZGVsZXRlLWVudHJ5Lmh0bWw6IEFkZGVkLgorCiAyMDEy LTA4LTI2ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CiAKICAgICAgICAgRmluYWxs eSBpbmxpbmluZyBzaG91bGQgY29ycmVjdGx5IHRyYWNrIHRoZSBjYXRjaCBjb250ZXh0CkBAIC0y MjE2LDYgKzIyMjksMTkgQEAKICAgICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS9mYXN0L2NhbnZh cy9jYW52YXMtc3Ryb2tlUGF0aC1ncmFkaWVudC1zaGFkb3ctZXhwZWN0ZWQudHh0OiBSZW5hbWVk IGZyb20gTGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0tbGludXgteDg2L2Zhc3QvY2FudmFz L2NhbnZhcy1zdHJva2VQYXRoLWdyYWRpZW50LXNoYWRvdy1leHBlY3RlZC50eHQuCiAgICAgICAg ICogcGxhdGZvcm0vY2hyb21pdW0vZmFzdC9jYW52YXMvY2FudmFzLXN0cm9rZVJlY3QtZ3JhZGll bnQtc2hhZG93LWV4cGVjdGVkLnR4dDogUmVuYW1lZCBmcm9tIExheW91dFRlc3RzL3BsYXRmb3Jt L2Nocm9taXVtLWxpbnV4LXg4Ni9mYXN0L2NhbnZhcy9jYW52YXMtc3Ryb2tlUmVjdC1ncmFkaWVu dC1zaGFkb3ctZXhwZWN0ZWQudHh0LgogCisyMDEyLTA4LTIyICBUYWlqdSBUc3Vpa2kgIDx0emlr QGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBBZGQgZGVsZXRlIGJ1dHRv biB0byBGaWxlU3lzdGVtVmlldworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9OTM5NDAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBBZGRpbmcgc3RhdHVzIGJhciBidXR0b24gdG8gYWxsb3cgdXNlciB0byBkZWxl dGUgZW50cmllcyBpbiBGaWxlU3lzdGVtCisgICAgICAgIGZvciBkZWJ1Z2dpbmcgdXNlLgorCisg ICAgICAgICogaHR0cC90ZXN0cy9pbnNwZWN0b3IvZmlsZXN5c3RlbS9kZWxldGUtZW50cnktZXhw ZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBodHRwL3Rlc3RzL2luc3BlY3Rvci9maWxlc3lz dGVtL2RlbGV0ZS1lbnRyeS5odG1sOiBBZGRlZC4KKwogMjAxMi0wOC0yMiAgVmljdG9yIENhcmJ1 bmUgIDx2aWN0b3JAcm9zZWR1Lm9yZz4KIAogICAgICAgICBEaXNwbGF5IGEgVGV4dFRyYWNrQ3Vl IHdoZW4gc25hcC10by1saW5lcyBmbGFnIGlzIHNldApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv aHR0cC90ZXN0cy9pbnNwZWN0b3IvZmlsZXN5c3RlbS9kZWxldGUtZW50cnktZXhwZWN0ZWQudHh0 IGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvZmlsZXN5c3RlbS9kZWxldGUtZW50 cnktZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjM2NTM2N2Q2MWU1YWIyNDUwZDViNTdhMGE1OGI2 ZjdkMDE5NDlkN2YKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2lu c3BlY3Rvci9maWxlc3lzdGVtL2RlbGV0ZS1lbnRyeS1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwx MSBAQAorVGVzdHMgZGVsZXRlRW50cnkgY29tbWFuZC4KKworZXJyb3JDb2RlOiAyCitlcnJvckNv ZGU6IDgKK2Vycm9yQ29kZTogMAorZXJyb3JDb2RlOiAwCitlcnJvckNvZGU6IDAKK2Vycm9yQ29k ZTogMQorYmFja2VuZFJvb3RFbnRyeTogKG51bGwpCisKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvZmlsZXN5c3RlbS9kZWxldGUtZW50cnkuaHRtbCBiL0xh eW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2ZpbGVzeXN0ZW0vZGVsZXRlLWVudHJ5Lmh0 bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMC4uZjQzZTFiNGE0ZDE4YTllNTU0YmEyNjAyNTY2MmFjYWFmZGYwM2YwZgot LS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2ZpbGVz eXN0ZW0vZGVsZXRlLWVudHJ5Lmh0bWwKQEAgLTAsMCArMSw4MyBAQAorPCFET0NUWVBFIGh0bWw+ Cis8aHRtbD4KKzxoZWFkPgorPG1ldGEgY2hhcnNldD0iVVRGLTgiPgorPHNjcmlwdCBzcmM9Ii4u L2luc3BlY3Rvci10ZXN0LmpzIj48L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSJmaWxlc3lzdGVtLXRl c3QuanMiPjwvc2NyaXB0PgorPHNjcmlwdD4KK2RvY3VtZW50LmFkZEV2ZW50TGlzdGVuZXIoIkRP TUNvbnRlbnRMb2FkZWQiLCBydW5UZXN0KTsKK2Z1bmN0aW9uIHRlc3QoKQoreworICAgIHZhciBm aWxlU3lzdGVtUmVxdWVzdE1hbmFnZXIgPSBuZXcgV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1SZXF1 ZXN0TWFuYWdlcigpOworCisgICAgdmFyIHRlc3RTdGVwID0gWworICAgICAgICBmdW5jdGlvbigp CisgICAgICAgIHsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuY3JlYXRlRmlsZSgiL2hvZ2Ui LCB0ZXN0U3RlcC5zaGlmdCgpKTsKKyAgICAgICAgfSwKKworICAgICAgICBmdW5jdGlvbigpCisg ICAgICAgIHsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuY3JlYXRlRGlyZWN0b3J5KCIvZnVn YSIsIHRlc3RTdGVwLnNoaWZ0KCkpOworICAgICAgICB9LAorCisgICAgICAgIGZ1bmN0aW9uKCkK KyAgICAgICAgeworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5jcmVhdGVGaWxlKCIvZnVnYS9w aXlvIiwgdGVzdFN0ZXAuc2hpZnQoKSk7CisgICAgICAgIH0sCisKKyAgICAgICAgZnVuY3Rpb24o KQorICAgICAgICB7CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmNyZWF0ZURpcmVjdG9yeSgi L2ZvbyIsIHRlc3RTdGVwLnNoaWZ0KCkpOworICAgICAgICB9LAorCisgICAgICAgIGZ1bmN0aW9u KCkKKyAgICAgICAgeworICAgICAgICAgICAgZmlsZVN5c3RlbVJlcXVlc3RNYW5hZ2VyLmRlbGV0 ZUVudHJ5KCJJbnZhbGlkVVJMIiwgdGVzdFN0ZXAuc2hpZnQoKSk7CisgICAgICAgIH0sCisKKyAg ICAgICAgZnVuY3Rpb24oZXJyb3JDb2RlKQorICAgICAgICB7CisgICAgICAgICAgICBJbnNwZWN0 b3JUZXN0LmFkZFJlc3VsdCgiZXJyb3JDb2RlOiAiICsgZXJyb3JDb2RlKTsKKyAgICAgICAgICAg IGZpbGVTeXN0ZW1SZXF1ZXN0TWFuYWdlci5kZWxldGVFbnRyeSgiZmlsZXN5c3RlbTpodHRwOi8v MTI3LjAuMC4xOjgwMDAvSW52YWxpZFR5cGUvZnVnYSIsIHRlc3RTdGVwLnNoaWZ0KCkpOworICAg ICAgICB9LAorCisgICAgICAgIGZ1bmN0aW9uKGVycm9yQ29kZSkKKyAgICAgICAgeworICAgICAg ICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoImVycm9yQ29kZTogIiArIGVycm9yQ29kZSk7 CisgICAgICAgICAgICBmaWxlU3lzdGVtUmVxdWVzdE1hbmFnZXIuZGVsZXRlRW50cnkoImZpbGVz eXN0ZW06aHR0cDovLzEyNy4wLjAuMTo4MDAwL3RlbXBvcmFyeS9ob2dlIiwgdGVzdFN0ZXAuc2hp ZnQoKSk7CisgICAgICAgIH0sCisKKyAgICAgICAgZnVuY3Rpb24oZXJyb3JDb2RlKQorICAgICAg ICB7CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdCgiZXJyb3JDb2RlOiAiICsg ZXJyb3JDb2RlKTsKKyAgICAgICAgICAgIGZpbGVTeXN0ZW1SZXF1ZXN0TWFuYWdlci5kZWxldGVF bnRyeSgiZmlsZXN5c3RlbTpodHRwOi8vMTI3LjAuMC4xOjgwMDAvdGVtcG9yYXJ5L2Z1Z2EiLCB0 ZXN0U3RlcC5zaGlmdCgpKTsKKyAgICAgICAgfSwKKworICAgICAgICBmdW5jdGlvbihlcnJvckNv ZGUpCisgICAgICAgIHsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KCJlcnJv ckNvZGU6ICIgKyBlcnJvckNvZGUpOworICAgICAgICAgICAgZmlsZVN5c3RlbVJlcXVlc3RNYW5h Z2VyLmRlbGV0ZUVudHJ5KCJmaWxlc3lzdGVtOmh0dHA6Ly8xMjcuMC4wLjE6ODAwMC90ZW1wb3Jh cnkvIiwgdGVzdFN0ZXAuc2hpZnQoKSk7CisgICAgICAgIH0sCisKKyAgICAgICAgZnVuY3Rpb24o ZXJyb3JDb2RlKQorICAgICAgICB7CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3Vs dCgiZXJyb3JDb2RlOiAiICsgZXJyb3JDb2RlKTsKKyAgICAgICAgICAgIGZpbGVTeXN0ZW1SZXF1 ZXN0TWFuYWdlci5yZXF1ZXN0RmlsZVN5c3RlbVJvb3QoImh0dHA6Ly8xMjcuMC4wLjE6ODAwMCIs ICJ0ZW1wb3JhcnkiLCB0ZXN0U3RlcC5zaGlmdCgpKTsKKyAgICAgICAgfSwKKworICAgICAgICBm dW5jdGlvbihlcnJvckNvZGUsIGJhY2tlbmRSb290RW50cnkpCisgICAgICAgIHsKKyAgICAgICAg ICAgIEluc3BlY3RvclRlc3QuZHVtcEZpbGVTeXN0ZW1Sb290UmVxdWVzdFJlc3VsdChlcnJvckNv ZGUsIGJhY2tlbmRSb290RW50cnkpOworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5jb21wbGV0 ZVRlc3QoKTsKKyAgICAgICAgfQorICAgIF07CisKKyAgICBJbnNwZWN0b3JUZXN0LmNsZWFyRmls ZVN5c3RlbSh0ZXN0U3RlcC5zaGlmdCgpKTsKK30KKzwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+ Cis8cD5UZXN0cyBkZWxldGVFbnRyeSBjb21tYW5kLjwvcD4KKzwvYm9keT4KKzwvaHRtbD4K