[EDF29138] : measure CPU/Mem even in OutOfProcess mode

[modules/kernel.git] / src / Container / SALOME_ContainerHelper.py

diff --git a/src/Container/SALOME_ContainerHelper.py b/src/Container/SALOME_ContainerHelper.py
index 70bd9d6f6a8ffb6635c088e04306d3e3034d04f9..82bef6bfad5b04865e6fe31ef592e3dbf1c34797 100644 (file)
--- a/src/Container/SALOME_ContainerHelper.py
+++ b/src/Container/SALOME_ContainerHelper.py
@@ -432,9 +432,14 @@ class ScriptInfoAbstract:
   
 class ScriptInfoClt(ScriptInfoAbstract):
   def __init__(self, scriptPtr):
+      def unPickledSafe( dataPickled ):
+        if len(dataPickled) > 0:
+          return pickle.loads(dataPickled)
+        else:
+           return None  
       self._node_name = scriptPtr.getName()
       self._code = scriptPtr.getCode()
-      self._exec = [pickle.loads(elt.getObj()) for elt in scriptPtr.listOfExecs()]
+      self._exec = [unPickledSafe(elt.getObj()) for elt in scriptPtr.listOfExecs()]
 
 class ScriptInfo(ScriptInfoAbstract):
   def __init__(self, nodeName, code, execs):