From 88a55338c22209fbeca52770e51628143955ae8a Mon Sep 17 00:00:00 2001
From: upstream svn <svn@amule.org>
Date: Wed, 9 Mar 2011 19:01:02 +0000
Subject: [PATCH] Removed CKnownFileList::IsKnownFile()

Used only in one place, and not needed there. Known files are never dropped from the known file list.
---
 .svn-revision         |  2 +-
 src/KnownFileList.cpp | 23 -----------------------
 src/KnownFileList.h   |  1 -
 src/amule.cpp         | 17 +++++++----------
 4 files changed, 8 insertions(+), 35 deletions(-)

diff --git a/.svn-revision b/.svn-revision
index 10b63d4a..af6a7f74 100644
--- a/.svn-revision
+++ b/.svn-revision
@@ -1 +1 @@
-10486
+10487
diff --git a/src/KnownFileList.cpp b/src/KnownFileList.cpp
index 02ba0d84..9eefd339 100644
--- a/src/KnownFileList.cpp
+++ b/src/KnownFileList.cpp
@@ -230,29 +230,6 @@ CKnownFile *CKnownFileList::IsOnDuplicates(
 }
 
 
-bool CKnownFileList::IsKnownFile(const CKnownFile *file) 
-{
-	wxCHECK(file, false);
-
-	wxMutexLocker sLock(list_mut);
-
-	// For the map, search with the key
-	const CMD4Hash &key = file->GetFileHash();
-	CKnownFileMap::const_iterator itMap = m_knownFileMap.find(key);
-	if (itMap != m_knownFileMap.end()) {
-		return true;
-	}
-	// For the list, we have to iterate to search
-	for (KnownFileList::iterator it = m_duplicateFileList.begin();
-	     it != m_duplicateFileList.end(); ++it) {
-		if (*it == file) {
-			return true;
-		}
-	}
-	return false;
-}
-
-
 CKnownFile* CKnownFileList::FindKnownFileByID(const CMD4Hash& hash)
 {
 	wxMutexLocker sLock(list_mut);
diff --git a/src/KnownFileList.h b/src/KnownFileList.h
index 3a2a9835..b7fa88fb 100644
--- a/src/KnownFileList.h
+++ b/src/KnownFileList.h
@@ -47,7 +47,6 @@ public:
 		time_t in_date,
 		uint64 in_size);
 	CKnownFile* FindKnownFileByID(const CMD4Hash& hash);
-	bool	IsKnownFile(const CKnownFile* file);
 	void	PrepareIndex();
 	void	ReleaseIndex();
 
diff --git a/src/amule.cpp b/src/amule.cpp
index d008a455..b890a95f 100644
--- a/src/amule.cpp
+++ b/src/amule.cpp
@@ -1315,18 +1315,15 @@ void CamuleApp::OnFinishedAICHHashing(CHashingEvent& evt)
 	CKnownFile* owner = const_cast<CKnownFile*>(evt.GetOwner());
 	CScopedPtr<CKnownFile> result(evt.GetResult());
 	
-	// Check that the owner is still valid
-	if (knownfiles->IsKnownFile(owner)) {
-		if (result->GetAICHHashset()->GetStatus() == AICH_HASHSETCOMPLETE) {
-			CAICHHashSet* oldSet = owner->GetAICHHashset();
-			CAICHHashSet* newSet = result->GetAICHHashset();
+	if (result->GetAICHHashset()->GetStatus() == AICH_HASHSETCOMPLETE) {
+		CAICHHashSet* oldSet = owner->GetAICHHashset();
+		CAICHHashSet* newSet = result->GetAICHHashset();
 
-			owner->SetAICHHashset(newSet);
-			newSet->SetOwner(owner);
+		owner->SetAICHHashset(newSet);
+		newSet->SetOwner(owner);
 
-			result->SetAICHHashset(oldSet);
-			oldSet->SetOwner(result.get());
-		}
+		result->SetAICHHashset(oldSet);
+		oldSet->SetOwner(result.get());
 	}
 }
 
-- 
2.11.4.GIT