summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cppu/source/threadpool/thread.cxx6
1 files changed, 5 insertions, 1 deletions
diff --git a/cppu/source/threadpool/thread.cxx b/cppu/source/threadpool/thread.cxx
index 06fd30dd3ba2..0e8b809c3a8c 100644
--- a/cppu/source/threadpool/thread.cxx
+++ b/cppu/source/threadpool/thread.cxx
@@ -86,7 +86,11 @@ namespace cppu_threadpool {
pCurrent = m_lst.front();
m_lst.pop_front();
}
- pCurrent->join();
+ if (pCurrent->getIdentifier()
+ != osl::Thread::getCurrentIdentifier())
+ {
+ pCurrent->join();
+ }
}
}