X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESH_I%2FMG_ADAPT_i.cxx;h=188a3523659271c089883d98bd624d1a446f84dd;hp=fbe27fd473246ce4eb130d3273bf7855a30d9be6;hb=a463e4643121ceea8a13c2fad631e0ef0ac8a824;hpb=f5e84513cda0eda53672cc9d3b1124323b4aa26d

diff --git a/src/SMESH_I/MG_ADAPT_i.cxx b/src/SMESH_I/MG_ADAPT_i.cxx
index fbe27fd47..188a35236 100644
--- a/src/SMESH_I/MG_ADAPT_i.cxx
+++ b/src/SMESH_I/MG_ADAPT_i.cxx
@@ -372,34 +372,25 @@ char* MG_ADAPT_i::getCommandToRun()
   return CORBA::string_dup(myMgAdapt->getCommandToRun().c_str());
 }
 
-//~CORBA::Long MG_ADAPT_i::compute(::CORBA::String_out errStr)
-//~{
-  //~std::string err("");
-  //~CORBA::Long ret = myMgAdapt->compute(err);
-  //~errStr =  err.c_str();
-  //~return ret;
-//~}
-CORBA::Long MG_ADAPT_i::compute()
+void MG_ADAPT_i::compute()
 {
   errStr = "";
-  CORBA::Long ret;
   try
   {
-    ret = myMgAdapt->compute(errStr);
+    myMgAdapt->compute(errStr);
   }
   catch (const std::exception& e)
   {
-    std::cerr<<e.what();
-    ret = -1;
+    std::ostringstream oss; oss << "Exception thrown on MG_ADAPT_i::compute invocation with error message \"" << errStr
+		 << "\" with exception message \"" << e.what() << "\"";
+		THROW_SALOME_CORBA_EXCEPTION(oss.str().c_str(),SALOME::INTERNAL_ERROR);
   }
-  if(ret!=-1 && myMgAdapt->getPublish())
+  if(myMgAdapt->getPublish())
   {
     SMESH_Gen_i* smeshGen_i = SMESH_Gen_i::GetSMESHGen();
     SMESH::DriverMED_ReadStatus theStatus;
     smeshGen_i->CreateMeshesFromMED(myMgAdapt->getMedFileOut().c_str(), theStatus);
   }
-  //~errStr =  err.c_str();
-  return ret;
 }
 char* MG_ADAPT_i::getErrMsg()
 {
@@ -510,7 +501,8 @@ CORBA::Long MG_ADAPT_OBJECT_i::Compute(bool publish)
     return -1;
   }
   hypothesis->setPublish(publish);
-  return hypothesis->compute();
+  hypothesis->compute();
+  return 0;
 }
 
 bool MG_ADAPT_OBJECT_i::checkMeshFileIn()