svn commit: r1389626 - in /manifoldcf/trunk: CHANGES.txt framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/CrawlerAgent.java

[kw...@apache.org]

Author: kwright
Date: Mon Sep 24 22:14:45 2012
New Revision: 1389626

URL: http://svn.apache.org/viewvc?rev=1389626&view=rev
Log:
Fix for CONNECTORS-539.

Modified:
    manifoldcf/trunk/CHANGES.txt
    manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/CrawlerAgent.java

Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1389626&r1=1389625&r2=1389626&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Mon Sep 24 22:14:45 2012
@@ -5,6 +5,10 @@ $Id$
 
 ======================= Release 1.0 =====================
 
+CONNECTORS-539: Multi-process agent run not properly initializing
+crawler/authority environment.
+(Karl Wright)
+
 CONNECTORS-538: Maven build broken on SharePoint Connector
 (Piergiorgio Lucidi)
 

Modified: manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/CrawlerAgent.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/CrawlerAgent.java?rev=1389626&r1=1389625&r2=1389626&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/CrawlerAgent.java (original)
+++ manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/CrawlerAgent.java Mon Sep 24 22:14:45 2012
@@ -62,6 +62,8 @@ public class CrawlerAgent implements IAg
   public void startAgent()
     throws ManifoldCFException
   {
+    org.apache.manifoldcf.authorities.system.ManifoldCF.localInitialize();
+    org.apache.manifoldcf.crawler.system.ManifoldCF.localInitialize();
     ManifoldCF.startSystem(threadContext);
   }
 
@@ -71,6 +73,8 @@ public class CrawlerAgent implements IAg
     throws ManifoldCFException
   {
     ManifoldCF.stopSystem(threadContext);
+    org.apache.manifoldcf.crawler.system.ManifoldCF.localCleanup();
+    org.apache.manifoldcf.authorities.system.ManifoldCF.localCleanup();
   }
 
   /** Request permission from agent to delete an output connection.