commit | 6141e1870467243557c015d6e3b53d5146215c84 | [log] [tgz] |
---|---|---|
author | Timothy A. Bish <tabish@apache.org> | Thu Jun 10 10:59:05 2010 +0000 |
committer | Timothy A. Bish <tabish@apache.org> | Thu Jun 10 10:59:05 2010 +0000 |
tree | 84981b921cf7f3a0cc47115a3fd8e6af34cac2b0 | |
parent | 8aab86b896420e9df9df494904ae52e0369e79bd [diff] |
https://issues.apache.org/activemq/browse/AMQCPP-295 git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-cpp/branches/activemq-cpp-3.1.x@953278 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/activemq-cpp/src/main/decaf/util/concurrent/locks/ReentrantLock.cpp b/activemq-cpp/src/main/decaf/util/concurrent/locks/ReentrantLock.cpp index 6ec3fdf..a100a95 100644 --- a/activemq-cpp/src/main/decaf/util/concurrent/locks/ReentrantLock.cpp +++ b/activemq-cpp/src/main/decaf/util/concurrent/locks/ReentrantLock.cpp
@@ -486,7 +486,11 @@ abstime.tv_sec = TimeUnit::NANOSECONDS.toSeconds( delay ); abstime.tv_nsec = delay % 1000000000; +#ifdef HAVE_PTHREAD_H unsigned int result = pthread_cond_timedwait( &condition, &lock->handle, &abstime ); +#else + +#endif // restore the owner lock->lock_owner = lock_owner;