Merge pull request #2124 from nasa/integration-candidate

cFE Integration Candidate: Caelum-rc4+dev13

Author: dzbaker

README.md

@@ -10,6 +10,11 @@ The detailed cFE user's guide can be viewed at <https://github.com/nasa/cFE/blob
 
 ## Changelog
 
+### Development Build: v7.0.0-rc4+dev145
+
+- remove commented out code
+- See <https://github.com/nasa/cFE/pull/2122>
+
 ### Development Build: v7.0.0-rc4+dev143
 
 - Endian macro mask before shift to avoid shift overflow warning

modules/core_api/fsw/inc/cfe_version.h

@@ -26,7 +26,7 @@
 #define CFE_VERSION_H
 
 /* Development Build Macro Definitions */
-#define CFE_BUILD_NUMBER   143 /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */
+#define CFE_BUILD_NUMBER   145 /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */
 #define CFE_BUILD_BASELINE "v7.0.0-rc4" /**< @brief Development: Reference git tag for build number */
 
 /* See \ref cfsversions for definitions */

modules/core_api/ut-stubs/src/cfe_tbl_handlers.c

@@ -58,7 +58,7 @@ void UT_DefaultHandler_CFE_TBL_GetAddress(void *UserObj, UT_EntryKey_t FuncKey,
     int32 status;
 
     UT_Stub_GetInt32StatusCode(Context, &status);
-    if (status >= 0 /* JPHFIX: && !UT_Stub_CheckDefaultReturnValue(UT_KEY(CFE_TBL_GetAddress), &ForceValue) */)
+    if (status >= 0)
     {
         UT_Stub_CopyToLocal(UT_KEY(CFE_TBL_GetAddress), (uint8 *)TblPtr, sizeof(void *));
     }