You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2013/12/04 18:24:22 UTC
svn commit: r1547850 -
/manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/
Author: kwright
Date: Wed Dec 4 17:24:21 2013
New Revision: 1547850
URL: http://svn.apache.org/r1547850
Log:
Hook up thread-local repository connector pool manager everywhere
Modified:
manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/CrawlerAgent.java
manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/DocumentCleanupThread.java
manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ExpireThread.java
manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/IdleCleanupThread.java
manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java
manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/SeedingThread.java
manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/SetPriorityThread.java
manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StartupThread.java
manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StufferThread.java
manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/WorkerThread.java
Modified: manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/CrawlerAgent.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/CrawlerAgent.java?rev=1547850&r1=1547849&r2=1547850&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/CrawlerAgent.java (original)
+++ manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/CrawlerAgent.java Wed Dec 4 17:24:21 2013
@@ -204,8 +204,7 @@ public class CrawlerAgent implements IAg
break;
// Calculate new priorities for all these documents
- ManifoldCF.writeDocumentPriorities(threadContext,connectionManager,jobManager,docs,connectionMap,jobDescriptionMap,
- rt,updateTime);
+ ManifoldCF.writeDocumentPriorities(threadContext,docs,connectionMap,jobDescriptionMap,rt,updateTime);
Logging.threads.debug("Reprioritized "+Integer.toString(docs.length)+" not-yet-processed documents in "+new Long(System.currentTimeMillis()-startTime)+" ms");
}
@@ -708,7 +707,7 @@ public class CrawlerAgent implements IAg
}
// Threads are down; release connectors
- RepositoryConnectorFactory.closeAllConnectors(threadContext);
+ RepositoryConnectorPoolFactory.make(threadContext).flushUnusedConnectors();
numWorkerThreads = 0;
numDeleteThreads = 0;
numExpireThreads = 0;
Modified: manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/DocumentCleanupThread.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/DocumentCleanupThread.java?rev=1547850&r1=1547849&r2=1547850&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/DocumentCleanupThread.java (original)
+++ manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/DocumentCleanupThread.java Wed Dec 4 17:24:21 2013
@@ -82,6 +82,8 @@ public class DocumentCleanupThread exten
IRepositoryConnectionManager connMgr = RepositoryConnectionManagerFactory.make(threadContext);
ReprioritizationTracker rt = new ReprioritizationTracker(threadContext);
+ IRepositoryConnectorPool repositoryConnectorPool = RepositoryConnectorPoolFactory.make(threadContext);
+
// Loop
while (true)
{
@@ -144,7 +146,7 @@ public class DocumentCleanupThread exten
}
// Grab one connection for each connectionName. If we fail, nothing is lost and retries are possible.
- IRepositoryConnector connector = RepositoryConnectorFactory.grab(threadContext,connection.getClassName(),connection.getConfigParams(),connection.getMaxConnections());
+ IRepositoryConnector connector = repositoryConnectorPool.grab(connection);
try
{
@@ -247,7 +249,7 @@ public class DocumentCleanupThread exten
finally
{
// Free up the reserved connector instance
- RepositoryConnectorFactory.release(connector);
+ repositoryConnectorPool.release(connector);
}
}
catch (ManifoldCFException e)
Modified: manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ExpireThread.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ExpireThread.java?rev=1547850&r1=1547849&r2=1547850&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ExpireThread.java (original)
+++ manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ExpireThread.java Wed Dec 4 17:24:21 2013
@@ -72,6 +72,8 @@ public class ExpireThread extends Thread
IRepositoryConnectionManager connMgr = RepositoryConnectionManagerFactory.make(threadContext);
ReprioritizationTracker rt = new ReprioritizationTracker(threadContext);
+ IRepositoryConnectorPool repositoryConnectorPool = RepositoryConnectorPoolFactory.make(threadContext);
+
// Loop
while (true)
{
@@ -136,7 +138,7 @@ public class ExpireThread extends Thread
}
// Grab one connection for the connectionName. If we fail, nothing is lost and retries are possible.
- IRepositoryConnector connector = RepositoryConnectorFactory.grab(threadContext,connection.getClassName(),connection.getConfigParams(),connection.getMaxConnections());
+ IRepositoryConnector connector = repositoryConnectorPool.grab(connection);
try
{
@@ -250,7 +252,7 @@ public class ExpireThread extends Thread
finally
{
// Free up the reserved connector instance
- RepositoryConnectorFactory.release(connector);
+ repositoryConnectorPool.release(connector);
}
}
catch (ManifoldCFException e)
Modified: manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/IdleCleanupThread.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/IdleCleanupThread.java?rev=1547850&r1=1547849&r2=1547850&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/IdleCleanupThread.java (original)
+++ manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/IdleCleanupThread.java Wed Dec 4 17:24:21 2013
@@ -57,6 +57,8 @@ public class IdleCleanupThread extends T
// Get the cache handle.
ICacheManager cacheManager = CacheManagerFactory.make(threadContext);
+ IRepositoryConnectorPool repositoryConnectorPool = RepositoryConnectorPoolFactory.make(threadContext);
+
// Loop
while (true)
{
@@ -64,7 +66,7 @@ public class IdleCleanupThread extends T
try
{
// Do the cleanup
- RepositoryConnectorFactory.pollAllConnectors(threadContext);
+ repositoryConnectorPool.pollAllConnectors();
cacheManager.expireObjects(System.currentTimeMillis());
// Sleep for the retry interval.
Modified: manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java?rev=1547850&r1=1547849&r2=1547850&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java (original)
+++ manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java Wed Dec 4 17:24:21 2013
@@ -105,6 +105,15 @@ public class ManifoldCF extends org.apac
public static void localCleanup(IThreadContext tc)
{
+ try
+ {
+ RepositoryConnectorPoolFactory.make(tc).closeAllConnectors();
+ }
+ catch (ManifoldCFException e)
+ {
+ if (Logging.root != null)
+ Logging.root.warn("Exception tossed on repository connector pool cleanup: "+e.getMessage(),e);
+ }
}
/** Create system database using superuser properties from properties.xml.
@@ -948,8 +957,7 @@ public class ManifoldCF extends org.apac
break;
// Calculate new priorities for all these documents
- writeDocumentPriorities(threadContext,connectionManager,jobManager,docs,connectionMap,jobDescriptionMap,
- rt,updateTime);
+ writeDocumentPriorities(threadContext,docs,connectionMap,jobDescriptionMap,rt,updateTime);
Logging.threads.debug("Reprioritized "+Integer.toString(docs.length)+" not-yet-processed documents in "+new Long(System.currentTimeMillis()-startTime)+" ms");
}
@@ -959,12 +967,15 @@ public class ManifoldCF extends org.apac
/** Write a set of document priorities, based on the current queue tracker.
*/
- public static void writeDocumentPriorities(IThreadContext threadContext, IRepositoryConnectionManager mgr,
- IJobManager jobManager, DocumentDescription[] descs,
+ public static void writeDocumentPriorities(IThreadContext threadContext, DocumentDescription[] descs,
Map<String,IRepositoryConnection> connectionMap, Map<Long,IJobDescription> jobDescriptionMap,
ReprioritizationTracker rt, long currentTime)
throws ManifoldCFException
{
+ IRepositoryConnectorPool repositoryConnectorPool = RepositoryConnectorPoolFactory.make(threadContext);
+ IRepositoryConnectionManager mgr = RepositoryConnectionManagerFactory.make(threadContext);
+ IJobManager jobManager = JobManagerFactory.make(threadContext);
+
if (Logging.scheduling.isDebugEnabled())
Logging.scheduling.debug("Reprioritizing "+Integer.toString(descs.length)+" documents");
@@ -992,10 +1003,7 @@ public class ManifoldCF extends org.apac
String[] binNames;
// Grab a connector handle
- IRepositoryConnector connector = RepositoryConnectorFactory.grab(threadContext,
- connection.getClassName(),
- connection.getConfigParams(),
- connection.getMaxConnections());
+ IRepositoryConnector connector = repositoryConnectorPool.grab(connection);
try
{
if (connector == null)
@@ -1006,7 +1014,7 @@ public class ManifoldCF extends org.apac
}
finally
{
- RepositoryConnectorFactory.release(connector);
+ repositoryConnectorPool.release(connector);
}
priorities[i] = new PriorityCalculator(rt,connection,binNames);
@@ -1341,6 +1349,7 @@ public class ManifoldCF extends org.apac
{
try
{
+ IRepositoryConnectorPool repositoryConnectorPool = RepositoryConnectorPoolFactory.make(tc);
IRepositoryConnectionManager connectionManager = RepositoryConnectionManagerFactory.make(tc);
IRepositoryConnection connection = connectionManager.load(connectionName);
if (connection == null)
@@ -1351,7 +1360,7 @@ public class ManifoldCF extends org.apac
String results;
// Grab a connection handle, and call the test method
- IRepositoryConnector connector = RepositoryConnectorFactory.grab(tc,connection.getClassName(),connection.getConfigParams(),connection.getMaxConnections());
+ IRepositoryConnector connector = repositoryConnectorPool.grab(connection);
try
{
results = connector.check();
@@ -1362,7 +1371,7 @@ public class ManifoldCF extends org.apac
}
finally
{
- RepositoryConnectorFactory.release(connector);
+ repositoryConnectorPool.release(connector);
}
ConfigurationNode response = new ConfigurationNode(API_CHECKRESULTNODE);
@@ -1416,6 +1425,7 @@ public class ManifoldCF extends org.apac
{
try
{
+ IRepositoryConnectorPool repositoryConnectorPool = RepositoryConnectorPoolFactory.make(tc);
IRepositoryConnectionManager connectionManager = RepositoryConnectionManagerFactory.make(tc);
IRepositoryConnection connection = connectionManager.load(connectionName);
if (connection == null)
@@ -1425,14 +1435,14 @@ public class ManifoldCF extends org.apac
}
// Grab a connection handle, and call the test method
- IRepositoryConnector connector = RepositoryConnectorFactory.grab(tc,connection.getClassName(),connection.getConfigParams(),connection.getMaxConnections());
+ IRepositoryConnector connector = repositoryConnectorPool.grab(connection);
try
{
return connector.requestInfo(output,command)?READRESULT_FOUND:READRESULT_NOTFOUND;
}
finally
{
- RepositoryConnectorFactory.release(connector);
+ repositoryConnectorPool.release(connector);
}
}
catch (ManifoldCFException e)
Modified: manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/SeedingThread.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/SeedingThread.java?rev=1547850&r1=1547849&r2=1547850&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/SeedingThread.java (original)
+++ manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/SeedingThread.java Wed Dec 4 17:24:21 2013
@@ -68,11 +68,8 @@ public class SeedingThread extends Threa
IRepositoryConnectionManager connectionMgr = RepositoryConnectionManagerFactory.make(threadContext);
ReprioritizationTracker rt = new ReprioritizationTracker(threadContext);
- IDBInterface database = DBInterfaceFactory.make(threadContext,
- ManifoldCF.getMasterDatabaseName(),
- ManifoldCF.getMasterDatabaseUsername(),
- ManifoldCF.getMasterDatabasePassword());
-
+ IRepositoryConnectorPool repositoryConnectorPool = RepositoryConnectorPoolFactory.make(threadContext);
+
String[] identifiers = new String[MAX_COUNT];
// Loop
while (true)
@@ -126,17 +123,12 @@ public class SeedingThread extends Threa
int hopcountMethod = jobDescription.getHopcountMode();
IRepositoryConnection connection = connectionMgr.load(jobDescription.getConnectionName());
- IRepositoryConnector connector = RepositoryConnectorFactory.grab(threadContext,
- connection.getClassName(),
- connection.getConfigParams(),
- connection.getMaxConnections());
+ IRepositoryConnector connector = repositoryConnectorPool.grab(connection);
// Null will come back if the connector instance could not be obtained, so just skip in that case.
if (connector == null)
continue;
try
{
-
-
// Get the number of link types.
String[] legalLinkTypes = connector.getRelationshipTypes();
@@ -174,7 +166,7 @@ public class SeedingThread extends Threa
}
finally
{
- RepositoryConnectorFactory.release(connector);
+ repositoryConnectorPool.release(connector);
}
Modified: manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/SetPriorityThread.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/SetPriorityThread.java?rev=1547850&r1=1547849&r2=1547850&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/SetPriorityThread.java (original)
+++ manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/SetPriorityThread.java Wed Dec 4 17:24:21 2013
@@ -126,7 +126,7 @@ public class SetPriorityThread extends T
DocumentDescription desc = blockingDocuments.getBlockingDocument();
if (desc != null)
{
- ManifoldCF.writeDocumentPriorities(threadContext,mgr,jobManager,
+ ManifoldCF.writeDocumentPriorities(threadContext,
new DocumentDescription[]{desc},connectionMap,jobDescriptionMap,rt,currentTime);
processedCount++;
continue;
Modified: manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StartupThread.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StartupThread.java?rev=1547850&r1=1547849&r2=1547850&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StartupThread.java (original)
+++ manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StartupThread.java Wed Dec 4 17:24:21 2013
@@ -62,11 +62,8 @@ public class StartupThread extends Threa
IRepositoryConnectionManager connectionMgr = RepositoryConnectionManagerFactory.make(threadContext);
ReprioritizationTracker rt = new ReprioritizationTracker(threadContext);
- IDBInterface database = DBInterfaceFactory.make(threadContext,
- ManifoldCF.getMasterDatabaseName(),
- ManifoldCF.getMasterDatabaseUsername(),
- ManifoldCF.getMasterDatabasePassword());
-
+ IRepositoryConnectorPool repositoryConnectorPool = RepositoryConnectorPoolFactory.make(threadContext);
+
// Loop
while (true)
{
@@ -117,22 +114,19 @@ public class StartupThread extends Threa
int hopcountMethod = jobDescription.getHopcountMode();
IRepositoryConnection connection = connectionMgr.load(jobDescription.getConnectionName());
- IRepositoryConnector connector = RepositoryConnectorFactory.grab(threadContext,
- connection.getClassName(),
- connection.getConfigParams(),
- connection.getMaxConnections());
+ IRepositoryConnector connector = repositoryConnectorPool.grab(connection);
// If the attempt to grab a connector instance failed, don't start the job, of course.
if (connector == null)
continue;
- // Only now record the fact that we are trying to start the job.
- connectionMgr.recordHistory(jobDescription.getConnectionName(),
- null,connectionMgr.ACTIVITY_JOBSTART,null,
- jobID.toString()+"("+jobDescription.getDescription()+")",null,null,null);
-
try
{
+ // Only now record the fact that we are trying to start the job.
+ connectionMgr.recordHistory(jobDescription.getConnectionName(),
+ null,connectionMgr.ACTIVITY_JOBSTART,null,
+ jobID.toString()+"("+jobDescription.getDescription()+")",null,null,null);
+
int model = connector.getConnectorModel();
// Get the number of link types.
String[] legalLinkTypes = connector.getRelationshipTypes();
@@ -175,7 +169,7 @@ public class StartupThread extends Threa
}
finally
{
- RepositoryConnectorFactory.release(connector);
+ repositoryConnectorPool.release(connector);
}
// Start this job!
Modified: manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StufferThread.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StufferThread.java?rev=1547850&r1=1547849&r2=1547850&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StufferThread.java (original)
+++ manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StufferThread.java Wed Dec 4 17:24:21 2013
@@ -89,6 +89,8 @@ public class StufferThread extends Threa
IJobManager jobManager = JobManagerFactory.make(threadContext);
ReprioritizationTracker rt = new ReprioritizationTracker(threadContext);
+ IRepositoryConnectorPool repositoryConnectorPool = RepositoryConnectorPoolFactory.make(threadContext);
+
Logging.threads.debug("Stuffer thread: Low water mark is "+Integer.toString(lowWaterMark)+"; amount per stuffing is "+Integer.toString(stuffAmt));
// This is used to adjust the number of records returned for jobs
@@ -250,10 +252,7 @@ public class StufferThread extends Threa
try
{
// Grab a connector handle
- IRepositoryConnector connector = RepositoryConnectorFactory.grab(threadContext,
- connection.getClassName(),
- connection.getConfigParams(),
- connection.getMaxConnections());
+ IRepositoryConnector connector = repositoryConnectorPool.grab(connection);
if (connector == null)
{
maxDocuments = 1;
@@ -270,7 +269,7 @@ public class StufferThread extends Threa
}
finally
{
- RepositoryConnectorFactory.release(connector);
+ repositoryConnectorPool.release(connector);
}
}
}
Modified: manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/WorkerThread.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/WorkerThread.java?rev=1547850&r1=1547849&r2=1547850&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/WorkerThread.java (original)
+++ manifoldcf/branches/CONNECTORS-781/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/WorkerThread.java Wed Dec 4 17:24:21 2013
@@ -79,6 +79,8 @@ public class WorkerThread extends Thread
IOutputConnectionManager outputMgr = OutputConnectionManagerFactory.make(threadContext);
ReprioritizationTracker rt = new ReprioritizationTracker(threadContext);
+ IRepositoryConnectorPool repositoryConnectorPool = RepositoryConnectorPoolFactory.make(threadContext);
+
List<DocumentToProcess> fetchList = new ArrayList<DocumentToProcess>();
Map<String,String> versionMap = new HashMap<String,String>();
List<QueuedDocument> finishList = new ArrayList<QueuedDocument>();
@@ -257,10 +259,7 @@ public class WorkerThread extends Thread
IRepositoryConnector connector = null;
if (activeDocuments.size() > 0 || hopcountremoveList.size() > 0)
{
- connector = RepositoryConnectorFactory.grab(threadContext,
- connection.getClassName(),
- connection.getConfigParams(),
- connection.getMaxConnections());
+ connector = repositoryConnectorPool.grab(connection);
// If we wind up with a null here, it means that a document got queued for a connector which is now gone.
// Basically, what we want to do in that case is to treat this kind of like a service interruption - the document
@@ -832,7 +831,7 @@ public class WorkerThread extends Thread
}
finally
{
- RepositoryConnectorFactory.release(connector);
+ repositoryConnectorPool.release(connector);
}
}