Merge pull request #1373 from nasa/integration-candidate

osal Integration candidate: Caelum-rc4+dev40
nasa · Feb 27, 2023 · a9939e6 · a9939e6
2 parents c1d6928 + f01c5f3
commit a9939e6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Development Build: v6.0.0-rc4+dev199
+- Modify unreachable branch in OS_ObjectIdAllocateNew
+- See <https://github.com/nasa/osal/pull/1327>
+
 ## Development Build: v6.0.0-rc4+dev195
 - removed cast that hid bug at compile time
 - See <https://github.com/nasa/osal/pull/1367>

diff --git a/src/os/inc/osapi-version.h b/src/os/inc/osapi-version.h
@@ -34,7 +34,7 @@
 /*
  * Development Build Macro Definitions
  */
-#define OS_BUILD_NUMBER   195
+#define OS_BUILD_NUMBER   199
 #define OS_BUILD_BASELINE "v6.0.0-rc4"
 
 /*

diff --git a/src/os/shared/src/osapi-idmap.c b/src/os/shared/src/osapi-idmap.c
@@ -1191,8 +1191,7 @@ int32 OS_ObjectIdAllocateNew(osal_objtype_t idtype, const char *name, OS_object_
         OS_ObjectIdTransactionCancel(token);
         return return_code;
     }
-
-    if (return_code == OS_SUCCESS)
+    else
     {
         return_code = OS_NotifyEvent(OS_EVENT_RESOURCE_ALLOCATED, token->obj_id, NULL);
     }