tentative de correction pour crash DSErver

src/LoCuM_4.cpp

-static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/LoCuM_4/src/LoCuM_4.cpp,v 1.18 2008-10-08 12:11:53 buteau Exp $";
+static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/LoCuM_4/src/LoCuM_4.cpp,v 1.19 2008-10-10 09:40:42 buteau Exp $";
 //+=============================================================================
 //
 // file :         LoCuM_4.cpp
@@ -13,9 +13,12 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentatio
 //
 // $Author: buteau $
 //
-// $Revision: 1.18 $
+// $Revision: 1.19 $
 //
 // $Log: not supported by cvs2svn $
+// Revision 1.18  2008/10/08 12:11:53  buteau
+// - nettoyage code
+//
 // Revision 1.17  2007/11/21 11:29:17  sebleport
 // no message
 //
@@ -224,7 +227,13 @@ namespace LoCuM_4_ns
   //-----------------------------------------------------------------------------
   void LoCuM_4::always_executed_hook()
   { 
-
+    if(mySerial==0)
+    {
+        _DEV_TRY(
+        create_proxy_Serialline(),
+        "create_proxy_Serialline",
+        "LoCuM_4::always_executed_hook()");
+    } 
   }
   //+----------------------------------------------------------------------------
   //
@@ -238,13 +247,6 @@ namespace LoCuM_4_ns
     DEBUG_STREAM << "LoCuM_4::read_attr_hardware(vector<long> &attr_list) entering... "<< endl;
     //	Add your own code here
     
-    if(mySerial==0)
-    {
-        _DEV_TRY(
-        create_proxy_Serialline(),
-        "create_proxy_Serialline",
-        "LoCuM_4::always_executed_hook()");
-    } 
   }
   //+----------------------------------------------------------------------------
   //
@@ -596,11 +598,7 @@ Tango::DevString LoCuM_4::send_locum4_command(Tango::DevString argin)
         "send locum command to the serial line",
         "LoCuM_4::write_read",
         set_state(Tango::FAULT);
-        if(mySerial)
-        {
-            delete mySerial;
-            mySerial = 0;
-        });
+                          );
 
         //- send LF, the end of string character
         _DEV_TRY_REACTION(
@@ -608,11 +606,7 @@ Tango::DevString LoCuM_4::send_locum4_command(Tango::DevString argin)
         "send LF character the serial line",
         "LoCuM_4::write_read",
         set_state(Tango::FAULT);
-        if(mySerial)
-        {
-            delete mySerial;
-            mySerial = 0;
-        });
+                       );
 
         if(reading_expected)
         {
@@ -623,11 +617,7 @@ Tango::DevString LoCuM_4::send_locum4_command(Tango::DevString argin)
             "read the command response",
             "LoCuM_4::write_read",
             set_state(Tango::FAULT); 
-            if(mySerial)
-            {
-                delete mySerial;
-                mySerial = 0;
-            });
+			);
         }
   
 

src/LoCuM_4.h

@@ -6,11 +6,14 @@
 //
 // project :	LoCuM_4
 //
-// $Author: sebleport $
+// $Author: buteau $
 //
-// $Revision: 1.13 $
+// $Revision: 1.14 $
 //
 // $Log: not supported by cvs2svn $
+// Revision 1.13  2007/11/21 11:29:17  sebleport
+// no message
+//
 // Revision 1.12  2007/11/21 10:16:51  sebleport
 // - code cleaning
 // - remove XbpmLocum proxy property
@@ -60,8 +63,8 @@
 #include "Xstring.h"
 #include <tango.h>
 /**
- * @author	$Author: sebleport $
- * @version	$Revision: 1.13 $
+ * @author	$Author: buteau $
+ * @version	$Revision: 1.14 $
  */
 
  //	Add your own constants definitions here.
@@ -264,6 +267,7 @@ protected :
 	//	Add your own data members here
 	//-----------------------------------------
 
+private:
 	//data
   Tango::DeviceProxyHelper * mySerial;
   bool local;
@@ -275,8 +279,6 @@ protected :
   void create_proxy_Serialline(void);
   double get_range(std::string config);
   std::string convert_range_double_to_string(double value);
-  void init_XBPM_proxy();
-
 };
 
 }	// namespace_ns

src/Makefile.vc

@@ -16,6 +16,7 @@ LIBUSER=
 # Le chemin ou j'ai d'autres fichiers sources que ceux du DeviceServer à compiler
 CPPDIRUSER=
 
+#DEBUG=
 #
 # ------------------Fin des modifications pour le end user -------------------------------------
 #