fix problem with SALOMEDS_Server bug

diff --git a/src/SALOMEDS/SALOMEDS.cxx b/src/SALOMEDS/SALOMEDS.cxx
index 695992deb0208b3498cd914b929a83c9493f062f..23e4f3a20a95161463f7f6d1757eb0463bebcfb3 100644 (file)
--- a/src/SALOMEDS/SALOMEDS.cxx
+++ b/src/SALOMEDS/SALOMEDS.cxx
@@ -118,8 +118,10 @@ extern "C"
       namingService.Register(aStudy, "/Study");
 
       // Assign the value of the IOR in the study->root
-      CORBA::String_var IORStudy = orb->object_to_string(aStudy);
-      aStudy_i->GetImpl()->SetTransientReference((char*)IORStudy.in());
+      if ( aStudy_i->GetImpl()->GetTransientReference().empty() ) {
+        CORBA::String_var IORStudy = orb->object_to_string(aStudy);
+        aStudy_i->GetImpl()->SetTransientReference((char*)IORStudy.in());
+      }
       aStudy_i->_remove_ref();
     }
   }

diff --git a/src/SALOMEDS/SALOMEDS_Server.cxx b/src/SALOMEDS/SALOMEDS_Server.cxx
index 21db9a8c0552935939fca27d686f80ea3f1122bf..addbbba1af426dca841cefbb67355a19f88eea4d 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_Server.cxx
+++ b/src/SALOMEDS/SALOMEDS_Server.cxx
@@ -166,11 +166,13 @@ int main(int argc, char** argv)
         NS = SINGLETON_<SALOME_NamingService>::Instance();
         NS->init_orb( orb );
       }
-      NS->Register(Study.in(), "/Study");
+      NS->Register(Study, "/Study");
 
       // Assign the value of the IOR in the study->root
-      CORBA::String_var IORStudy = orb->object_to_string(Study);
-      myStudy_i->GetImpl()->SetTransientReference((char*)IORStudy.in());
+      if ( myStudy_i->GetImpl()->GetTransientReference().empty() ) {
+        CORBA::String_var IORStudy = orb->object_to_string(Study);
+        myStudy_i->GetImpl()->SetTransientReference((char*)IORStudy.in());
+      }
 
       myStudy_i->_remove_ref();
        

diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_Study.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_Study.cxx
index 6e1e77792a3c13d5db00689f0efad5bb2ec5ac76..42bc8839b3ce665b5df35c03dcd46438fb044ebe 100644 (file)
--- a/src/SALOMEDSImpl/SALOMEDSImpl_Study.cxx
+++ b/src/SALOMEDSImpl/SALOMEDSImpl_Study.cxx
@@ -522,7 +522,7 @@ bool SALOMEDSImpl_Study::Impl_SaveAs(const std::string& aStudyUrl,
   std::string component_name;
 
   // Store previous URL
-  std::string anOldName = Name();
+  std::string anOldName = URL();
 
   // Map to store components' versions
   std::map<std::string, std::string> componentVersions;