2009-11-26 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

	Removed redundant DownloadContext::hasAttribute(...) calls.
	* src/ConsoleStatCalc.cc
	* src/RequestGroup.cc
	* src/XmlRpcMethodImpl.cc

ChangeLog

@@ -1,3 +1,10 @@
+2009-11-26  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Removed redundant DownloadContext::hasAttribute(...) calls.
+	* src/ConsoleStatCalc.cc
+	* src/RequestGroup.cc
+	* src/XmlRpcMethodImpl.cc
+
 2009-11-26  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Changed the number of tracker request attempt from 5 to 2.

src/ConsoleStatCalc.cc

@@ -115,9 +115,9 @@ static void printProgress
     << "CN:"
     << rg->getNumConnection();
 #ifdef ENABLE_BITTORRENT
-  if(rg->getDownloadContext()->hasAttribute(bittorrent::BITTORRENT)) {
-    SharedHandle<PeerStorage> ps =
-      e->getBtRegistry()->get(rg->getGID())._peerStorage;
+  SharedHandle<PeerStorage> ps =
+    e->getBtRegistry()->get(rg->getGID())._peerStorage;
+  if(!ps.isNull()) {
     std::deque<SharedHandle<Peer> > peers;
     ps->getActivePeers(peers);
     o << " " << "SEED:"

src/RequestGroup.cc

@@ -773,9 +773,7 @@ void RequestGroup::setForceHaltRequested(bool f, HaltReason haltReason)
 void RequestGroup::releaseRuntimeResource(DownloadEngine* e)
 {
 #ifdef ENABLE_BITTORRENT
-  if(_downloadContext->hasAttribute(bittorrent::BITTORRENT)) {
-    e->getBtRegistry()->remove(_gid);
-  }
+  e->getBtRegistry()->remove(_gid);
 #endif // ENABLE_BITTORRENT
   if(!_pieceStorage.isNull()) {
     _pieceStorage->removeAdvertisedPiece(0);

src/XmlRpcMethodImpl.cc

@@ -464,12 +464,10 @@ BDE GetPeersXmlRpcMethod::process
       (StringFormat("No peer data is available for GID#%d", gid).str());
   }
   BDE peers = BDE::list();
-  if(group->getDownloadContext()->hasAttribute(bittorrent::BITTORRENT)) {
-    BtObject btObject = e->getBtRegistry()->get(group->getGID());
-    if(!btObject.isNull()) {
-      assert(!btObject._peerStorage.isNull());
-      gatherPeer(peers, btObject._peerStorage);
-    }
+  BtObject btObject = e->getBtRegistry()->get(group->getGID());
+  if(!btObject.isNull()) {
+    assert(!btObject._peerStorage.isNull());
+    gatherPeer(peers, btObject._peerStorage);
   }
   return peers;
 }