Changeset 3426 in Sophya for trunk/SophyaLib/BaseTools

Timestamp:

Dec 8, 2007, 11:28:14 PM (18 years ago)

Author:

ansari

Message:

Correction bug (delete objet deja supprime ds ~PInPersist - lie a bug ds ReadReference() - Reza 08/12/2007

File:

• trunk/SophyaLib/BaseTools/ppersist.cc (modified) (3 diffs)

trunk/SophyaLib/BaseTools/ppersist.cc

@@ -523 +523 @@
     return object;
   } 
-  else if (ppstype == PPS_REFERENCE) 
-    return ReadReference();
-
+  else if (ppstype == PPS_REFERENCE) {
+    PPersist* ppr = ReadReference();
+    PPersist* pprc = ppr->CloneSharedReference();
+    if (po) {  // We have to read it into an object 
+      pprc->SetDataObj(*po);
+      pprc->ShareDataReference(*ppr);  // On met a jour la reference de pprc
+    }
+    return pprc;
+  }
   else throw FileFormatExc("PInPersist::ReadObject invalide Tag Type !");  
 }
@@ -578 +584 @@
     if (seqread) throw FileFormatExc("PInPersist::KeepOId() already present PPS_ObjectId ");
     PPersist *pp = (*objList.find(oid)).second;
-    ppo.ShareDataReference(*pp);
+    ppo.ShareDataReference(*pp);  // On met a jour la reference des donnees de ppo
   }
   else {
@@ -649 +655 @@
   ClassCreatorFunc f = FindCreatorFunc(getDataObjClassId(o));
   if (!f) 
-      throw NotFoundExc("PInPersist::PutObject()   class not registered");
+      throw NotFoundExc("POutPersist::PutObject()   class not registered");
   PPersist* ppo = f();
   ppo->SetDataObj(o);