diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-09 13:38:12 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-09 13:38:12 -0700 |
| commit | dbdaeb91f76edb7ec8197c26aa78086d6154551f (patch) | |
| tree | a8f2f6704cddba3185d6a7f02cbe0428de6f4882 | |
| parent | cb86952d254446a800421b5804f886f8d87cd875 (diff) | |
| parent | 91f07d3317527703031378a388bc92853479d6a8 (diff) | |
| download | external_webkit-dbdaeb91f76edb7ec8197c26aa78086d6154551f.zip external_webkit-dbdaeb91f76edb7ec8197c26aa78086d6154551f.tar.gz external_webkit-dbdaeb91f76edb7ec8197c26aa78086d6154551f.tar.bz2 | |
Merge change 6642 into donut
* changes:
Do not merge
| -rw-r--r-- | WebCore/loader/icon/IconDatabase.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/WebCore/loader/icon/IconDatabase.cpp b/WebCore/loader/icon/IconDatabase.cpp index 5705f7a..a5ea523 100644 --- a/WebCore/loader/icon/IconDatabase.cpp +++ b/WebCore/loader/icon/IconDatabase.cpp @@ -150,6 +150,7 @@ bool IconDatabase::open(const String& databasePath) // completes and m_syncThreadRunning is properly set m_syncLock.lock(); m_syncThread = createThread(IconDatabase::iconDatabaseSyncThreadStart, this, "WebCore::IconDatabase"); + m_syncThreadRunning = m_syncThread; m_syncLock.unlock(); if (!m_syncThread) return false; @@ -2026,6 +2027,7 @@ void IconDatabase::writeIconSnapshotToSQLDatabase(const IconSnapshot& snapshot) } else { readySQLiteStatement(m_setIconInfoStatement, m_syncDB, "INSERT INTO IconInfo (url,stamp) VALUES (?, ?);"); m_setIconInfoStatement->bindText(1, snapshot.iconURL); + m_setIconInfoStatement->m_statement = 0; m_setIconInfoStatement->bindInt64(2, snapshot.timestamp); if (m_setIconInfoStatement->step() != SQLResultDone) |