Skip to content

Commit 161e0f2

Browse files
Refs #22202. Fix Windows deadlock in tests closure
Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>
1 parent 9cf2e87 commit 161e0f2

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

test/unittest/dds/xtypes/serializers/json/DynDataJSONTests.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include <fstream>
1818

1919
#include <fastdds/dds/core/ReturnCode.hpp>
20+
#include <fastdds/dds/log/Log.hpp>
2021
#include <fastdds/dds/xtypes/dynamic_types/DynamicData.hpp>
2122
#include <fastdds/dds/xtypes/dynamic_types/DynamicType.hpp>
2223
#include <fastdds/dds/xtypes/dynamic_types/DynamicTypeBuilder.hpp>
@@ -291,6 +292,9 @@ TEST(DynDataJSONTests, json_deserialize_negative)
291292
ASSERT_NE(dyn_type, nullptr);
292293
test_negative_case(json, dyn_type);
293294
}
295+
296+
// Flush log before finishing to avoid deadlock in Windows (Redmine #23458)
297+
Log::Flush();
294298
}
295299

296300
int main(

0 commit comments

Comments
 (0)