diff options
author | Steve Block <steveblock@google.com> | 2009-10-08 17:19:54 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2009-10-20 00:41:58 +0100 |
commit | 231d4e3152a9c27a73b6ac7badbe6be673aa3ddf (patch) | |
tree | a6c7e2d6cd7bfa7011cc39abbb436142d7a4a7c8 /WebCore/storage/ChangeVersionWrapper.cpp | |
parent | e196732677050bd463301566a68a643b6d14b907 (diff) | |
download | external_webkit-231d4e3152a9c27a73b6ac7badbe6be673aa3ddf.zip external_webkit-231d4e3152a9c27a73b6ac7badbe6be673aa3ddf.tar.gz external_webkit-231d4e3152a9c27a73b6ac7badbe6be673aa3ddf.tar.bz2 |
Merge webkit.org at R49305 : Automatic merge by git.
Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
Diffstat (limited to 'WebCore/storage/ChangeVersionWrapper.cpp')
-rw-r--r-- | WebCore/storage/ChangeVersionWrapper.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/WebCore/storage/ChangeVersionWrapper.cpp b/WebCore/storage/ChangeVersionWrapper.cpp index a2be615..17a9407 100644 --- a/WebCore/storage/ChangeVersionWrapper.cpp +++ b/WebCore/storage/ChangeVersionWrapper.cpp @@ -34,29 +34,29 @@ namespace WebCore { ChangeVersionWrapper::ChangeVersionWrapper(const String& oldVersion, const String& newVersion) - : m_oldVersion(oldVersion.copy()) - , m_newVersion(newVersion.copy()) + : m_oldVersion(oldVersion.crossThreadString()) + , m_newVersion(newVersion.crossThreadString()) { } bool ChangeVersionWrapper::performPreflight(SQLTransaction* transaction) { ASSERT(transaction && transaction->database()); - + String actualVersion; - + if (!transaction->database()->getVersionFromDatabase(actualVersion)) { LOG_ERROR("Unable to retrieve actual current version from database"); m_sqlError = SQLError::create(0, "unable to verify current version of database"); return false; } - + if (actualVersion != m_oldVersion) { LOG_ERROR("Old version doesn't match actual version"); m_sqlError = SQLError::create(2, "current version of the database and `oldVersion` argument do not match"); return false; } - + return true; } @@ -71,10 +71,10 @@ bool ChangeVersionWrapper::performPostflight(SQLTransaction* transaction) } transaction->database()->setExpectedVersion(m_newVersion); - + return true; } - + } // namespace WebCore #endif // ENABLE(DATABASE) |