Author: kwright
Date: Mon Feb 16 08:06:25 2015
New Revision: 1660042
URL: http://svn.apache.org/r1660042
Log:
Pull up fix for CONNECTORS-1156 from trunk.
Modified:
manifoldcf/branches/release-2.0-branch/ (props changed)
manifoldcf/branches/release-2.0-branch/CHANGES.txt
manifoldcf/branches/release-2.0-branch/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfacePostgreSQL.java
manifoldcf/branches/release-2.0-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobNotificationThread.java
manifoldcf/branches/release-2.0-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/SeedingThread.java
manifoldcf/branches/release-2.0-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StartDeleteThread.java
manifoldcf/branches/release-2.0-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StartupThread.java
Propchange: manifoldcf/branches/release-2.0-branch/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 16 08:06:25 2015
@@ -119,4 +119,4 @@
/manifoldcf/branches/CONNECTORS-981:1605049-1605773
/manifoldcf/branches/CONNECTORS-989:1611600-1612101
/manifoldcf/branches/CONNECTORS-990:1610284-1610707
-/manifoldcf/trunk:1644252,1644399,1644538,1644920,1644931,1646317,1646397,1646403,1646640,1646947,1647574,1647577,1647608,1650351,1651921,1654651-1654652,1655205,1655377-1655378,1655411,1658188
+/manifoldcf/trunk:1644252,1644399,1644538,1644920,1644931,1646317,1646397,1646403,1646640,1646947,1647574,1647577,1647608,1650351,1651921,1654651-1654652,1655205,1655377-1655378,1655411,1657346,1658004,1658036,1658188
Modified: manifoldcf/branches/release-2.0-branch/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.0-branch/CHANGES.txt?rev=1660042&r1=1660041&r2=1660042&view=diff
==============================================================================
--- manifoldcf/branches/release-2.0-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-2.0-branch/CHANGES.txt Mon Feb 16 08:06:25 2015
@@ -4,6 +4,10 @@ $Id$
======================= Release 2.0.2 =====================
+CONNECTORS-1156: Difficulty shutting down agents process after
+a while executing.
+(Adrian Conlon, Karl Wright)
+
CONNECTORS-1159: UI broken in LiveLink connector.
(Kishore Kumar)
Modified:
manifoldcf/branches/release-2.0-branch/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfacePostgreSQL.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.0-branch/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfacePostgreSQL.java?rev=1660042&r1=1660041&r2=1660042&view=diff
==============================================================================
---
manifoldcf/branches/release-2.0-branch/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfacePostgreSQL.java
(original)
+++
manifoldcf/branches/release-2.0-branch/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfacePostgreSQL.java
Mon Feb 16 08:06:25 2015
@@ -620,6 +620,9 @@ public class DBInterfacePostgreSQL exten
java.sql.SQLException sqlException = (java.sql.SQLException)e;
String message = sqlException.getMessage();
String sqlState = sqlException.getSQLState();
+ // If connection is closed, presume we are shutting down
+ if (sqlState != null && sqlState.equals("08003"))
+ return new
ManifoldCFException(message,e,ManifoldCFException.INTERRUPTED);
// Could not serialize
if (sqlState != null && sqlState.equals("40001"))
return new
ManifoldCFException(message,e,ManifoldCFException.DATABASE_TRANSACTION_ABORT);
Modified:
manifoldcf/branches/release-2.0-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobNotificationThread.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.0-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobNotificationThread.java?rev=1660042&r1=1660041&r2=1660042&view=diff
==============================================================================
---
manifoldcf/branches/release-2.0-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobNotificationThread.java
(original)
+++
manifoldcf/branches/release-2.0-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobNotificationThread.java
Mon Feb 16 08:06:25 2015
@@ -241,6 +241,8 @@ public class JobNotificationThread exten
}
catch (ManifoldCFException e)
{
+ if (e.getErrorCode() == ManifoldCFException.INTERRUPTED)
+ throw e;
exception = e;
}
}
@@ -423,6 +425,8 @@ public class JobNotificationThread exten
}
catch (ManifoldCFException e)
{
+ if (e.getErrorCode() == ManifoldCFException.INTERRUPTED)
+ throw e;
exception = e;
}
}
Modified:
manifoldcf/branches/release-2.0-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/SeedingThread.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.0-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/SeedingThread.java?rev=1660042&r1=1660041&r2=1660042&view=diff
==============================================================================
---
manifoldcf/branches/release-2.0-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/SeedingThread.java
(original)
+++
manifoldcf/branches/release-2.0-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/SeedingThread.java
Mon Feb 16 08:06:25 2015
@@ -243,6 +243,8 @@ public class SeedingThread extends Threa
}
catch (ManifoldCFException e)
{
+ if (e.getErrorCode() == ManifoldCFException.INTERRUPTED)
+ throw e;
exception = e;
}
}
Modified:
manifoldcf/branches/release-2.0-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StartDeleteThread.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.0-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StartDeleteThread.java?rev=1660042&r1=1660041&r2=1660042&view=diff
==============================================================================
---
manifoldcf/branches/release-2.0-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StartDeleteThread.java
(original)
+++
manifoldcf/branches/release-2.0-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StartDeleteThread.java
Mon Feb 16 08:06:25 2015
@@ -142,6 +142,8 @@ public class StartDeleteThread extends T
}
catch (ManifoldCFException e)
{
+ if (e.getErrorCode() == ManifoldCFException.INTERRUPTED)
+ throw e;
exception = e;
}
}
Modified:
manifoldcf/branches/release-2.0-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StartupThread.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.0-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StartupThread.java?rev=1660042&r1=1660041&r2=1660042&view=diff
==============================================================================
---
manifoldcf/branches/release-2.0-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StartupThread.java
(original)
+++
manifoldcf/branches/release-2.0-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StartupThread.java
Mon Feb 16 08:06:25 2015
@@ -239,6 +239,8 @@ public class StartupThread extends Threa
}
catch (ManifoldCFException e)
{
+ if (e.getErrorCode() == ManifoldCFException.INTERRUPTED)
+ throw e;
exception = e;
}
}
