Merge from debugV2_1_0a2

diff --git a/src/TestContainer/TestContainer.cxx b/src/TestContainer/TestContainer.cxx
index 25eeed28b13e1c5da14709a37b8122322a6d8997..7766bb46ec9eaa09f5848417c62d023c30eccec9 100644 (file)
--- a/src/TestContainer/TestContainer.cxx
+++ b/src/TestContainer/TestContainer.cxx
@@ -39,6 +39,7 @@
 #include "Utils_SINGLETON.hxx"
 #include "Utils_SALOME_Exception.hxx"
 #include "Utils_CommException.hxx"
+#include "LocalTraceCollector.hxx"
 using namespace std;
 
 static ostream& operator<<(ostream& os, const CORBA::Exception& e)
@@ -62,10 +63,15 @@ static ostream& operator<<(ostream& os, const CORBA::Exception& e)
 int main (int argc, char * argv[])
 {
 
+  // Initializing omniORB
+  ORB_INIT &init = *SINGLETON_<ORB_INIT>::Instance() ;
+  CORBA::ORB_var &orb = init( argc , argv ) ;
+  LocalTraceCollector *myThreadTrace = LocalTraceCollector::instance(orb);
+
   try
     {
-      // Initializing omniORB
-      CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
+
+
     
       // use IOR to find container
       //if (argc != 2) { return 1; }
@@ -221,6 +227,7 @@ int main (int argc, char * argv[])
     INFOS("Caught unknown exception.")
       }
 
+  delete myThreadTrace;
   return 0;
 }