diff options
| author | Alex Kutsan <akutsan@luxoft.com> | 2017-01-27 16:28:34 +0200 |
|---|---|---|
| committer | Alex Kutsan <akutsan@luxoft.com> | 2017-01-27 16:28:34 +0200 |
| commit | 6b408ccced65e5bc7ce0d911cc4884223eaeac56 (patch) | |
| tree | c3495a73ec8a16f681433448023f43b0e973334a /src/components/utils | |
| parent | 6cc4475f1300dfd351d3b203d9881fa6fe6e4ee1 (diff) | |
| parent | 55d7b3429d974e9e4d945920a93cdec02f2dcb06 (diff) | |
| download | sdl_core-6b408ccced65e5bc7ce0d911cc4884223eaeac56.tar.gz | |
Merge release to develop
Diffstat (limited to 'src/components/utils')
| -rw-r--r-- | src/components/utils/src/lock_posix.cc | 2 | ||||
| -rw-r--r-- | src/components/utils/src/sqlite_wrapper/sql_database.cc | 3 | ||||
| -rw-r--r-- | src/components/utils/test/CMakeLists.txt | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/components/utils/src/lock_posix.cc b/src/components/utils/src/lock_posix.cc index 0a678123f0..9b90ad20b9 100644 --- a/src/components/utils/src/lock_posix.cc +++ b/src/components/utils/src/lock_posix.cc @@ -80,7 +80,7 @@ void Lock::Acquire() { LOG4CXX_FATAL(logger_, "Failed to acquire mutex " << &mutex_ << ": " << strerror(status)); - DCHECK(status != 0); + NOTREACHED(); } else { AssertFreeAndMarkTaken(); } diff --git a/src/components/utils/src/sqlite_wrapper/sql_database.cc b/src/components/utils/src/sqlite_wrapper/sql_database.cc index e507b0b38b..a73d117109 100644 --- a/src/components/utils/src/sqlite_wrapper/sql_database.cc +++ b/src/components/utils/src/sqlite_wrapper/sql_database.cc @@ -54,6 +54,9 @@ bool SQLDatabase::Open() { if (conn_) return true; error_ = sqlite3_open(get_path().c_str(), &conn_); + if (error_ != SQLITE_OK) { + conn_ = NULL; + } return error_ == SQLITE_OK; } diff --git a/src/components/utils/test/CMakeLists.txt b/src/components/utils/test/CMakeLists.txt index 81e7d15bcb..f6bd24ff09 100644 --- a/src/components/utils/test/CMakeLists.txt +++ b/src/components/utils/test/CMakeLists.txt @@ -37,7 +37,7 @@ include_directories ( ${COMPONENTS_DIR}/utils/include ${COMPONENTS_DIR}/rpc_base/include ${COMPONENTS_DIR}/utils/test/include - ${COMPONENTS_DIR}/policy/include + ${POLICY_PATH}/include ) set(EXCLUDE_PATHS |