From 6645df820e7b9327fd0ce331353cc7ea07db865d Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Fri, 29 Jan 2010 11:03:14 +0000
Subject: [PATCH] 2010-01-29  Tatsuhiro Tsujikawa 
 <t-tujikawa@users.sourceforge.net>

	Removed RequestGroup::initSegmentMan(). Guaranteed that either
	both _pieceStorage and _segmentMan are initialized or they are
	not.
	* src/RequestGroup.cc
	* src/RequestGroup.h
	* test/BtDependencyTest.cc
---
 ChangeLog                |  9 +++++++++
 src/RequestGroup.cc      | 20 +++++++++-----------
 src/RequestGroup.h       |  8 +++-----
 test/BtDependencyTest.cc |  5 +----
 4 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 931705bb..1ae45a72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-01-29  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Removed RequestGroup::initSegmentMan(). Guaranteed that either
+	both _pieceStorage and _segmentMan are initialized or they are
+	not.
+	* src/RequestGroup.cc
+	* src/RequestGroup.h
+	* test/BtDependencyTest.cc
+
 2010-01-29  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Bump up version number to 1.8.2
diff --git a/src/RequestGroup.cc b/src/RequestGroup.cc
index 4d3370e7..b7a05784 100644
--- a/src/RequestGroup.cc
+++ b/src/RequestGroup.cc
@@ -150,13 +150,6 @@ RequestGroup::RequestGroup(const SharedHandle<Option>& option):
 
 RequestGroup::~RequestGroup() {}
 
-const SegmentManHandle& RequestGroup::initSegmentMan()
-{
-  _segmentMan = _segmentManFactory->createNewInstance(_downloadContext,
-                                                      _pieceStorage);
-  return _segmentMan;
-}
-
 bool RequestGroup::downloadFinished() const
 {
   if(_pieceStorage.isNull()) {
@@ -445,6 +438,7 @@ void RequestGroup::processCheckIntegrityEntry(std::deque<Command*>& commands,
 
 void RequestGroup::initPieceStorage()
 {
+  SharedHandle<PieceStorage> tempPieceStorage;
   if(_downloadContext->knowsTotalLength()) {
 #ifdef ENABLE_BITTORRENT
     SharedHandle<DefaultPieceStorage> ps
@@ -483,17 +477,21 @@ void RequestGroup::initPieceStorage()
     if(!_diskWriterFactory.isNull()) {
       ps->setDiskWriterFactory(_diskWriterFactory);
     }
-    _pieceStorage = ps;
+    tempPieceStorage = ps;
   } else {
     UnknownLengthPieceStorageHandle ps
       (new UnknownLengthPieceStorage(_downloadContext, _option.get()));
     if(!_diskWriterFactory.isNull()) {
       ps->setDiskWriterFactory(_diskWriterFactory);
     }
-    _pieceStorage = ps;
+    tempPieceStorage = ps;
   }
-  _pieceStorage->initStorage();
-  initSegmentMan();
+  tempPieceStorage->initStorage();
+  SharedHandle<SegmentMan> tempSegmentMan =
+    _segmentManFactory->createNewInstance(_downloadContext, tempPieceStorage);
+
+  _pieceStorage = tempPieceStorage;
+  _segmentMan = tempSegmentMan;
 }
 
 bool RequestGroup::downloadFinishedByFileLength()
diff --git a/src/RequestGroup.h b/src/RequestGroup.h
index 779e20f7..9872f623 100644
--- a/src/RequestGroup.h
+++ b/src/RequestGroup.h
@@ -186,11 +186,6 @@ public:
   RequestGroup(const SharedHandle<Option>& option);
 
   ~RequestGroup();
-  /**
-   * Reinitializes SegmentMan based on current property values and
-   * returns new one.
-   */
-  const SharedHandle<SegmentMan>& initSegmentMan();
 
   const SharedHandle<SegmentMan>& getSegmentMan() const
   {
@@ -359,6 +354,9 @@ public:
                                   const SharedHandle<CheckIntegrityEntry>& entry,
                                   DownloadEngine* e);
 
+  // Initializes _pieceStorage and _segmentMan.  We guarantee that
+  // either both of _pieceStorage and _segmentMan are initialized or
+  // they are not.
   void initPieceStorage();
 
   bool downloadFinishedByFileLength();
diff --git a/test/BtDependencyTest.cc b/test/BtDependencyTest.cc
index aa4670d9..0fe912e2 100644
--- a/test/BtDependencyTest.cc
+++ b/test/BtDependencyTest.cc
@@ -53,10 +53,7 @@ class BtDependencyTest:public CppUnit::TestFixture {
       (new DownloadContext(1024*1024, length, torrentFile));
     dctx->setDir(".");
     dependee->setDownloadContext(dctx);
-    DefaultPieceStorageHandle ps(new DefaultPieceStorage(dctx, option.get()));
-    dependee->setPieceStorage(ps);
-    ps->initStorage();
-    dependee->initSegmentMan();
+    dependee->initPieceStorage();
     return dependee;
   }