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

419 UUID unavailable when changed #437

Merged
merged 2 commits into from
Apr 6, 2024
Merged

419 UUID unavailable when changed #437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27ec271
use new uuid to check for device with * uuid shdr command
wsobel Apr 6, 2024
b5ff775
Version 2.3.0.6
wsobel Apr 6, 2024
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set(AGENT_VERSION_MAJOR 2)
set(AGENT_VERSION_MINOR 3)
set(AGENT_VERSION_PATCH 0)
set(AGENT_VERSION_BUILD 5)
set(AGENT_VERSION_BUILD 6)
set(AGENT_VERSION_RC "")

# This minimum version is to support Visual Studio 2019 and C++ feature checking and FetchContent
Expand Down
4 changes: 1 addition & 3 deletions src/mtconnect/source/adapter/shdr/shdr_adapter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,9 +227,7 @@ namespace mtconnect::source::adapter::shdr {

if (command == "uuid")
{
DevicePtr dp;
if (auto dev = GetOption<string>(m_options, configuration::Device);
dev && (dp = m_pipeline.getContext()->m_contract->findDevice(*dev)))
if (auto dp = m_pipeline.getContext()->m_contract->findDevice(value); dp)
{
if (!dp->preserveUuid())
{
Expand Down
Loading