From 469d6ff29ebc8bed44458695186d57bfed0edb6c Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: ćšć, 20 5æ 2021 13:51:10 +0800
Subject: [PATCH] Merge branch 'develop' of https://github.com/open-license-manager/open-license-manager into develop
---
src/library/hw_identifier/hw_identifier_facade.cpp | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/library/hw_identifier/hw_identifier_facade.cpp b/src/library/hw_identifier/hw_identifier_facade.cpp
index d8c4ee0..83b6ba2 100644
--- a/src/library/hw_identifier/hw_identifier_facade.cpp
+++ b/src/library/hw_identifier/hw_identifier_facade.cpp
@@ -21,10 +21,10 @@
using namespace std;
LCC_EVENT_TYPE HwIdentifierFacade::validate_pc_signature(const std::string& str_code) {
- HwIdentifier pc_id(str_code);
- LCC_API_HW_IDENTIFICATION_STRATEGY id_strategy = pc_id.get_identification_strategy();
LCC_EVENT_TYPE result = IDENTIFIERS_MISMATCH;
try {
+ HwIdentifier pc_id(str_code);
+ LCC_API_HW_IDENTIFICATION_STRATEGY id_strategy = pc_id.get_identification_strategy();
unique_ptr<IdentificationStrategy> strategy = IdentificationStrategy::get_strategy(id_strategy);
result = strategy->validate_identifier(pc_id);
} catch (logic_error& e) {
@@ -53,6 +53,7 @@
unique_ptr<IdentificationStrategy> strategy_ptr = IdentificationStrategy::get_strategy(strategy);
HwIdentifier pc_id;
FUNCTION_RETURN result = strategy_ptr->generate_pc_id(pc_id);
+ pc_id.set_use_environment_var(use_env_var);
if (result != FUNC_RET_OK) {
throw logic_error("strategy " + to_string(strategy_ptr->identification_strategy()) + " failed");
}
--
Gitblit v1.9.1