Merge with version on tag OCC-V2_1_0d

[modules/visu.git] / src / VISU_I / VISU_Mesh_i.cc

diff --git a/src/VISU_I/VISU_Mesh_i.cc b/src/VISU_I/VISU_Mesh_i.cc
index c556d1739c6429d4c7016662f9283174a636950b..d5f6e584e4ed548df1b391f3d2e388811e7871e0 100644 (file)
--- a/src/VISU_I/VISU_Mesh_i.cc
+++ b/src/VISU_I/VISU_Mesh_i.cc
@@ -77,10 +77,10 @@ int VISU::Mesh_i::IsPossible(Result_i* theResult, const char* theMeshName, Entit
     bool aResult = VISU_PipeLine::CheckAvailableMemory(aSize);
     MESSAGE("Mesh_i::IsPossible - CheckAvailableMemory = "<<float(aSize)<<"; aResult = "<<aResult);
     return aResult;
-  }catch(std::runtime_error& exc){
-    INFOS("Follow exception was accured :\n"<<exc.what());
+  }catch(std::exception& exc){
+    INFOS("Follow exception was occured :\n"<<exc.what());
   }catch(...){
-    INFOS("Unknown exception was accured!");
+    INFOS("Unknown exception was occured!");
   }
   return 0;
 }
@@ -101,10 +101,10 @@ int VISU::Mesh_i::IsPossible(Result_i* theResult, const char* theMeshName, const
     bool aResult = VISU_PipeLine::CheckAvailableMemory(aSize);
     INFOS("Mesh_i::IsPossible - CheckAvailableMemory = "<<float(aSize)<<"; aResult = "<<aResult);
     return aResult;
-  }catch(std::runtime_error& exc){
-    INFOS("Follow exception was accured :\n"<<exc.what());
+  }catch(std::exception& exc){
+    INFOS("Follow exception was occured :\n"<<exc.what());
   }catch(...){
-    INFOS("Unknown exception was accured!");
+    INFOS("Unknown exception was occured!");
   }
   return 0;
 }
@@ -175,7 +175,7 @@ VISU::Mesh_i::~Mesh_i(){
 VISU::Storable* VISU::Mesh_i::Build(int theRestoring){
   SALOMEDS::StudyBuilder_var aStudyBuilder = myStudy->NewBuilder();
   aStudyBuilder->NewCommand();  // There is a transaction
-  try{
+  //try{
     if(myResult->GetInput() == NULL) 
       throw std::runtime_error("Mesh_i::Build - myResult->GetInput() == NULL !!!");
     if(!theRestoring){
@@ -228,13 +228,13 @@ VISU::Storable* VISU::Mesh_i::Build(int theRestoring){
       CORBA::String_var aString = GetID();
       anIOR->SetValue(aString); 
     }
-  }catch(std::runtime_error& exc){
-    INFOS("Follow exception was accured :\n"<<exc.what());
-    return NULL;
-  }catch(...){
-    INFOS("Unknown exception was accured!");
-    return NULL;
-  } 
+  //}catch(std::exception& exc){
+  //  INFOS("Follow exception was occured :\n"<<exc.what());
+  //  return NULL;
+  //}catch(...){
+  //  INFOS("Unknown exception was occured!");
+  //  return NULL;
+  //} 
   aStudyBuilder->CommitCommand();
   return this;
 }