[pytango] 380/483: Fix dserver IOR

[Sandor Bodo-Merle]

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

sbodomerle-guest pushed a commit to annotated tag bliss_8.10
in repository pytango.

commit 6ba6e90817060b65df8e110c51cbde6ffde0fd07
Author: tiagocoutinho <tiagocoutinho at 4e9c00fd-8f2e-0410-aa12-93ce3db5e235>
Date:   Wed May 14 08:24:31 2014 +0000

    Fix dserver IOR
    
    git-svn-id: http://svn.code.sf.net/p/tango-cs/code/bindings/PyTango/trunk@25588 4e9c00fd-8f2e-0410-aa12-93ce3db5e235
---
 src/boost/cpp/server/dserver.cpp    | 7 -------
 src/boost/cpp/server/tango_util.cpp | 8 +++++---
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/boost/cpp/server/dserver.cpp b/src/boost/cpp/server/dserver.cpp
index 904ba61..2394ff6 100644
--- a/src/boost/cpp/server/dserver.cpp
+++ b/src/boost/cpp/server/dserver.cpp
@@ -127,12 +127,6 @@ namespace PyDServer
         delete ret;
         return py_ret;
     }
-    
-    void duplicate_d_var(Tango::DServer &self)
-    {
-        Tango::Device_var d = self._this();
-        self.set_d_var(Tango::Device::_duplicate(d));
-    }
 }
 
 BOOST_PYTHON_FUNCTION_OVERLOADS(add_obj_polling_overload, PyDServer::add_obj_polling, 2, 4)
@@ -192,7 +186,6 @@ void export_dserver()
         .def("get_poll_th_pool_size", &Tango::DServer::get_poll_th_pool_size)
         .def("get_opt_pool_usage", &Tango::DServer::get_opt_pool_usage)
         .def("get_poll_th_conf", &Tango::DServer::get_poll_th_conf)
-        .def("duplicate_d_var", &PyDServer::duplicate_d_var)
     ;
     
 }
diff --git a/src/boost/cpp/server/tango_util.cpp b/src/boost/cpp/server/tango_util.cpp
index 0316814..bfd2a47 100644
--- a/src/boost/cpp/server/tango_util.cpp
+++ b/src/boost/cpp/server/tango_util.cpp
@@ -184,9 +184,11 @@ namespace PyUtil
     
     boost::python::str get_dserver_ior(Tango::Util& self, Tango::DServer* dserver)
     {
-        const char *ior = self.get_orb()->object_to_string(dserver->_this());
-        boost::python::str ret = ior;
-        delete [] ior;
+        Tango::Device_var d = dserver->_this();
+	dserver->set_d_var(Tango::Device::_duplicate(d));
+        const char *dserver_ior = self.get_orb()->object_to_string(d);
+        boost::python::str ret = dserver_ior;
+        delete [] dserver_ior;
         return ret;
     }
 

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