Skip to content

Commit 1417869

Browse files
committed
Merge branch 'develop'
Change-Id: I23208183e64e93d25164fb12107095f451b61993
2 parents d33656a + 892f67d commit 1417869

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

src/base/RunningAppList.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2019-2020 LG Electronics, Inc.
1+
// Copyright (c) 2019-2021 LG Electronics, Inc.
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
@@ -92,10 +92,6 @@ RunningAppPtr RunningAppList::createByLaunchPointId(const string& launchPointId)
9292
return nullptr;
9393
}
9494
RunningAppPtr runningApp = make_shared<RunningApp>(launchPoint);
95-
if (runningApp == nullptr) {
96-
Logger::error(getClassName(), __FUNCTION__, "Failed to create new RunningApp");
97-
return nullptr;
98-
}
9995
return runningApp;
10096
}
10197

src/bus/client/WAM.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2012-2020 LG Electronics, Inc.
1+
// Copyright (c) 2012-2021 LG Electronics, Inc.
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
@@ -383,7 +383,8 @@ void WAM::killApp(RunningAppPtr runningApp, LunaTaskPtr lunaTask)
383383

384384
if (!isConnected()) {
385385
Logger::warning(getClassName(), __FUNCTION__, "WAM is not running. The app is not exist");
386-
lunaTask->success(lunaTask);
386+
if(lunaTask)
387+
lunaTask->success(lunaTask);
387388
return;
388389
}
389390

0 commit comments

Comments
 (0)