fix issue about Fault set active

OpenClovis · Oct 6, 2015 · cc86cdc · cc86cdc
1 parent db10138
commit cc86cdc
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 4 deletions.
diff --git 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
@@ -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 → src/timer/Makefile b/src/Timer/Makefile → src/timer/Makefile
diff --git a/src/Timer/Timer.cxx → src/timer/Timer.cxx b/src/Timer/Timer.cxx → src/timer/Timer.cxx
diff --git a/src/Timer/test/Makefile → src/timer/test/Makefile b/src/Timer/test/Makefile → src/timer/test/Makefile
diff --git a/src/Timer/test/testTimer.cxx → src/timer/test/testTimer.cxx b/src/Timer/test/testTimer.cxx → src/timer/test/testTimer.cxx
-Original file line number
+Diff line change
@@ Expand Up / @@ -48,9 +48,6 @@ void FaultSharedMem::init(SAFplus::Handle active) @@
     void FaultSharedMem::setActive(SAFplus::Handle active)
     {
         if(faultHdr!=NULL)
-        {
-            return;
-        }
         faultHdr->activeFaultServer=active;
     }
@@ Expand Down @@