You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@etch.apache.org by ve...@apache.org on 2014/03/20 10:01:31 UTC
svn commit: r1579566 -
/etch/trunk/binding-cpp/runtime/include/transport/EtchConnection.h
Author: veithm
Date: Thu Mar 20 09:01:31 2014
New Revision: 1579566
URL: http://svn.apache.org/r1579566
Log:
ETCH-290 Removed Static mutex inside of EtchConnection
EtchConnections suffer to a Deadlock with multiple EtchSessions /
Connections. Removing the static mutex solves this issue.
Change-Id: If9c5ed101a247a33245a750467e64b1b37dda410
Modified:
etch/trunk/binding-cpp/runtime/include/transport/EtchConnection.h
Modified: etch/trunk/binding-cpp/runtime/include/transport/EtchConnection.h
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/include/transport/EtchConnection.h?rev=1579566&r1=1579565&r2=1579566&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/include/transport/EtchConnection.h (original)
+++ etch/trunk/binding-cpp/runtime/include/transport/EtchConnection.h Thu Mar 20 09:01:31 2014
@@ -131,8 +131,8 @@ protected:
capu::Thread *mThread;
capu::bool_t mIsStarted;
capu::bool_t mIsTerminated;
- static capu::Mutex mMutex;
- static capu::Mutex mMutexConnection;
+ capu::Mutex mMutex;
+ capu::Mutex mMutexConnection;
EtchMonitor mStatus;
};
@@ -146,12 +146,6 @@ template <class S>
const EtchString EtchConnection<S>::ALL_INTFS("0.0.0.0");
template <class S>
-capu::Mutex EtchConnection<S>::mMutex;
-
-template <class S>
-capu::Mutex EtchConnection<S>::mMutexConnection;
-
-template <class S>
EtchConnection<S>::EtchConnection()
: mSession(0), mThread(0), mStatus(EtchString("status"), EtchSession::DOWN()) {
}