Fix for PAL13967 : Distributed supervision graphs - Problem with "SALOME_trace".

diff --git a/src/ResourcesManager/SALOME_ResourcesManager.cxx b/src/ResourcesManager/SALOME_ResourcesManager.cxx
index 46e27dbc4c27e9a2fd66edf8af9fa2ca441cbd7a..4fe50b01ff02c015563f450290a5fe2c1c60c6b8 100644 (file)
--- a/src/ResourcesManager/SALOME_ResourcesManager.cxx
+++ b/src/ResourcesManager/SALOME_ResourcesManager.cxx
@@ -785,6 +785,7 @@ SALOME_ResourcesManager::BuildTempFileToLaunchRemoteContainer
 
   tempOutputFile << "export LD_LIBRARY_PATH" << endl;
   tempOutputFile << "export PYTHONPATH" << endl;
+  tempOutputFile << "export SALOME_trace=local" << endl; // mkr : 27.11.2006 : PAL13967 - Distributed supervision graphs - Problem with "SALOME_trace"
   //tempOutputFile << "source " << resInfo.PreReqFilePath << endl;
 
   // ! env vars

diff --git a/src/SALOMELocalTrace/LocalTraceBufferPool.cxx b/src/SALOMELocalTrace/LocalTraceBufferPool.cxx
index 14f07cf6a0540753ce2c7d7e09b2cec593bb8871..ffec729d530576dacffe4739641c80c6bd4b74ea 100644 (file)
--- a/src/SALOMELocalTrace/LocalTraceBufferPool.cxx
+++ b/src/SALOMELocalTrace/LocalTraceBufferPool.cxx
@@ -92,11 +92,17 @@ LocalTraceBufferPool* LocalTraceBufferPool::instance()
 
          // --- start a trace Collector
 
-         char* traceKind = getenv("SALOME_trace");
+         char* traceKind;
+         bool isNotDefined = false;
+         if ( getenv("SALOME_trace") )
+           traceKind = getenv("SALOME_trace");
+         else
+           isNotDefined = true; // mkr : 27.11.2006 : PAL13967 - Distributed supervision graphs - Problem with "SALOME_trace"
+         
          assert(traceKind);
          //cerr<<"SALOME_trace="<<traceKind<<endl;
 
-         if (strcmp(traceKind,"local")==0)
+         if ( isNotDefined || strcmp(traceKind,"local")==0 )
            {
              _myThreadTrace = LocalTraceCollector::instance();
            }