From: eap <eap@opencascade.com>
Date: Wed, 30 Apr 2014 14:33:20 +0000 (+0400)
Subject: Regression bugs_00/A3
X-Git-Tag: V7_4_0rc1~12
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=fd6f0fdf57aa43878b3c54f69a639192d8e006d8;p=modules%2Fsmesh.git

Regression bugs_00/A3

  More protection from access to a closed study
---

diff --git a/src/SMESH_I/SMESH_Gen_i.cxx b/src/SMESH_I/SMESH_Gen_i.cxx
index c9243ad87..a42b136d8 100644
--- a/src/SMESH_I/SMESH_Gen_i.cxx
+++ b/src/SMESH_I/SMESH_Gen_i.cxx
@@ -658,6 +658,8 @@ void SMESH_Gen_i::setCurrentStudy( SALOMEDS::Study_ptr theStudy,
 SALOMEDS::Study_ptr SMESH_Gen_i::GetCurrentStudy()
 {
   if(MYDEBUG) MESSAGE( "SMESH_Gen_i::GetCurrentStudy: study Id = " << GetCurrentStudyID() );
+  if ( GetCurrentStudyID() < 0 )
+    return SALOMEDS::Study::_nil();
   return SALOMEDS::Study::_duplicate( myCurrentStudy );
 }
 
@@ -1052,13 +1054,18 @@ SMESH::mesh_array* SMESH_Gen_i::CreateMeshesFromMEDorSAUV( const char* theFileNa
   aPythonDump << "([";
 
   if (theStatus == SMESH::DRS_OK) {
-    SALOMEDS::StudyBuilder_var aStudyBuilder = myCurrentStudy->NewBuilder();
-    aStudyBuilder->NewCommand();  // There is a transaction
+    SALOMEDS::StudyBuilder_var aStudyBuilder;
+    if ( GetCurrentStudyID() > -1 )
+    {
+      aStudyBuilder = myCurrentStudy->NewBuilder();
+      aStudyBuilder->NewCommand();  // There is a transaction
+    }
     aResult->length( aNames.size() );
     int i = 0;
 
     // Iterate through all meshes and create mesh objects
-    for ( list<string>::iterator it = aNames.begin(); it != aNames.end(); it++ ) {
+    for ( list<string>::iterator it = aNames.begin(); it != aNames.end(); it++ )
+    {
       // Python Dump
       if (i > 0) aPythonDump << ", ";
 
@@ -1091,7 +1098,8 @@ SMESH::mesh_array* SMESH_Gen_i::CreateMeshesFromMEDorSAUV( const char* theFileNa
       aResult[i++] = SMESH::SMESH_Mesh::_duplicate( mesh );
       meshServant->GetImpl().GetMeshDS()->Modified();
     }
-    aStudyBuilder->CommitCommand();
+    if ( !aStudyBuilder->_is_nil() )
+      aStudyBuilder->CommitCommand();
   }
 
   // Update Python script
diff --git a/src/SMESH_I/SMESH_Gen_i_1.cxx b/src/SMESH_I/SMESH_Gen_i_1.cxx
index f155ae93d..6890bcf08 100644
--- a/src/SMESH_I/SMESH_Gen_i_1.cxx
+++ b/src/SMESH_I/SMESH_Gen_i_1.cxx
@@ -160,7 +160,7 @@ long SMESH_Gen_i::GetBallElementsGroupsTag()
 bool SMESH_Gen_i::CanPublishInStudy(CORBA::Object_ptr theIOR)
 {
   if(MYDEBUG) MESSAGE("CanPublishInStudy - "<<!CORBA::is_nil(myCurrentStudy));
-  if(CORBA::is_nil(myCurrentStudy))
+  if( GetCurrentStudyID() < 0 )
     return false;
   
   SMESH::SMESH_Mesh_var aMesh       = SMESH::SMESH_Mesh::_narrow(theIOR);