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 2012/09/25 00:16:11 UTC
svn commit: r1389627 - in /manifoldcf/branches/release-1.0-branch: ./
CHANGES.txt
framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/CrawlerAgent.java
Author: kwright
Date: Mon Sep 24 22:16:11 2012
New Revision: 1389627
URL: http://svn.apache.org/viewvc?rev=1389627&view=rev
Log:
Pull up fix for CONNECTORS-539.
Modified:
manifoldcf/branches/release-1.0-branch/ (props changed)
manifoldcf/branches/release-1.0-branch/CHANGES.txt
manifoldcf/branches/release-1.0-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/CrawlerAgent.java
Propchange: manifoldcf/branches/release-1.0-branch/
------------------------------------------------------------------------------
Merged /manifoldcf/trunk:r1389626
Modified: manifoldcf/branches/release-1.0-branch/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.0-branch/CHANGES.txt?rev=1389627&r1=1389626&r2=1389627&view=diff
==============================================================================
--- manifoldcf/branches/release-1.0-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-1.0-branch/CHANGES.txt Mon Sep 24 22:16:11 2012
@@ -3,6 +3,10 @@ $Id$
======================= 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/branches/release-1.0-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/CrawlerAgent.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.0-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/CrawlerAgent.java?rev=1389627&r1=1389626&r2=1389627&view=diff
==============================================================================
--- manifoldcf/branches/release-1.0-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/CrawlerAgent.java (original)
+++ manifoldcf/branches/release-1.0-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/CrawlerAgent.java Mon Sep 24 22:16:11 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.