Julius Pfrommer 10 år sedan
förälder
incheckning
e75faf6895
2 ändrade filer med 4 tillägg och 4 borttagningar
  1. 2 2
      src/server/ua_nodestore_concurrent.c
  2. 2 2
      src/server/ua_server_worker.c

+ 2 - 2
src/server/ua_nodestore_concurrent.c

@@ -153,7 +153,7 @@ UA_StatusCode UA_NodeStore_insert(UA_NodeStore *ns, const UA_Node **node, UA_Boo
     struct nodeEntry *entry;
     if(!(entry = UA_malloc(sizeof(struct nodeEntry) - sizeof(UA_Node) + nodesize)))
         return UA_STATUSCODE_BADOUTOFMEMORY;
-    memcpy((void*)&entry->node, *node, nodesize);
+    UA_memcpy((void*)&entry->node, *node, nodesize);
 
     cds_lfht_node_init(&entry->htn);
     entry->refcount = ALIVE_BIT;
@@ -238,7 +238,7 @@ UA_StatusCode UA_NodeStore_replace(UA_NodeStore *ns, const UA_Node *oldNode,
     struct nodeEntry *newEntry;
     if(!(newEntry = UA_malloc(sizeof(struct nodeEntry) - sizeof(UA_Node) + nodesize)))
         return UA_STATUSCODE_BADOUTOFMEMORY;
-    memcpy((void*)&newEntry->node, *node, nodesize);
+    UA_memcpy((void*)&newEntry->node, *node, nodesize);
 
     cds_lfht_node_init(&newEntry->htn);
     newEntry->refcount = ALIVE_BIT;

+ 2 - 2
src/server/ua_server_worker.c

@@ -412,9 +412,9 @@ UA_StatusCode UA_Server_run(UA_Server *server, UA_UInt16 nThreads, UA_Boolean *r
             UA_Int32 workSize;
             if(*running) {
                 if(i == server->nlsSize-1)
-                    workSize = nl->getWork(nl->nlHandle, &work, 0);
-                else
                     workSize = nl->getWork(nl->nlHandle, &work, timeout);
+                else
+                    workSize = nl->getWork(nl->nlHandle, &work, 0);
             } else {
                 workSize = server->nls[i].stop(nl->nlHandle, &work);
             }