Commit: cb48a7e91de1ee9ad19fac02c5206040b8f5eeff - MolDS (git)

Commit MetaInfo

• Revision: cb48a7e91de1ee9ad19fac02c5206040b8f5eeff (tree)
• Zeit: 2013-07-23 11:29:46
• Autor: Katsuhiko Nishimra <ktns.87@gmai...>
• Commiter: Katsuhiko Nishimra

Log Message

Reimplement MolDSException::Deserialization to load multiple exceptions. #31730

git-svn-id: https://svn.sourceforge.jp/svnroot/molds/trunk@1413 1136aad2-a195-0410-b898-f5ea1d11b9d8

Ändern Zusammenfassung

• modified: src/base/MolDSException.cpp
• modified: src/base/MolDSException.h

Diff

--- a/src/base/MolDSException.cpp
+++ b/src/base/MolDSException.cpp
@@ -143,6 +143,19 @@ void MolDSException::serialize(Archive& ar, const unsigned int ver){
          this->backtracePtr[i]=reinterpret_cast<void*>(p);
       }
    }
+
+   bool hasnext = this->nextException.get() != NULL;
+   ar & hasnext;
+   MolDSException* pe = NULL;
+   if(Archive::is_saving::value){
+      pe = this->nextException.get();
+   }
+   if(hasnext){
+      ar & pe;
+   }
+   if(!Archive::is_saving::value){
+      this->nextException.reset(pe);
+   }
 }
 
 void MolDSException::Serialize(std::ostream& os){
@@ -157,6 +170,21 @@ MolDSException MolDSException::Deserialize(std::istream& is){
    boost::scoped_ptr<MolDSException> sp(p);
    ia >> p;
    sp.reset(p);
-   return *p;
+
+   while(!is.eof()){
+      try{
+         boost::archive::text_iarchive ia(is);
+         MolDSException* pnext = NULL;
+         ia >> pnext;
+         p->LastException()->nextException.reset(pnext);
+         p = pnext;
+      }
+      catch(...){
+         p->LastException()->nextException.reset();
+         break;
+      }
+   }
+
+   return *sp.get();
 }
 }

--- a/src/base/MolDSException.h
+++ b/src/base/MolDSException.h
@@ -44,11 +44,22 @@ private:
    void GetBacktrace(int bufsize);
    size_t backtraceSize;
    boost::shared_array<void*> backtracePtr;
+
    typedef std::map<int, int> intKeyValueMap_t;
    intKeyValueMap_t intKeyValueMap;
    //typedef std::map<int, other> otherKeyValueMap_t;
    //otherKeyValueMap_t otherKeyValueMap;
+
    boost::shared_ptr<MolDSException> nextException;
+   MolDSException* LastException(){
+      if(this->nextException.get()==NULL){
+         return this;
+      }
+      else{
+         return this->nextException->LastException();
+      }
+   }
+
    friend class boost::serialization::access;
    template<class Archive>
    void serialize(Archive& ar, const unsigned int ver);