Code Review
/
apps
/
agl-service-homescreen.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix CMake files and non-debug crashes
[apps/agl-service-homescreen.git]
/
src
/
hs-clientmanager.cpp
diff --git
a/src/hs-clientmanager.cpp
b/src/hs-clientmanager.cpp
index
6e6397f
..
9b62808
100644
(file)
--- a/
src/hs-clientmanager.cpp
+++ b/
src/hs-clientmanager.cpp
@@
-1,5
+1,6
@@
/*
* Copyright (c) 2018 TOYOTA MOTOR CORPORATION
/*
* Copyright (c) 2018 TOYOTA MOTOR CORPORATION
+ * Copyright (C) 2020 Konsulko Group
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-71,6
+72,7
@@
HS_ClientManager* HS_ClientManager::instance(void)
*/
int HS_ClientManager::init(void)
{
*/
int HS_ClientManager::init(void)
{
+ return 0;
}
/**
}
/**
@@
-89,7
+91,7
@@
HS_ClientCtxt* HS_ClientManager::createClientCtxt(afb_req_t req, std::string app
if (!ctxt)
{
AFB_INFO( "create new session for %s", appid.c_str());
if (!ctxt)
{
AFB_INFO( "create new session for %s", appid.c_str());
-
HS_ClientCtxt *ctxt = new HS_ClientCtxt(appid.c_str()
);
+
ctxt = new HS_ClientCtxt(appid
);
afb_req_session_set_LOA(req, 1);
afb_req_context_set(req, ctxt, cbRemoveClientCtxt);
}
afb_req_session_set_LOA(req, 1);
afb_req_context_set(req, ctxt, cbRemoveClientCtxt);
}
@@
-177,14
+179,15
@@
int HS_ClientManager::handleRequest(afb_req_t request, const char *verb, const c
}
}
else {
}
}
else {
- auto ip = client_list.find(std::string(appid));
+ std::string id(appid);
+ auto ip = client_list.find(id);
if(ip != client_list.end()) {
ret = ip->second->handleRequest(request, verb);
}
else {
if(!strcasecmp(verb, "subscribe")) {
if(ip != client_list.end()) {
ret = ip->second->handleRequest(request, verb);
}
else {
if(!strcasecmp(verb, "subscribe")) {
- appid2ctxt[
appid] = createClientCtxt(request, app
id);
- HS_Client* client = addClient(request,
app
id);
+ appid2ctxt[
id] = createClientCtxt(request,
id);
+ HS_Client* client = addClient(request, id);
ret = client->handleRequest(request, "subscribe");
}
else {
ret = client->handleRequest(request, "subscribe");
}
else {
@@
-230,4
+233,4
@@
int HS_ClientManager::pushEvent(const char *event, struct json_object *param, st
}
return 0;
}
return 0;
-}
\ No newline at end of file
+}