Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix calling stop monitored item callback. #132

Merged
merged 8 commits into from
Mar 10, 2019
Merged

Fix calling stop monitored item callback. #132

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ca01c5e
add verification code to template
atimin Feb 16, 2019
6baaf83
Merge pull request #114 from ASNeG/VerifyDocumentationSiteInGoogle
huebl Feb 16, 2019
e321276
fix calling stop monitored item callback
atimin Mar 8, 2019
359555d
update authors
atimin Mar 9, 2019
8cbb232
add test for start monitored item callback
atimin Mar 9, 2019
ad878f0
add tests for stop monitored item callbacks
atimin Mar 9, 2019
3abcbdc
update CHANGELOG
atimin Mar 9, 2019
d23848f
Merge branch 'Release3_Bugs' into fix_monitor_item_callbacks
atimin Mar 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions docs/source/_templates/layout.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{% extends "!layout.html" %}

{%- block extrahead %}
<meta name="google-site-verification" content="bUDMPBn4rTuF6NW-6pWLXWjl5q9l3UI83tZVFD6w0Zc" />
{% endblock %}
3 changes: 2 additions & 1 deletion src/OpcUaStackServer/ServiceSet/MonitorManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,8 +582,9 @@ namespace OpcUaStackServer
}

// check monitored item list
monitoredItemIds_.erase(it1);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, The ID is not deleted if only one ID exists in the list.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, if there are other IDs, `newMonitoredItemIds' is not empty and I insert the rest IDs in L587.

if (newMonitoredItemIds.size() > 0) {
Copy link
Member Author

@atimin atimin Mar 8, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm sure that this functional used to work correctly. But judging the history of file it could never work at all.

Copy link
Member Author

@atimin atimin Mar 8, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've understood. The problem is only for duplication monitored items inside of a single subscription. I tested my application with different clients.

monitoredItemIds_.insert(std::make_pair(baseNodeClass->nodeId().data(), monitoredItemIds));
monitoredItemIds_.insert(std::make_pair(baseNodeClass->nodeId().data(), newMonitoredItemIds));
return;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh , the same data will be inserted again.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not the same. newMonitoredItemIds has the rest of ID's and I re-insert them deleting old ID's before. See L585.

}

Expand Down