diff options
author | Dirk Huss <dirk_huss@mentor.com> | 2015-11-30 18:27:09 +0100 |
---|---|---|
committer | Dirk Huss <dirk_huss@mentor.com> | 2015-11-30 18:27:09 +0100 |
commit | b545ed39392a73c1f3c432ec6ae3558f6ab161d5 (patch) | |
tree | 93ce93d4360b62cb7896bd2464183e6b3393112b | |
parent | b6f81b22fcf8d9cf8ee9248408b7d2a72fbff1d9 (diff) | |
download | genivi-common-api-runtime-b545ed39392a73c1f3c432ec6ae3558f6ab161d5.tar.gz |
CommonAPI 3.1.4p13.1.4p1
-rw-r--r-- | src/CommonAPI/Runtime.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/CommonAPI/Runtime.cpp b/src/CommonAPI/Runtime.cpp index b226e52..b2cab99 100644 --- a/src/CommonAPI/Runtime.cpp +++ b/src/CommonAPI/Runtime.cpp @@ -213,7 +213,8 @@ Runtime::createProxy( // ...it seems do not, lets try to load a library that does... std::lock_guard<std::mutex> itsGuard(loadMutex_); std::string library = getLibrary(_domain, _interface, _instance, true); - if (loadLibrary(library)) { + loadLibrary(library); + { proxy = createProxyHelper(_domain, _interface, _instance, _connectionId, true); } } @@ -231,7 +232,8 @@ Runtime::createProxy( // ...it seems do not, lets try to load a library that does... std::lock_guard<std::mutex> itsGuard(loadMutex_); std::string library = getLibrary(_domain, _interface, _instance, true); - if (loadLibrary(library)) { + loadLibrary(library); + { proxy = createProxyHelper(_domain, _interface, _instance, _context, true); } } @@ -247,7 +249,8 @@ Runtime::registerStub(const std::string &_domain, const std::string &_interface, if (!isRegistered) { std::string library = getLibrary(_domain, _interface, _instance, false); std::lock_guard<std::mutex> itsGuard(loadMutex_); - if (loadLibrary(library)) { + loadLibrary(library); + { isRegistered = registerStubHelper(_domain, _interface, _instance, _stub, _connectionId, true); } } @@ -262,7 +265,8 @@ Runtime::registerStub(const std::string &_domain, const std::string &_interface, if (!isRegistered) { std::string library = getLibrary(_domain, _interface, _instance, false); std::lock_guard<std::mutex> itsGuard(loadMutex_); - if (loadLibrary(library)) { + loadLibrary(library); + { isRegistered = registerStubHelper(_domain, _interface, _instance, _stub, _context, true); } } @@ -338,7 +342,7 @@ Runtime::loadLibrary(const std::string &_library) { loadedLibraries_.insert(itsLibrary); COMMONAPI_DEBUG("Loading interface library \"", itsLibrary, "\" succeeded."); } else { - COMMONAPI_ERROR("Loading interface library \"", itsLibrary, "\" failed (", GetLastError(), ")"); + //COMMONAPI_ERROR("Loading interface library \"", itsLibrary, "\" failed (", GetLastError(), ")"); isLoaded = false; } #else @@ -347,7 +351,7 @@ Runtime::loadLibrary(const std::string &_library) { COMMONAPI_DEBUG("Loading interface library \"", itsLibrary, "\" succeeded."); } else { - COMMONAPI_ERROR("Loading interface library \"", itsLibrary, "\" failed (", dlerror(), ")"); + //COMMONAPI_ERROR("Loading interface library \"", itsLibrary, "\" failed (", dlerror(), ")"); isLoaded = false; } #endif |