145993 2015-06-15 16:45:38 -0700 IDB: Records table migration doesn't work with all versions of SQLite 2022-02-28 04:09:45 -0800 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) All All ASSIGNED InRadar P2 Normal --- 1 beidson beidson ap commit-queue jonlee sam oldest_to_newest 1102086 0 beidson 2015-06-15 16:45:38 -0700 IDB: Records table migration doesn't work with all versions of SQLite Getting the current Records table schema from the sqlite_master table does not necessarily return the exact SQL used to create the table. Some SQLites will return a quoted table name in the returned SQL, and others will have the table name be unquoted. In the createOrMigrateRecordsTableIfNecessary() function we should check for both the quoted and unquoted schemas. 1102088 1 254907 beidson 2015-06-15 16:52:06 -0700 Created attachment 254907 Patch v1 1102092 2 254907 jonlee 2015-06-15 17:19:02 -0700 Comment on attachment 254907 Patch v1 Provisional r=me 1102093 3 jonlee 2015-06-15 17:20:51 -0700 CC'ing some folks who might be able to give a real r+. 1102247 4 254907 darin 2015-06-16 09:39:40 -0700 Comment on attachment 254907 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=254907&action=review > Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp:63 > + StringBuilder builder; > + builder.appendLiteral("CREATE TABLE "); > + builder.append(tableName); > + builder.appendLiteral(" (objectStoreID INTEGER NOT NULL ON CONFLICT FAIL, key TEXT COLLATE IDBKEY NOT NULL ON CONFLICT FAIL UNIQUE ON CONFLICT REPLACE, value NOT NULL ON CONFLICT FAIL)"); > + return builder.toString(); This is something that would be more efficient with just the "+" operator or makeString rather than a StringBuilder. 1102264 5 254957 beidson 2015-06-16 10:45:38 -0700 Created attachment 254957 Patch for landing 1102269 6 254957 commit-queue 2015-06-16 10:49:03 -0700 Comment on attachment 254957 Patch for landing Rejecting attachment 254957 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.appspot.com', '--bot-id=webkit-cq-02', 'validate-changelog', '--check-oops', '--non-interactive', 254957, '--port=mac']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit /Volumes/Data/EWS/WebKit/Source/WebKit2/ChangeLog neither lists a valid reviewer nor contains the string "Unreviewed" or "Rubber stamp" (case insensitive). Full output: http://webkit-queues.appspot.com/results/6073680211738624 1102272 7 beidson 2015-06-16 10:50:43 -0700 (In reply to comment #6) > Comment on attachment 254957 [details] > Patch for landing > > Rejecting attachment 254957 [details] from commit-queue. > > Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', > '--status-host=webkit-queues.appspot.com', '--bot-id=webkit-cq-02', > 'validate-changelog', '--check-oops', '--non-interactive', 254957, > '--port=mac']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit > > /Volumes/Data/EWS/WebKit/Source/WebKit2/ChangeLog neither lists a valid > reviewer nor contains the string "Unreviewed" or "Rubber stamp" (case > insensitive). > Wrong. Thanks, tools. 1102274 8 254958 beidson 2015-06-16 10:51:52 -0700 Created attachment 254958 Patch for landing v2 1102290 9 beidson 2015-06-16 11:27:41 -0700 rdar://problem/17357002 1102297 10 254958 commit-queue 2015-06-16 11:42:01 -0700 Comment on attachment 254958 Patch for landing v2 Clearing flags on attachment: 254958 Committed r185599: <http://trac.webkit.org/changeset/185599> 254907 2015-06-15 16:52:06 -0700 2022-02-28 04:09:45 -0800 Patch v1 patch text/plain 4084 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAzNDZlMzRiLi42MTgxYWUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTUtMDYtMTUgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAg ICAgIElEQjogUmVjb3JkcyB0YWJsZSBtaWdyYXRpb24gZG9lc24ndCB3b3JrIHdpdGggYWxsIHZl cnNpb25zIG9mIFNRTGl0ZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE0NTk5MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogRGF0YWJhc2VQcm9jZXNzL0luZGV4ZWREQi9zcWxpdGUvVW5pcXVlSURCRGF0 YWJhc2VCYWNraW5nU3RvcmVTUUxpdGUuY3BwOgorICAgICAgICAoV2ViS2l0Ojp2MVJlY29yZHNU YWJsZVNjaGVtYSk6CisgICAgICAgIChXZWJLaXQ6OnYxUmVjb3Jkc1RhYmxlU2NoZW1hQWx0ZXJu YXRlKToKKyAgICAgICAgKFdlYktpdDo6djJSZWNvcmRzVGFibGVTY2hlbWFBbHRlcm5hdGUpOgor ICAgICAgICAoV2ViS2l0OjpjcmVhdGVPck1pZ3JhdGVSZWNvcmRzVGFibGVJZk5lY2Vzc2FyeSk6 IENoZWNrIGJvdGggdjEgYW5kIHYxIEFsdGVybmF0ZSB3aGVuZXZlciB3ZSBjaGVjayBmb3IgdGhl IHYxIHNjaGVtYS4KKyAgICAgICAgICBEaXR0byBmb3IgdGhlIHYyIHNjaGVtYS4gQ3Jhc2ggYWxs IGJ1aWxkcyBpZiB0aGUgY3VycmVudCBzY2hlbWEgaXMgbm9uZSBvZiB0aGVzZS4KKwogMjAxNS0w Ni0xNSAgSHl1bmd3b29rIExlZSAgPGh5dW5nd29vay5sZWVAbmF2ZXJjb3JwLmNvbT4KIAogICAg ICAgICBbRUZMXSBNYWtlIHNlbmQvcmVjZWl2ZSBtZXNzYWdlcyB0byBjb21tdW5pY2F0ZSB0aGUg V2ViIGFuZCBVSSBQcm9jZXNzZXMgdXNpbmcgSW5qZWN0ZWQgQnVuZGxlLgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvRGF0YWJhc2VQcm9jZXNzL0luZGV4ZWREQi9zcWxpdGUvVW5pcXVlSURC RGF0YWJhc2VCYWNraW5nU3RvcmVTUUxpdGUuY3BwIGIvU291cmNlL1dlYktpdDIvRGF0YWJhc2VQ cm9jZXNzL0luZGV4ZWREQi9zcWxpdGUvVW5pcXVlSURCRGF0YWJhc2VCYWNraW5nU3RvcmVTUUxp dGUuY3BwCmluZGV4IGY0NWNjMzcuLmNjZWRjZDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L0RhdGFiYXNlUHJvY2Vzcy9JbmRleGVkREIvc3FsaXRlL1VuaXF1ZUlEQkRhdGFiYXNlQmFja2lu Z1N0b3JlU1FMaXRlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9EYXRhYmFzZVByb2Nlc3MvSW5k ZXhlZERCL3NxbGl0ZS9VbmlxdWVJREJEYXRhYmFzZUJhY2tpbmdTdG9yZVNRTGl0ZS5jcHAKQEAg LTU0LDEwICs1NCwyNCBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKIC8vIEN1cnJlbnQgdmVyc2lvbiBv ZiB0aGUgbWV0YWRhdGEgc2NoZW1hIGJlaW5nIHVzZWQgaW4gdGhlIG1ldGFkYXRhIGRhdGFiYXNl Lgogc3RhdGljIGNvbnN0IGludCBjdXJyZW50TWV0YWRhdGFWZXJzaW9uID0gMTsKIAorc3RhdGlj IGNvbnN0IFN0cmluZyB2MVJlY29yZHNUYWJsZVNjaGVtYShjb25zdCBTdHJpbmcmIHRhYmxlTmFt ZSkKK3sKKyAgICBTdHJpbmdCdWlsZGVyIGJ1aWxkZXI7CisgICAgYnVpbGRlci5hcHBlbmRMaXRl cmFsKCJDUkVBVEUgVEFCTEUgIik7CisgICAgYnVpbGRlci5hcHBlbmQodGFibGVOYW1lKTsKKyAg ICBidWlsZGVyLmFwcGVuZExpdGVyYWwoIiAob2JqZWN0U3RvcmVJRCBJTlRFR0VSIE5PVCBOVUxM IE9OIENPTkZMSUNUIEZBSUwsIGtleSBURVhUIENPTExBVEUgSURCS0VZIE5PVCBOVUxMIE9OIENP TkZMSUNUIEZBSUwgVU5JUVVFIE9OIENPTkZMSUNUIFJFUExBQ0UsIHZhbHVlIE5PVCBOVUxMIE9O IENPTkZMSUNUIEZBSUwpIik7CisgICAgcmV0dXJuIGJ1aWxkZXIudG9TdHJpbmcoKTsKK30KKwog c3RhdGljIGNvbnN0IFN0cmluZyYgdjFSZWNvcmRzVGFibGVTY2hlbWEoKQogewotICAgIHN0YXRp YyBOZXZlckRlc3Ryb3llZDxXVEY6OlN0cmluZz4gdjFSZWNvcmRzVGFibGVTY2hlbWFTdHJpbmco QVNDSUlMaXRlcmFsKAotICAgICAgICAiQ1JFQVRFIFRBQkxFIFJlY29yZHMgKG9iamVjdFN0b3Jl SUQgSU5URUdFUiBOT1QgTlVMTCBPTiBDT05GTElDVCBGQUlMLCBrZXkgVEVYVCBDT0xMQVRFIElE QktFWSBOT1QgTlVMTCBPTiBDT05GTElDVCBGQUlMIFVOSVFVRSBPTiBDT05GTElDVCBSRVBMQUNF LCB2YWx1ZSBOT1QgTlVMTCBPTiBDT05GTElDVCBGQUlMKSIpKTsKKyAgICBzdGF0aWMgTmV2ZXJE ZXN0cm95ZWQ8V1RGOjpTdHJpbmc+IHYxUmVjb3Jkc1RhYmxlU2NoZW1hU3RyaW5nKHYxUmVjb3Jk c1RhYmxlU2NoZW1hKCJSZWNvcmRzIikpOworICAgIHJldHVybiB2MVJlY29yZHNUYWJsZVNjaGVt YVN0cmluZzsKK30KKworc3RhdGljIGNvbnN0IFN0cmluZyYgdjFSZWNvcmRzVGFibGVTY2hlbWFB bHRlcm5hdGUoKQoreworICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxXVEY6OlN0cmluZz4gdjFS ZWNvcmRzVGFibGVTY2hlbWFTdHJpbmcodjFSZWNvcmRzVGFibGVTY2hlbWEoIlwiUmVjb3Jkc1wi IikpOwogICAgIHJldHVybiB2MVJlY29yZHNUYWJsZVNjaGVtYVN0cmluZzsKIH0KIApAQCAtNzYs NiArOTAsMTIgQEAgc3RhdGljIGNvbnN0IFN0cmluZyYgdjJSZWNvcmRzVGFibGVTY2hlbWEoKQog ICAgIHJldHVybiB2MlJlY29yZHNUYWJsZVNjaGVtYVN0cmluZzsKIH0KIAorc3RhdGljIGNvbnN0 IFN0cmluZyYgdjJSZWNvcmRzVGFibGVTY2hlbWFBbHRlcm5hdGUoKQoreworICAgIHN0YXRpYyBO ZXZlckRlc3Ryb3llZDxXVEY6OlN0cmluZz4gdjJSZWNvcmRzVGFibGVTY2hlbWFTdHJpbmcodjJS ZWNvcmRzVGFibGVTY2hlbWEoIlwiUmVjb3Jkc1wiIikpOworICAgIHJldHVybiB2MlJlY29yZHNU YWJsZVNjaGVtYVN0cmluZzsKK30KKwogc3RhdGljIGludDY0X3QgZ2VuZXJhdGVEYXRhYmFzZUlk KCkKIHsKICAgICBzdGF0aWMgaW50NjRfdCBkYXRhYmFzZUlEID0gMDsKQEAgLTE0MCwxNCArMTYw LDEzIEBAIHN0YXRpYyBib29sIGNyZWF0ZU9yTWlncmF0ZVJlY29yZHNUYWJsZUlmTmVjZXNzYXJ5 KFNRTGl0ZURhdGFiYXNlJiBkYXRhYmFzZSkKICAgICBBU1NFUlQoIWN1cnJlbnRTY2hlbWEuaXNF bXB0eSgpKTsKIAogICAgIC8vIElmIHRoZSBzY2hlbWEgaW4gdGhlIGJhY2tpbmcgc3RvcmUgaXMg dGhlIGN1cnJlbnQgc2NoZW1hLCB3ZSdyZSBkb25lLgotICAgIGlmIChjdXJyZW50U2NoZW1hID09 IHYyUmVjb3Jkc1RhYmxlU2NoZW1hKCkpCisgICAgaWYgKGN1cnJlbnRTY2hlbWEgPT0gdjJSZWNv cmRzVGFibGVTY2hlbWEoKSB8fCBjdXJyZW50U2NoZW1hID09IHYyUmVjb3Jkc1RhYmxlU2NoZW1h QWx0ZXJuYXRlKCkpCiAgICAgICAgIHJldHVybiB0cnVlOwogCi0gICAgLy8gQ3VycmVudGx5IHRo ZSBSZWNvcmRzIHRhYmxlIHNob3VsZCBvbmx5IGJlIG9uZSBvZiBlaXRoZXIgdGhlIHYxIG9yIHYy IHNjaGVtYXMuCi0gICAgaWYgKGN1cnJlbnRTY2hlbWEgIT0gdjFSZWNvcmRzVGFibGVTY2hlbWEo KSkgewotICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICAgICAgcmV0dXJuIGZhbHNl OwotICAgIH0KKyAgICAvLyBJZiB0aGUgcmVjb3JkIHRhYmxlIGlzIG5vdCB0aGUgY3VycmVudCBz Y2hlbWEgdGhlbiBpdCBtdXN0IGJlIG9uZSBvZiB0aGUgcHJldmlvdXMgc2NoZW1hcy4KKyAgICAv LyBJZiBpdCBpcyBub3QgdGhlbiB0aGUgZGF0YWJhc2UgaXMgaW4gYW4gdW5yZWNvdmVyYWJsZSBz dGF0ZSBhbmQgdGhpcyBzaG91bGQgYmUgY29uc2lkZXJlZCBhIGZhdGFsIGVycm9yLgorICAgIGlm IChjdXJyZW50U2NoZW1hICE9IHYxUmVjb3Jkc1RhYmxlU2NoZW1hKCkgJiYgY3VycmVudFNjaGVt YSAhPSB2MVJlY29yZHNUYWJsZVNjaGVtYUFsdGVybmF0ZSgpKQorICAgICAgICBSRUxFQVNFX0FT U0VSVF9OT1RfUkVBQ0hFRCgpOwogCiAgICAgU1FMaXRlVHJhbnNhY3Rpb24gdHJhbnNhY3Rpb24o ZGF0YWJhc2UpOwogICAgIHRyYW5zYWN0aW9uLmJlZ2luKCk7Cg== 254957 2015-06-16 10:45:38 -0700 2015-06-16 10:51:52 -0700 Patch for landing patch text/plain 4657 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAzNDZlMzRiLi5iYTdmYTFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTUtMDYtMTYgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAg ICAgIElEQjogUmVjb3JkcyB0YWJsZSBtaWdyYXRpb24gZG9lc24ndCB3b3JrIHdpdGggYWxsIHZl cnNpb25zIG9mIFNRTGl0ZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE0NTk5MworCisgICAgICAgIFByb3Zpc2lvbmFsbHkgcmV2aWV3ZWQgYnkgSm9u IExlZSwgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCisKKyAgICAgICAgKiBEYXRhYmFzZVByb2Nl c3MvSW5kZXhlZERCL3NxbGl0ZS9VbmlxdWVJREJEYXRhYmFzZUJhY2tpbmdTdG9yZVNRTGl0ZS5j cHA6CisgICAgICAgIChXZWJLaXQ6OnYxUmVjb3Jkc1RhYmxlU2NoZW1hKToKKyAgICAgICAgKFdl YktpdDo6djFSZWNvcmRzVGFibGVTY2hlbWFBbHRlcm5hdGUpOgorICAgICAgICAoV2ViS2l0Ojp2 MlJlY29yZHNUYWJsZVNjaGVtYSk6CisgICAgICAgIChXZWJLaXQ6OnYyUmVjb3Jkc1RhYmxlU2No ZW1hQWx0ZXJuYXRlKToKKyAgICAgICAgKFdlYktpdDo6Y3JlYXRlT3JNaWdyYXRlUmVjb3Jkc1Rh YmxlSWZOZWNlc3NhcnkpOiBDaGVjayBib3RoIHYxIGFuZCB2MSBBbHRlcm5hdGUgd2hlbmV2ZXIg d2UgY2hlY2sgZm9yIHRoZSB2MSBzY2hlbWEuCisgICAgICAgICAgRGl0dG8gZm9yIHRoZSB2MiBz Y2hlbWEuIENyYXNoIGFsbCBidWlsZHMgaWYgdGhlIGN1cnJlbnQgc2NoZW1hIGlzIG5vbmUgb2Yg dGhlc2UuCisKIDIwMTUtMDYtMTUgIEh5dW5nd29vayBMZWUgIDxoeXVuZ3dvb2subGVlQG5hdmVy Y29ycC5jb20+CiAKICAgICAgICAgW0VGTF0gTWFrZSBzZW5kL3JlY2VpdmUgbWVzc2FnZXMgdG8g Y29tbXVuaWNhdGUgdGhlIFdlYiBhbmQgVUkgUHJvY2Vzc2VzIHVzaW5nIEluamVjdGVkIEJ1bmRs ZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0RhdGFiYXNlUHJvY2Vzcy9JbmRleGVkREIv c3FsaXRlL1VuaXF1ZUlEQkRhdGFiYXNlQmFja2luZ1N0b3JlU1FMaXRlLmNwcCBiL1NvdXJjZS9X ZWJLaXQyL0RhdGFiYXNlUHJvY2Vzcy9JbmRleGVkREIvc3FsaXRlL1VuaXF1ZUlEQkRhdGFiYXNl QmFja2luZ1N0b3JlU1FMaXRlLmNwcAppbmRleCBmNDVjYzM3Li44ZjBiY2ZmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9EYXRhYmFzZVByb2Nlc3MvSW5kZXhlZERCL3NxbGl0ZS9VbmlxdWVJ REJEYXRhYmFzZUJhY2tpbmdTdG9yZVNRTGl0ZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvRGF0 YWJhc2VQcm9jZXNzL0luZGV4ZWREQi9zcWxpdGUvVW5pcXVlSURCRGF0YWJhc2VCYWNraW5nU3Rv cmVTUUxpdGUuY3BwCkBAIC01NCwyMCArNTQsMjYgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiAvLyBD dXJyZW50IHZlcnNpb24gb2YgdGhlIG1ldGFkYXRhIHNjaGVtYSBiZWluZyB1c2VkIGluIHRoZSBt ZXRhZGF0YSBkYXRhYmFzZS4KIHN0YXRpYyBjb25zdCBpbnQgY3VycmVudE1ldGFkYXRhVmVyc2lv biA9IDE7CiAKK3N0YXRpYyBjb25zdCBTdHJpbmcgdjFSZWNvcmRzVGFibGVTY2hlbWEoY29uc3Qg U3RyaW5nJiB0YWJsZU5hbWUpCit7CisgICAgcmV0dXJuIG1ha2VTdHJpbmcoIkNSRUFURSBUQUJM RSAiLCB0YWJsZU5hbWUsICIgKG9iamVjdFN0b3JlSUQgSU5URUdFUiBOT1QgTlVMTCBPTiBDT05G TElDVCBGQUlMLCBrZXkgVEVYVCBDT0xMQVRFIElEQktFWSBOT1QgTlVMTCBPTiBDT05GTElDVCBG QUlMIFVOSVFVRSBPTiBDT05GTElDVCBSRVBMQUNFLCB2YWx1ZSBOT1QgTlVMTCBPTiBDT05GTElD VCBGQUlMKSIpOworfQorCiBzdGF0aWMgY29uc3QgU3RyaW5nJiB2MVJlY29yZHNUYWJsZVNjaGVt YSgpCiB7Ci0gICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPFdURjo6U3RyaW5nPiB2MVJlY29yZHNU YWJsZVNjaGVtYVN0cmluZyhBU0NJSUxpdGVyYWwoCi0gICAgICAgICJDUkVBVEUgVEFCTEUgUmVj b3JkcyAob2JqZWN0U3RvcmVJRCBJTlRFR0VSIE5PVCBOVUxMIE9OIENPTkZMSUNUIEZBSUwsIGtl eSBURVhUIENPTExBVEUgSURCS0VZIE5PVCBOVUxMIE9OIENPTkZMSUNUIEZBSUwgVU5JUVVFIE9O IENPTkZMSUNUIFJFUExBQ0UsIHZhbHVlIE5PVCBOVUxMIE9OIENPTkZMSUNUIEZBSUwpIikpOwor ICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxXVEY6OlN0cmluZz4gdjFSZWNvcmRzVGFibGVTY2hl bWFTdHJpbmcodjFSZWNvcmRzVGFibGVTY2hlbWEoIlJlY29yZHMiKSk7CisgICAgcmV0dXJuIHYx UmVjb3Jkc1RhYmxlU2NoZW1hU3RyaW5nOworfQorCitzdGF0aWMgY29uc3QgU3RyaW5nJiB2MVJl Y29yZHNUYWJsZVNjaGVtYUFsdGVybmF0ZSgpCit7CisgICAgc3RhdGljIE5ldmVyRGVzdHJveWVk PFdURjo6U3RyaW5nPiB2MVJlY29yZHNUYWJsZVNjaGVtYVN0cmluZyh2MVJlY29yZHNUYWJsZVNj aGVtYSgiXCJSZWNvcmRzXCIiKSk7CiAgICAgcmV0dXJuIHYxUmVjb3Jkc1RhYmxlU2NoZW1hU3Ry aW5nOwogfQogCiBzdGF0aWMgY29uc3QgU3RyaW5nIHYyUmVjb3Jkc1RhYmxlU2NoZW1hKGNvbnN0 IFN0cmluZyYgdGFibGVOYW1lKQogewotICAgIFN0cmluZ0J1aWxkZXIgYnVpbGRlcjsKLSAgICBi dWlsZGVyLmFwcGVuZExpdGVyYWwoIkNSRUFURSBUQUJMRSAiKTsKLSAgICBidWlsZGVyLmFwcGVu ZCh0YWJsZU5hbWUpOwotICAgIGJ1aWxkZXIuYXBwZW5kTGl0ZXJhbCgiIChvYmplY3RTdG9yZUlE IElOVEVHRVIgTk9UIE5VTEwgT04gQ09ORkxJQ1QgRkFJTCwga2V5IFRFWFQgQ09MTEFURSBJREJL RVkgTk9UIE5VTEwgT04gQ09ORkxJQ1QgRkFJTCwgdmFsdWUgTk9UIE5VTEwgT04gQ09ORkxJQ1Qg RkFJTCkiKTsKLSAgICByZXR1cm4gYnVpbGRlci50b1N0cmluZygpOworICAgIHJldHVybiBtYWtl U3RyaW5nKCJDUkVBVEUgVEFCTEUgIiwgdGFibGVOYW1lLCAiIChvYmplY3RTdG9yZUlEIElOVEVH RVIgTk9UIE5VTEwgT04gQ09ORkxJQ1QgRkFJTCwga2V5IFRFWFQgQ09MTEFURSBJREJLRVkgTk9U IE5VTEwgT04gQ09ORkxJQ1QgRkFJTCwgdmFsdWUgTk9UIE5VTEwgT04gQ09ORkxJQ1QgRkFJTCki KTsKIH0KIAogc3RhdGljIGNvbnN0IFN0cmluZyYgdjJSZWNvcmRzVGFibGVTY2hlbWEoKQpAQCAt NzYsNiArODIsMTIgQEAgc3RhdGljIGNvbnN0IFN0cmluZyYgdjJSZWNvcmRzVGFibGVTY2hlbWEo KQogICAgIHJldHVybiB2MlJlY29yZHNUYWJsZVNjaGVtYVN0cmluZzsKIH0KIAorc3RhdGljIGNv bnN0IFN0cmluZyYgdjJSZWNvcmRzVGFibGVTY2hlbWFBbHRlcm5hdGUoKQoreworICAgIHN0YXRp YyBOZXZlckRlc3Ryb3llZDxXVEY6OlN0cmluZz4gdjJSZWNvcmRzVGFibGVTY2hlbWFTdHJpbmco djJSZWNvcmRzVGFibGVTY2hlbWEoIlwiUmVjb3Jkc1wiIikpOworICAgIHJldHVybiB2MlJlY29y ZHNUYWJsZVNjaGVtYVN0cmluZzsKK30KKwogc3RhdGljIGludDY0X3QgZ2VuZXJhdGVEYXRhYmFz ZUlkKCkKIHsKICAgICBzdGF0aWMgaW50NjRfdCBkYXRhYmFzZUlEID0gMDsKQEAgLTE0MCwxNCAr MTUyLDEzIEBAIHN0YXRpYyBib29sIGNyZWF0ZU9yTWlncmF0ZVJlY29yZHNUYWJsZUlmTmVjZXNz YXJ5KFNRTGl0ZURhdGFiYXNlJiBkYXRhYmFzZSkKICAgICBBU1NFUlQoIWN1cnJlbnRTY2hlbWEu aXNFbXB0eSgpKTsKIAogICAgIC8vIElmIHRoZSBzY2hlbWEgaW4gdGhlIGJhY2tpbmcgc3RvcmUg aXMgdGhlIGN1cnJlbnQgc2NoZW1hLCB3ZSdyZSBkb25lLgotICAgIGlmIChjdXJyZW50U2NoZW1h ID09IHYyUmVjb3Jkc1RhYmxlU2NoZW1hKCkpCisgICAgaWYgKGN1cnJlbnRTY2hlbWEgPT0gdjJS ZWNvcmRzVGFibGVTY2hlbWEoKSB8fCBjdXJyZW50U2NoZW1hID09IHYyUmVjb3Jkc1RhYmxlU2No ZW1hQWx0ZXJuYXRlKCkpCiAgICAgICAgIHJldHVybiB0cnVlOwogCi0gICAgLy8gQ3VycmVudGx5 IHRoZSBSZWNvcmRzIHRhYmxlIHNob3VsZCBvbmx5IGJlIG9uZSBvZiBlaXRoZXIgdGhlIHYxIG9y IHYyIHNjaGVtYXMuCi0gICAgaWYgKGN1cnJlbnRTY2hlbWEgIT0gdjFSZWNvcmRzVGFibGVTY2hl bWEoKSkgewotICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICAgICAgcmV0dXJuIGZh bHNlOwotICAgIH0KKyAgICAvLyBJZiB0aGUgcmVjb3JkIHRhYmxlIGlzIG5vdCB0aGUgY3VycmVu dCBzY2hlbWEgdGhlbiBpdCBtdXN0IGJlIG9uZSBvZiB0aGUgcHJldmlvdXMgc2NoZW1hcy4KKyAg ICAvLyBJZiBpdCBpcyBub3QgdGhlbiB0aGUgZGF0YWJhc2UgaXMgaW4gYW4gdW5yZWNvdmVyYWJs ZSBzdGF0ZSBhbmQgdGhpcyBzaG91bGQgYmUgY29uc2lkZXJlZCBhIGZhdGFsIGVycm9yLgorICAg IGlmIChjdXJyZW50U2NoZW1hICE9IHYxUmVjb3Jkc1RhYmxlU2NoZW1hKCkgJiYgY3VycmVudFNj aGVtYSAhPSB2MVJlY29yZHNUYWJsZVNjaGVtYUFsdGVybmF0ZSgpKQorICAgICAgICBSRUxFQVNF X0FTU0VSVF9OT1RfUkVBQ0hFRCgpOwogCiAgICAgU1FMaXRlVHJhbnNhY3Rpb24gdHJhbnNhY3Rp b24oZGF0YWJhc2UpOwogICAgIHRyYW5zYWN0aW9uLmJlZ2luKCk7Cg== 254958 2015-06-16 10:51:52 -0700 2015-06-16 11:42:01 -0700 Patch for landing v2 patch text/plain 4657 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAzNDZlMzRiLi5iNjI2ZjFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTUtMDYtMTYgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAg ICAgIElEQjogUmVjb3JkcyB0YWJsZSBtaWdyYXRpb24gZG9lc24ndCB3b3JrIHdpdGggYWxsIHZl cnNpb25zIG9mIFNRTGl0ZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE0NTk5MworCisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLCBwcm92 aXNpb25hbGx5IHJldmlld2VkIGJ5IEpvbiBMZWUuCisKKyAgICAgICAgKiBEYXRhYmFzZVByb2Nl c3MvSW5kZXhlZERCL3NxbGl0ZS9VbmlxdWVJREJEYXRhYmFzZUJhY2tpbmdTdG9yZVNRTGl0ZS5j cHA6CisgICAgICAgIChXZWJLaXQ6OnYxUmVjb3Jkc1RhYmxlU2NoZW1hKToKKyAgICAgICAgKFdl YktpdDo6djFSZWNvcmRzVGFibGVTY2hlbWFBbHRlcm5hdGUpOgorICAgICAgICAoV2ViS2l0Ojp2 MlJlY29yZHNUYWJsZVNjaGVtYSk6CisgICAgICAgIChXZWJLaXQ6OnYyUmVjb3Jkc1RhYmxlU2No ZW1hQWx0ZXJuYXRlKToKKyAgICAgICAgKFdlYktpdDo6Y3JlYXRlT3JNaWdyYXRlUmVjb3Jkc1Rh YmxlSWZOZWNlc3NhcnkpOiBDaGVjayBib3RoIHYxIGFuZCB2MSBBbHRlcm5hdGUgd2hlbmV2ZXIg d2UgY2hlY2sgZm9yIHRoZSB2MSBzY2hlbWEuCisgICAgICAgICAgRGl0dG8gZm9yIHRoZSB2MiBz Y2hlbWEuIENyYXNoIGFsbCBidWlsZHMgaWYgdGhlIGN1cnJlbnQgc2NoZW1hIGlzIG5vbmUgb2Yg dGhlc2UuCisKIDIwMTUtMDYtMTUgIEh5dW5nd29vayBMZWUgIDxoeXVuZ3dvb2subGVlQG5hdmVy Y29ycC5jb20+CiAKICAgICAgICAgW0VGTF0gTWFrZSBzZW5kL3JlY2VpdmUgbWVzc2FnZXMgdG8g Y29tbXVuaWNhdGUgdGhlIFdlYiBhbmQgVUkgUHJvY2Vzc2VzIHVzaW5nIEluamVjdGVkIEJ1bmRs ZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0RhdGFiYXNlUHJvY2Vzcy9JbmRleGVkREIv c3FsaXRlL1VuaXF1ZUlEQkRhdGFiYXNlQmFja2luZ1N0b3JlU1FMaXRlLmNwcCBiL1NvdXJjZS9X ZWJLaXQyL0RhdGFiYXNlUHJvY2Vzcy9JbmRleGVkREIvc3FsaXRlL1VuaXF1ZUlEQkRhdGFiYXNl QmFja2luZ1N0b3JlU1FMaXRlLmNwcAppbmRleCBmNDVjYzM3Li44ZjBiY2ZmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9EYXRhYmFzZVByb2Nlc3MvSW5kZXhlZERCL3NxbGl0ZS9VbmlxdWVJ REJEYXRhYmFzZUJhY2tpbmdTdG9yZVNRTGl0ZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvRGF0 YWJhc2VQcm9jZXNzL0luZGV4ZWREQi9zcWxpdGUvVW5pcXVlSURCRGF0YWJhc2VCYWNraW5nU3Rv cmVTUUxpdGUuY3BwCkBAIC01NCwyMCArNTQsMjYgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiAvLyBD dXJyZW50IHZlcnNpb24gb2YgdGhlIG1ldGFkYXRhIHNjaGVtYSBiZWluZyB1c2VkIGluIHRoZSBt ZXRhZGF0YSBkYXRhYmFzZS4KIHN0YXRpYyBjb25zdCBpbnQgY3VycmVudE1ldGFkYXRhVmVyc2lv biA9IDE7CiAKK3N0YXRpYyBjb25zdCBTdHJpbmcgdjFSZWNvcmRzVGFibGVTY2hlbWEoY29uc3Qg U3RyaW5nJiB0YWJsZU5hbWUpCit7CisgICAgcmV0dXJuIG1ha2VTdHJpbmcoIkNSRUFURSBUQUJM RSAiLCB0YWJsZU5hbWUsICIgKG9iamVjdFN0b3JlSUQgSU5URUdFUiBOT1QgTlVMTCBPTiBDT05G TElDVCBGQUlMLCBrZXkgVEVYVCBDT0xMQVRFIElEQktFWSBOT1QgTlVMTCBPTiBDT05GTElDVCBG QUlMIFVOSVFVRSBPTiBDT05GTElDVCBSRVBMQUNFLCB2YWx1ZSBOT1QgTlVMTCBPTiBDT05GTElD VCBGQUlMKSIpOworfQorCiBzdGF0aWMgY29uc3QgU3RyaW5nJiB2MVJlY29yZHNUYWJsZVNjaGVt YSgpCiB7Ci0gICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPFdURjo6U3RyaW5nPiB2MVJlY29yZHNU YWJsZVNjaGVtYVN0cmluZyhBU0NJSUxpdGVyYWwoCi0gICAgICAgICJDUkVBVEUgVEFCTEUgUmVj b3JkcyAob2JqZWN0U3RvcmVJRCBJTlRFR0VSIE5PVCBOVUxMIE9OIENPTkZMSUNUIEZBSUwsIGtl eSBURVhUIENPTExBVEUgSURCS0VZIE5PVCBOVUxMIE9OIENPTkZMSUNUIEZBSUwgVU5JUVVFIE9O IENPTkZMSUNUIFJFUExBQ0UsIHZhbHVlIE5PVCBOVUxMIE9OIENPTkZMSUNUIEZBSUwpIikpOwor ICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxXVEY6OlN0cmluZz4gdjFSZWNvcmRzVGFibGVTY2hl bWFTdHJpbmcodjFSZWNvcmRzVGFibGVTY2hlbWEoIlJlY29yZHMiKSk7CisgICAgcmV0dXJuIHYx UmVjb3Jkc1RhYmxlU2NoZW1hU3RyaW5nOworfQorCitzdGF0aWMgY29uc3QgU3RyaW5nJiB2MVJl Y29yZHNUYWJsZVNjaGVtYUFsdGVybmF0ZSgpCit7CisgICAgc3RhdGljIE5ldmVyRGVzdHJveWVk PFdURjo6U3RyaW5nPiB2MVJlY29yZHNUYWJsZVNjaGVtYVN0cmluZyh2MVJlY29yZHNUYWJsZVNj aGVtYSgiXCJSZWNvcmRzXCIiKSk7CiAgICAgcmV0dXJuIHYxUmVjb3Jkc1RhYmxlU2NoZW1hU3Ry aW5nOwogfQogCiBzdGF0aWMgY29uc3QgU3RyaW5nIHYyUmVjb3Jkc1RhYmxlU2NoZW1hKGNvbnN0 IFN0cmluZyYgdGFibGVOYW1lKQogewotICAgIFN0cmluZ0J1aWxkZXIgYnVpbGRlcjsKLSAgICBi dWlsZGVyLmFwcGVuZExpdGVyYWwoIkNSRUFURSBUQUJMRSAiKTsKLSAgICBidWlsZGVyLmFwcGVu ZCh0YWJsZU5hbWUpOwotICAgIGJ1aWxkZXIuYXBwZW5kTGl0ZXJhbCgiIChvYmplY3RTdG9yZUlE IElOVEVHRVIgTk9UIE5VTEwgT04gQ09ORkxJQ1QgRkFJTCwga2V5IFRFWFQgQ09MTEFURSBJREJL RVkgTk9UIE5VTEwgT04gQ09ORkxJQ1QgRkFJTCwgdmFsdWUgTk9UIE5VTEwgT04gQ09ORkxJQ1Qg RkFJTCkiKTsKLSAgICByZXR1cm4gYnVpbGRlci50b1N0cmluZygpOworICAgIHJldHVybiBtYWtl U3RyaW5nKCJDUkVBVEUgVEFCTEUgIiwgdGFibGVOYW1lLCAiIChvYmplY3RTdG9yZUlEIElOVEVH RVIgTk9UIE5VTEwgT04gQ09ORkxJQ1QgRkFJTCwga2V5IFRFWFQgQ09MTEFURSBJREJLRVkgTk9U IE5VTEwgT04gQ09ORkxJQ1QgRkFJTCwgdmFsdWUgTk9UIE5VTEwgT04gQ09ORkxJQ1QgRkFJTCki KTsKIH0KIAogc3RhdGljIGNvbnN0IFN0cmluZyYgdjJSZWNvcmRzVGFibGVTY2hlbWEoKQpAQCAt NzYsNiArODIsMTIgQEAgc3RhdGljIGNvbnN0IFN0cmluZyYgdjJSZWNvcmRzVGFibGVTY2hlbWEo KQogICAgIHJldHVybiB2MlJlY29yZHNUYWJsZVNjaGVtYVN0cmluZzsKIH0KIAorc3RhdGljIGNv bnN0IFN0cmluZyYgdjJSZWNvcmRzVGFibGVTY2hlbWFBbHRlcm5hdGUoKQoreworICAgIHN0YXRp YyBOZXZlckRlc3Ryb3llZDxXVEY6OlN0cmluZz4gdjJSZWNvcmRzVGFibGVTY2hlbWFTdHJpbmco djJSZWNvcmRzVGFibGVTY2hlbWEoIlwiUmVjb3Jkc1wiIikpOworICAgIHJldHVybiB2MlJlY29y ZHNUYWJsZVNjaGVtYVN0cmluZzsKK30KKwogc3RhdGljIGludDY0X3QgZ2VuZXJhdGVEYXRhYmFz ZUlkKCkKIHsKICAgICBzdGF0aWMgaW50NjRfdCBkYXRhYmFzZUlEID0gMDsKQEAgLTE0MCwxNCAr MTUyLDEzIEBAIHN0YXRpYyBib29sIGNyZWF0ZU9yTWlncmF0ZVJlY29yZHNUYWJsZUlmTmVjZXNz YXJ5KFNRTGl0ZURhdGFiYXNlJiBkYXRhYmFzZSkKICAgICBBU1NFUlQoIWN1cnJlbnRTY2hlbWEu aXNFbXB0eSgpKTsKIAogICAgIC8vIElmIHRoZSBzY2hlbWEgaW4gdGhlIGJhY2tpbmcgc3RvcmUg aXMgdGhlIGN1cnJlbnQgc2NoZW1hLCB3ZSdyZSBkb25lLgotICAgIGlmIChjdXJyZW50U2NoZW1h ID09IHYyUmVjb3Jkc1RhYmxlU2NoZW1hKCkpCisgICAgaWYgKGN1cnJlbnRTY2hlbWEgPT0gdjJS ZWNvcmRzVGFibGVTY2hlbWEoKSB8fCBjdXJyZW50U2NoZW1hID09IHYyUmVjb3Jkc1RhYmxlU2No ZW1hQWx0ZXJuYXRlKCkpCiAgICAgICAgIHJldHVybiB0cnVlOwogCi0gICAgLy8gQ3VycmVudGx5 IHRoZSBSZWNvcmRzIHRhYmxlIHNob3VsZCBvbmx5IGJlIG9uZSBvZiBlaXRoZXIgdGhlIHYxIG9y IHYyIHNjaGVtYXMuCi0gICAgaWYgKGN1cnJlbnRTY2hlbWEgIT0gdjFSZWNvcmRzVGFibGVTY2hl bWEoKSkgewotICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICAgICAgcmV0dXJuIGZh bHNlOwotICAgIH0KKyAgICAvLyBJZiB0aGUgcmVjb3JkIHRhYmxlIGlzIG5vdCB0aGUgY3VycmVu dCBzY2hlbWEgdGhlbiBpdCBtdXN0IGJlIG9uZSBvZiB0aGUgcHJldmlvdXMgc2NoZW1hcy4KKyAg ICAvLyBJZiBpdCBpcyBub3QgdGhlbiB0aGUgZGF0YWJhc2UgaXMgaW4gYW4gdW5yZWNvdmVyYWJs ZSBzdGF0ZSBhbmQgdGhpcyBzaG91bGQgYmUgY29uc2lkZXJlZCBhIGZhdGFsIGVycm9yLgorICAg IGlmIChjdXJyZW50U2NoZW1hICE9IHYxUmVjb3Jkc1RhYmxlU2NoZW1hKCkgJiYgY3VycmVudFNj aGVtYSAhPSB2MVJlY29yZHNUYWJsZVNjaGVtYUFsdGVybmF0ZSgpKQorICAgICAgICBSRUxFQVNF X0FTU0VSVF9OT1RfUkVBQ0hFRCgpOwogCiAgICAgU1FMaXRlVHJhbnNhY3Rpb24gdHJhbnNhY3Rp b24oZGF0YWJhc2UpOwogICAgIHRyYW5zYWN0aW9uLmJlZ2luKCk7Cg==