From cc86cdc81c5f3d6ad9e34313120c649b1866878d Mon Sep 17 00:00:00 2001 From: minhgiang1983 Date: Tue, 6 Oct 2015 09:53:37 +0700 Subject: [PATCH] fix issue about Fault set active --- src/fault/FaultSharedMem.cxx | 3 --- src/mk/safplus_targets.mk | 2 +- src/{Timer => timer}/Makefile | 0 src/{Timer => timer}/Timer.cxx | 0 src/{Timer => timer}/test/Makefile | 0 src/{Timer => timer}/test/testTimer.cxx | 0 6 files changed, 1 insertion(+), 4 deletions(-) rename src/{Timer => timer}/Makefile (100%) rename src/{Timer => timer}/Timer.cxx (100%) rename src/{Timer => timer}/test/Makefile (100%) rename src/{Timer => timer}/test/testTimer.cxx (100%) diff --git a/src/fault/FaultSharedMem.cxx b/src/fault/FaultSharedMem.cxx index 029b26b59..e7d6e86cf 100644 --- a/src/fault/FaultSharedMem.cxx +++ b/src/fault/FaultSharedMem.cxx @@ -48,9 +48,6 @@ void FaultSharedMem::init(SAFplus::Handle active) void FaultSharedMem::setActive(SAFplus::Handle active) { if(faultHdr!=NULL) - { - return; - } faultHdr->activeFaultServer=active; } diff --git a/src/mk/safplus_targets.mk b/src/mk/safplus_targets.mk index fb77ec2b3..c4d6b8b9d 100644 --- a/src/mk/safplus_targets.mk +++ b/src/mk/safplus_targets.mk @@ -49,7 +49,7 @@ endif ifndef SAFPLUS_TIMER_LIB $(LIB_DIR)/libclTimer.so: - $(MAKE) -C $(SAFPLUS_SRC_DIR)/Timer + $(MAKE) -C $(SAFPLUS_SRC_DIR)/timer endif ifndef SAFPLUS_PY_LIB diff --git a/src/Timer/Makefile b/src/timer/Makefile similarity index 100% rename from src/Timer/Makefile rename to src/timer/Makefile diff --git a/src/Timer/Timer.cxx b/src/timer/Timer.cxx similarity index 100% rename from src/Timer/Timer.cxx rename to src/timer/Timer.cxx diff --git a/src/Timer/test/Makefile b/src/timer/test/Makefile similarity index 100% rename from src/Timer/test/Makefile rename to src/timer/test/Makefile diff --git a/src/Timer/test/testTimer.cxx b/src/timer/test/testTimer.cxx similarity index 100% rename from src/Timer/test/testTimer.cxx rename to src/timer/test/testTimer.cxx