X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlibmemory%2Fmemory_client.c;h=25c01f18e80930668d88f822f265cbb98a132f27;hb=8229580e8da0db31503ce5c02371561582e73d02;hp=f032ae77d198aa7d85a70d47de39a8c2ee715166;hpb=6be55648334308d4eaa4a02143b968720bb62078;p=vpp.git

diff --git a/src/vlibmemory/memory_client.c b/src/vlibmemory/memory_client.c
index f032ae77d19..25c01f18e80 100644
--- a/src/vlibmemory/memory_client.c
+++ b/src/vlibmemory/memory_client.c
@@ -394,6 +394,7 @@ connect_to_vlib_internal (const char *svm_name,
 {
   int rv = 0;
   memory_client_main_t *mm = &memory_client_main;
+  api_main_t *am = &api_main;
 
   if (do_map && (rv = vl_client_api_map (svm_name)))
     {
@@ -415,7 +416,14 @@ connect_to_vlib_internal (const char *svm_name,
       rv = pthread_create (&mm->rx_thread_handle,
 			   NULL /*attr */ , rx_thread_fn, 0);
       if (rv)
-	clib_warning ("pthread_create returned %d", rv);
+	{
+	  clib_warning ("pthread_create returned %d", rv);
+	  am->rx_thread_handle = 0;
+	}
+      else
+	{
+	  am->rx_thread_handle = mm->rx_thread_handle;
+	}
     }
 
   mm->connected_to_vlib = 1;