#38 Wrong usage of class "Lock"

silecs-communication-cpp/src/silecs-communication/interface/communication/SilecsConnection.cpp

@@ -185,8 +185,9 @@ void Connection::doClose(PLC* thePLC, bool withLock)
     //withLock argument is used to avoid Recursive mutex that is not supported
     //by LynxOS platform.
 
+    Lock lock;
     if (withLock)
-        Lock lock(connMux_);
+        lock.setMutex(connMux_);
 
     if (isConnected_)
     {

silecs-communication-cpp/src/silecs-communication/interface/utility/Mutex.h

@@ -54,16 +54,31 @@ private:
 class Lock
 {
 public:
+
     Lock(Mutex* mutex) :
                     mutex_(mutex)
     {
         mutex_->lock();
     }
 
+    Lock() :
+                    mutex_(NULL)
+    {
+    }
+
     ~Lock()
     {
-        mutex_->unlock();
+        if (mutex_ != NULL)
+            mutex_->unlock();
     }
+
+    void setMutex(Mutex* mutex)
+    {
+        mutex_ = mutex;
+    }
+
+protected:
+
     Mutex* mutex_;
 };