Forráskód Böngészése

Subscriptions: Set monitoredItemType in one place only

Julius Pfrommer 6 éve
szülő
commit
3d601763b9
1 módosított fájl, 2 hozzáadás és 1 törlés
  1. 2 1
      src/server/ua_services_subscription.c

+ 2 - 1
src/server/ua_services_subscription.c

@@ -225,6 +225,8 @@ setMonitoredItemSettings(UA_Server *server, UA_MonitoredItem *mon,
     if(samplingInterval != samplingInterval) /* Check for nan */
     if(samplingInterval != samplingInterval) /* Check for nan */
         mon->samplingInterval = server->config.samplingIntervalLimits.min;
         mon->samplingInterval = server->config.samplingIntervalLimits.min;
 
 
+    UA_assert(mon->monitoredItemType != 0);
+
     /* QueueSize */
     /* QueueSize */
     UA_BOUNDEDVALUE_SETWBOUNDS(server->config.queueSizeLimits,
     UA_BOUNDEDVALUE_SETWBOUNDS(server->config.queueSizeLimits,
                                params->queueSize, mon->maxQueueSize);
                                params->queueSize, mon->maxQueueSize);
@@ -320,7 +322,6 @@ Operation_CreateMonitoredItem(UA_Server *server, UA_Session *session, struct cre
 
 
     /* Initialize the MonitoredItem */
     /* Initialize the MonitoredItem */
     UA_MonitoredItem_init(newMon, cmc->sub);
     UA_MonitoredItem_init(newMon, cmc->sub);
-    newMon->monitoredItemType = UA_MONITOREDITEMTYPE_CHANGENOTIFY;
     newMon->attributeId = request->itemToMonitor.attributeId;
     newMon->attributeId = request->itemToMonitor.attributeId;
     newMon->timestampsToReturn = cmc->timestampsToReturn;
     newMon->timestampsToReturn = cmc->timestampsToReturn;
     UA_StatusCode retval = UA_STATUSCODE_GOOD;
     UA_StatusCode retval = UA_STATUSCODE_GOOD;