[42267 svn/public] client/trunk/azureus3/src/com/aelitis/azureus/core/ content

[<pga...@vu...>]

Revision: 42267
Author:   pgardner
Date:     2015-06-29 22:28:49 +0000 (Mon, 29 Jun 2015)
Log Message:
-----------
delay creation of alt searcher until really needed

Modified Paths:
--------------
    client/trunk/azureus3/src/com/aelitis/azureus/core/content/RelatedContentManager.java
    client/trunk/azureus3/src/com/aelitis/azureus/core/content/RelatedContentSearcher.java

Modified: client/trunk/azureus3/src/com/aelitis/azureus/core/content/RelatedContentManager.java
===================================================================
--- client/trunk/azureus3/src/com/aelitis/azureus/core/content/RelatedContentManager.java	2015-06-29 22:27:46 UTC (rev 42266)
+++ client/trunk/azureus3/src/com/aelitis/azureus/core/content/RelatedContentManager.java	2015-06-29 22:28:49 UTC (rev 42267)
@@ -392,7 +392,7 @@
 							
 							public_dht_plugin = dp;
 
-							RelatedContentSearcher public_searcher = new RelatedContentSearcher( RelatedContentManager.this, transfer_type, dp );
+							RelatedContentSearcher public_searcher = new RelatedContentSearcher( RelatedContentManager.this, transfer_type, dp, true );
 							
 							searchers.add( public_searcher );
 							
@@ -537,7 +537,7 @@
 					
 					DHTPluginInterface i2p_dht = ((DDBaseImpl)ddb).getDHTPlugin();
 					
-					RelatedContentSearcher i2p_searcher = new RelatedContentSearcher( RelatedContentManager.this, transfer_type, i2p_dht );
+					RelatedContentSearcher i2p_searcher = new RelatedContentSearcher( RelatedContentManager.this, transfer_type, i2p_dht, false );
 					
 					searchers.add( i2p_searcher );
 					

Modified: client/trunk/azureus3/src/com/aelitis/azureus/core/content/RelatedContentSearcher.java
===================================================================
--- client/trunk/azureus3/src/com/aelitis/azureus/core/content/RelatedContentSearcher.java	2015-06-29 22:27:46 UTC (rev 42266)
+++ client/trunk/azureus3/src/com/aelitis/azureus/core/content/RelatedContentSearcher.java	2015-06-29 22:28:49 UTC (rev 42267)
@@ -152,11 +152,17 @@
 	RelatedContentSearcher(
 		RelatedContentManager				_manager,
 		DistributedDatabaseTransferType		_transfer_type,
-		DHTPluginInterface					_dht_plugin )
+		DHTPluginInterface					_dht_plugin,
+		boolean								_defer_ddb_check )
 	{
 		manager			= _manager;
 		transfer_type	= _transfer_type;
 		dht_plugin 		= _dht_plugin;
+		
+		if ( !_defer_ddb_check ){
+			
+			checkDDB();
+		}
 	}
 	
 	protected DHTPluginInterface
@@ -169,23 +175,8 @@
 	timerTick(
 		boolean		enabled,
 		int			tick_count )
-	{
-		if ( tick_count == 1 ){
-			
-			try{
-				List<DistributedDatabase> ddbs = DDBaseImpl.getDDBs( new String[]{ dht_plugin.getNetwork() });
-			
-				if ( ddbs.size() > 0 ){
-				
-					ddb = ddbs.get( 0 );
-					
-					ddb.addTransferHandler( transfer_type, this );
-				}
-			}catch( Throwable e ){
-				
-				// Debug.out( e );
-			}
-		}
+	{			
+		checkDDB();
 		
 		if ( enabled ){
 							
@@ -207,6 +198,27 @@
 		testKeyBloom();
 	}
 	
+	private void
+	checkDDB()
+	{
+		if ( ddb == null ){
+			
+			try{
+				List<DistributedDatabase> ddbs = DDBaseImpl.getDDBs( new String[]{ dht_plugin.getNetwork() });
+			
+				if ( ddbs.size() > 0 ){
+				
+					ddb = ddbs.get( 0 );
+					
+					ddb.addTransferHandler( transfer_type, this );
+				}
+			}catch( Throwable e ){
+				
+				// Debug.out( e );
+			}
+		}
+	}
+	
 	protected SearchInstance
 	searchRCM(
 		Map<String,Object>		search_parameters,