X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSALOMEDS%2FSALOMEDS_ChildIterator.cxx;h=58afb4c7140a8aa1adcb10c7690c6ebfb8616a99;hb=8469d4f02c5b4379665d4ec1b07709d3c8411114;hp=a31bbbf188cff3d6c47ff8e3d096e1e8396d4c64;hpb=ec64825655b99b08182ef682868ccb732edb3c2a;p=modules%2Fkernel.git

diff --git a/src/SALOMEDS/SALOMEDS_ChildIterator.cxx b/src/SALOMEDS/SALOMEDS_ChildIterator.cxx
index a31bbbf18..58afb4c71 100644
--- a/src/SALOMEDS/SALOMEDS_ChildIterator.cxx
+++ b/src/SALOMEDS/SALOMEDS_ChildIterator.cxx
@@ -1,53 +1,52 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// Copyright (C) 2007-2023  CEA, EDF, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-// 
+//
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either 
-// version 2.1 of the License.
-// 
-// This library is distributed in the hope that it will be useful 
-// but WITHOUT ANY WARRANTY; without even the implied warranty of 
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 // Lesser General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-// See http://www.salome-platform.org/
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : SALOMEDS_ChildIterator.cxx
 //  Author : Sergey RUIN
 //  Module : SALOME
-
-
-
+//
 #include "SALOMEDS_ChildIterator.hxx"
 #include "SALOMEDS_SObject.hxx"
 #include "SALOMEDS.hxx"
 
-using namespace std; 
-
-SALOMEDS_ChildIterator::SALOMEDS_ChildIterator(const Handle(SALOMEDSImpl_ChildIterator)& theIterator)
+SALOMEDS_ChildIterator::SALOMEDS_ChildIterator(const SALOMEDSImpl_ChildIterator& theIterator)
 {
   SALOMEDS::Locker lock;
 
   _isLocal = true;
-  _local_impl = theIterator;
+  _local_impl = theIterator.GetPersistentCopy();
   _corba_impl = SALOMEDS::ChildIterator::_nil();
 }
 
 SALOMEDS_ChildIterator::SALOMEDS_ChildIterator(SALOMEDS::ChildIterator_ptr theIterator)
 {
   _isLocal = false;
-  _local_impl = NULL;
   _corba_impl = SALOMEDS::ChildIterator::_duplicate(theIterator);
 }
 
 SALOMEDS_ChildIterator::~SALOMEDS_ChildIterator()
 {
-  if(!_isLocal) _corba_impl->Destroy(); 
+  if(!_isLocal) _corba_impl->UnRegister(); 
+  else if(_local_impl) delete _local_impl;
 }
 
 void SALOMEDS_ChildIterator::Init()
@@ -70,7 +69,7 @@ void SALOMEDS_ChildIterator::InitEx(bool theAllLevels)
 
 bool SALOMEDS_ChildIterator::More()
 {
-  bool ret;
+  bool ret = false;
   if (_isLocal) {
     SALOMEDS::Locker lock;
     ret = _local_impl->More();
@@ -95,6 +94,9 @@ _PTR(SObject) SALOMEDS_ChildIterator::Value()
     SALOMEDS::Locker lock;
     aSO = new SALOMEDS_SObject(_local_impl->Value());
   }
-  else aSO = new SALOMEDS_SObject(_corba_impl->Value());
+  else {
+    SALOMEDS::SObject_var so=_corba_impl->Value();
+    aSO = new SALOMEDS_SObject(so);
+  }
   return _PTR(SObject)(aSO);
 }