Replace socket_handler::fill_buffer() recursion with loop (#8389)

[libt2n] / src / container.cpp

diff --git a/src/container.cpp b/src/container.cpp
index a3c9f31..9b4eb4c 100644 (file)
--- a/src/container.cpp
+++ b/src/container.cpp
@@ -1,21 +1,24 @@
-/***************************************************************************
- *   Copyright (C) 2006 by Gerd v. Egidy                                   *
- *   gve@intra2net.com                                                     *
- *                                                                         *
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   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 program; if not, write to the                 *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- ***************************************************************************/
+/*
+Copyright (C) 2006 by Intra2net AG - Gerd v. Egidy
+
+The software in this package is distributed under the GNU General
+Public License version 2 (with a special exception described below).
+
+A copy of GNU General Public License (GPL) is included in this distribution,
+in the file COPYING.GPL.
+
+As a special exception, if other files instantiate templates or use macros
+or inline functions from this file, or you compile this file and link it
+with other works to produce a work based on this file, this file
+does not by itself cause the resulting work to be covered
+by the GNU General Public License.
+
+However the source code for this file must still be made available
+in accordance with section (3) of the GNU General Public License.
+
+This exception does not invalidate any other reasons why a work based
+on this file might be covered by the GNU General Public License.
+*/
 
 #include <boost/archive/binary_oarchive.hpp>
 #include <boost/archive/binary_iarchive.hpp>
@@ -32,17 +35,6 @@ BOOST_CLASS_EXPORT(libt2n::command_container)
 namespace libt2n
 {
 
-template<class Archive>
-void result_container::serialize(Archive & ar, const unsigned int /* version */)
-{
-    // When the class Archive corresponds to an output archive, the
-    // & operator is defined similar to <<.  Likewise, when the class Archive
-    // is a type of input archive the & operator is defined similar to >>.
-
-    ar & BOOST_SERIALIZATION_NVP(result_type);
-    ar & BOOST_SERIALIZATION_NVP(res);
-    ar & BOOST_SERIALIZATION_NVP(ex);
-}
 
 /// deletes the carried result or exception objects
 result_container::~result_container()
@@ -51,6 +43,9 @@ result_container::~result_container()
         delete res;
     if (ex)
         delete ex;
+
+    res = NULL;
+    ex = NULL;
 }
 
 /** @brief returns the result or throw the carried exception.
@@ -60,13 +55,8 @@ result* result_container::get_result(void)
 {
     if (result_type==exception)
         ex->do_throw();
-    return res;
-}
 
-template<class Archive>
-void command_container::serialize(Archive & ar, const unsigned int /* version */)
-{
-    ar & BOOST_SERIALIZATION_NVP(cmd);
+    return res;
 }
 
 /// deletes the carried command
@@ -74,6 +64,8 @@ command_container::~command_container()
 {
     if (cmd)
         delete cmd;
+
+    cmd = NULL;
 }
 
 } // namespace libt2n