[pytango] 12/25: Fix auto tango monitor

[Sandor Bodo-Merle]

This is an automated email from the git hooks/post-receive script.

sbodomerle-guest pushed a commit to tag v8.1.9
in repository pytango.

commit da8bcd3ffb08ba9f8546a864fd98055fdf52a639
Author: Vincent Michel <vincent.michel at maxlab.lu.se>
Date:   Mon Apr 25 11:03:59 2016 +0200

    Fix auto tango monitor
---
 src/boost/cpp/server/auto_monitor.cpp | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/boost/cpp/server/auto_monitor.cpp b/src/boost/cpp/server/auto_monitor.cpp
index 2106ca6..77ad82d 100644
--- a/src/boost/cpp/server/auto_monitor.cpp
+++ b/src/boost/cpp/server/auto_monitor.cpp
@@ -23,30 +23,31 @@ class AutoTangoMonitor
   Tango::DeviceClass                *klass;
 
 public:
-  AutoTangoMonitor(Tango::DeviceImpl *di)
+  AutoTangoMonitor(Tango::DeviceImpl *dev_arg) : mon(), dev(), klass()
   {
-    dev = di;
+    dev = dev_arg;
   }
 
-  AutoTangoMonitor(Tango::DeviceClass *dc)
+  AutoTangoMonitor(Tango::DeviceClass *klass_arg) : mon(), dev(), klass()
   {
-    klass = dc;
+    klass = klass_arg;
   }
 
   void acquire()
   {
-    if (mon == NULL)
+    if (mon != NULL)
     {
-      if (dev != NULL)
-      {
-	AutoPythonAllowThreads no_gil;
-        mon = new Tango::AutoTangoMonitor(dev);
-      }
-      else if (klass != NULL)
-      {
-	AutoPythonAllowThreads no_gil;
-        mon = new Tango::AutoTangoMonitor(klass);
-      }
+      return;
+    }
+    if (dev != NULL)
+    {
+      AutoPythonAllowThreads no_gil;
+      mon = new Tango::AutoTangoMonitor(dev);
+    }
+    else if (klass != NULL)
+    {
+      AutoPythonAllowThreads no_gil;
+      mon = new Tango::AutoTangoMonitor(klass);
     }
   }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pytango.git