Merge pull request nasa#401 from nasa/integration-candidate

Integration Candidate 2020-03-25
CDKnightNASA · Apr 3, 2020 · 3024f63 · 3024f63
2 parents 20a83c4 + 126d319
commit 3024f63
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -19,7 +19,8 @@ This distribution contains:
 
 Version Notes:
 ==============
-
+- 5.0.10: DEVELOPMENT
+  - Minor updates (see https://github.com/nasa/osal/pull/401)
 - 5.0.9: DEVELOPMENT
   - Documentation updates (see https://github.com/nasa/osal/pull/375)
 - 5.0.8: DEVELOPMENT

diff --git a/src/os/inc/osapi-version.h b/src/os/inc/osapi-version.h
@@ -20,7 +20,7 @@
 
 #define OS_MAJOR_VERSION 5  /**< @brief Major version number */
 #define OS_MINOR_VERSION 0  /**< @brief Minor version number */
-#define OS_REVISION      9  /**< @brief Revision number */
+#define OS_REVISION      10  /**< @brief Revision number */
 #define OS_MISSION_REV   0  /**< @brief Mission revision */
 
 /**

diff --git a/src/os/shared/osapi-sockets.c b/src/os/shared/osapi-sockets.c
@@ -237,7 +237,7 @@ int32 OS_SocketAccept(uint32 sock_id, uint32 *connsock_id, OS_SockAddr_t *Addr,
          /* Socket must be of the STREAM variety */
          return_code = OS_ERR_INCORRECT_OBJ_TYPE;
       }
-      else if (record->refcount != 0 || (OS_stream_table[local_id].stream_state & (OS_STREAM_STATE_BOUND | OS_STREAM_STATE_CONNECTED)) != OS_STREAM_STATE_BOUND)
+      else if ((OS_stream_table[local_id].stream_state & (OS_STREAM_STATE_BOUND | OS_STREAM_STATE_CONNECTED)) != OS_STREAM_STATE_BOUND)
       {
          /* Socket must be bound but not connected */
          return_code = OS_ERR_INCORRECT_OBJ_STATE;