From 7590d75779864d3117de0fe7a775376742a670eb Mon Sep 17 00:00:00 2001 From: Benoit Foucher Date: Fri, 19 Jun 2015 12:18:11 +0200 Subject: Fixed ICE-6595: Glacier2/sessionHelper deadlock on destroy --- cpp/src/Glacier2Lib/SessionHelper.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'cpp/src') diff --git a/cpp/src/Glacier2Lib/SessionHelper.cpp b/cpp/src/Glacier2Lib/SessionHelper.cpp index 3857289a6c8..68b01fc1cf5 100644 --- a/cpp/src/Glacier2Lib/SessionHelper.cpp +++ b/cpp/src/Glacier2Lib/SessionHelper.cpp @@ -864,7 +864,12 @@ Glacier2::SessionFactoryHelper::SessionFactoryHelper(const Ice::PropertiesPtr& p Glacier2::SessionFactoryHelper::~SessionFactoryHelper() { - destroy(); + IceUtil::Mutex::Lock sync(_mutex); + if(!_threads.empty() && Ice::getProcessLogger()) + { + Ice::Warning warn(Ice::getProcessLogger()); + warn << "Glacier2::SessionFactoryHelper::destroy() has not been called, threads won't be joined"; + } } void -- cgit v1.2.3