manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1660043 - in /manifoldcf/branches/release-1.8-branch: ./ framework/ framework/core/src/main/java/org/apache/manifoldcf/core/database/ framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/
Date Mon, 16 Feb 2015 08:09:38 GMT
Author: kwright
Date: Mon Feb 16 08:09:37 2015
New Revision: 1660043

URL: http://svn.apache.org/r1660043
Log:
Pull up fix for CONNECTORS-1156 from dev_1x branch

Modified:
    manifoldcf/branches/release-1.8-branch/   (props changed)
    manifoldcf/branches/release-1.8-branch/CHANGES.txt
    manifoldcf/branches/release-1.8-branch/framework/   (props changed)
    manifoldcf/branches/release-1.8-branch/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfacePostgreSQL.java
    manifoldcf/branches/release-1.8-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobNotificationThread.java
    manifoldcf/branches/release-1.8-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/SeedingThread.java
    manifoldcf/branches/release-1.8-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StartDeleteThread.java
    manifoldcf/branches/release-1.8-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StartupThread.java

Propchange: manifoldcf/branches/release-1.8-branch/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 16 08:09:37 2015
@@ -118,5 +118,5 @@
 /manifoldcf/branches/CONNECTORS-981:1605049-1605773
 /manifoldcf/branches/CONNECTORS-989:1611600-1612101
 /manifoldcf/branches/CONNECTORS-990:1610284-1610707
-/manifoldcf/branches/dev_1x:1646136,1646323,1646399,1646405,1646641,1646948,1647576,1647609,1650352,1651922,1654652,1655207,1655378,1655384,1655413,1655689,1655741,1655745,1658189
-/manifoldcf/trunk:1620703,1620748,1620812,1620862,1621449,1621613,1621855,1622213,1622740,1622850,1622853-1622854,1623249,1623251,1623314,1623599,1623951,1623953-1623954,1623956,1623972,1624058,1624085,1624174,1624236,1624377,1624384,1624399,1624449,1624464,1624504,1624729-1624731,1624906,1624909-1624910,1625023,1625095,1625103,1625108,1625264,1625270,1625394,1625400,1625910,1626090,1626097,1626102,1626638-1626639,1626973,1627687,1627690,1627959,1628066,1628106,1628168,1628188,1628699,1628798,1628808,1628845,1628905,1629122,1629374-1629375,1629379,1629541,1629994,1630188,1630535,1630623,1630671,1630812,1630885,1631039,1631162,1631164,1631252,1631750,1631953,1632013,1632225,1632289,1632562,1632844,1632847,1632854,1633062-1633063,1633108,1633193,1633202,1633282,1633284,1633295,1633336,1633339,1633345,1633348,1633364,1633378,1633383,1633432,1633546,1633590,1633634,1633668,1633727,1633760,1633764,1633786,1633910,1633923,1634021,1634028,1634067,1634132,1634145,1634148,1634155,1634188,163
 4202,1634264,1634373,1634530,1634688,1634850,1634857,1635103,1635116,1635421,1635438,1635478,1635481,1635484,1635490,1635809,1635939,1636146,1636167,1636180,1636207,1636215,1636232,1636334,1636519,1636570,1636684,1636940,1637011,1637310,1637350,1637364,1637373,1637378,1639259,1639593,1639600,1640018,1640101,1640199,1640204,1640208,1640314,1640319,1640749,1640772,1640805,1640888,1640925,1640941-1640942,1641222,1641328,1641557,1641559,1641629,1641633,1641724,1641754,1641911,1642163,1642255,1642318,1642531,1642650,1642658,1642673,1642716,1644197,1644399,1644538,1644920,1644931,1646317,1646397,1646403,1646640,1646947,1647574,1647608,1650351,1651921,1654651,1655205,1655377,1655411,1658188
+/manifoldcf/branches/dev_1x:1646136,1646323,1646399,1646405,1646641,1646948,1647576,1647609,1650352,1651922,1654652,1655207,1655378,1655384,1655413,1655689,1655741,1655745,1657349,1658005,1658037,1658189
+/manifoldcf/trunk:1620703,1620748,1620812,1620862,1621449,1621613,1621855,1622213,1622740,1622850,1622853-1622854,1623249,1623251,1623314,1623599,1623951,1623953-1623954,1623956,1623972,1624058,1624085,1624174,1624236,1624377,1624384,1624399,1624449,1624464,1624504,1624729-1624731,1624906,1624909-1624910,1625023,1625095,1625103,1625108,1625264,1625270,1625394,1625400,1625910,1626090,1626097,1626102,1626638-1626639,1626973,1627687,1627690,1627959,1628066,1628106,1628168,1628188,1628699,1628798,1628808,1628845,1628905,1629122,1629374-1629375,1629379,1629541,1629994,1630188,1630535,1630623,1630671,1630812,1630885,1631039,1631162,1631164,1631252,1631750,1631953,1632013,1632225,1632289,1632562,1632844,1632847,1632854,1633062-1633063,1633108,1633193,1633202,1633282,1633284,1633295,1633336,1633339,1633345,1633348,1633364,1633378,1633383,1633432,1633546,1633590,1633634,1633668,1633727,1633760,1633764,1633786,1633910,1633923,1634021,1634028,1634067,1634132,1634145,1634148,1634155,1634188,163
 4202,1634264,1634373,1634530,1634688,1634850,1634857,1635103,1635116,1635421,1635438,1635478,1635481,1635484,1635490,1635809,1635939,1636146,1636167,1636180,1636207,1636215,1636232,1636334,1636519,1636570,1636684,1636940,1637011,1637310,1637350,1637364,1637373,1637378,1639259,1639593,1639600,1640018,1640101,1640199,1640204,1640208,1640314,1640319,1640749,1640772,1640805,1640888,1640925,1640941-1640942,1641222,1641328,1641557,1641559,1641629,1641633,1641724,1641754,1641911,1642163,1642255,1642318,1642531,1642650,1642658,1642673,1642716,1644197,1644399,1644538,1644920,1644931,1646317,1646397,1646403,1646640,1646947,1647574,1647608,1650351,1651921,1654651,1655205,1655377,1655411,1657346,1658004,1658036,1658188

Modified: manifoldcf/branches/release-1.8-branch/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/CHANGES.txt?rev=1660043&r1=1660042&r2=1660043&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-1.8-branch/CHANGES.txt Mon Feb 16 08:09:37 2015
@@ -4,6 +4,10 @@ $Id$
 
 ======================= Release 1.8.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)
 

Propchange: manifoldcf/branches/release-1.8-branch/framework/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 16 08:09:37 2015
@@ -112,6 +112,6 @@
 /manifoldcf/branches/CONNECTORS-981/framework:1605049-1605773
 /manifoldcf/branches/CONNECTORS-989/framework:1611600-1612101
 /manifoldcf/branches/CONNECTORS-990/framework:1610284-1610707
-/manifoldcf/branches/dev_1x/framework:1646136,1646323,1646399,1646405,1646641,1647576,1647609,1650352,1651922,1655378,1655384,1655413,1655689,1655741,1655745
+/manifoldcf/branches/dev_1x/framework:1646136,1646323,1646399,1646405,1646641,1647576,1647609,1650352,1651922,1655378,1655384,1655413,1655689,1655741,1655745,1657349,1658005,1658037
 /manifoldcf/trunk:1629122
-/manifoldcf/trunk/framework:1620703,1620748,1620812,1620862,1621449,1621613,1621855,1622213,1622740,1622850,1622853-1622854,1623249,1623251,1623314,1623599,1623951,1623953-1623954,1623956,1623972,1624058,1624085,1624174,1624236,1624377,1624384,1624399,1624449,1624464,1624504,1624729-1624731,1624906,1624909-1624910,1625023,1625095,1625103,1625108,1625264,1625270,1625394,1625400,1625910,1626090,1626097,1626102,1626638-1626639,1626973,1627687,1627690,1627959,1628066,1628106,1628168,1628188,1628699,1628798,1628808,1628845,1628905,1629122,1629374-1629375,1629379,1629541,1629994,1630188,1630535,1630623,1630671,1630812,1630885,1631039,1631162,1631164,1631252,1632013,1632289,1632844,1633108,1633193,1633202,1633348,1633364,1634145,1634148,1634155,1634264,1634373,1634530,1635438,1635809,1636146,1636180,1636207,1636232,1636334,1636519,1636570,1636684,1636940,1637011,1639593,1639600,1640018,1640101,1640199,1640314,1640319,1640749,1640772,1640925,1640941,1641222,1641557,1641559,1641724,1641911,1
 642163,1642255,1642318,1644197,1644399,1646317,1646397,1646403,1646640,1647574,1647608,1650351,1651921,1655377,1655411
+/manifoldcf/trunk/framework:1620703,1620748,1620812,1620862,1621449,1621613,1621855,1622213,1622740,1622850,1622853-1622854,1623249,1623251,1623314,1623599,1623951,1623953-1623954,1623956,1623972,1624058,1624085,1624174,1624236,1624377,1624384,1624399,1624449,1624464,1624504,1624729-1624731,1624906,1624909-1624910,1625023,1625095,1625103,1625108,1625264,1625270,1625394,1625400,1625910,1626090,1626097,1626102,1626638-1626639,1626973,1627687,1627690,1627959,1628066,1628106,1628168,1628188,1628699,1628798,1628808,1628845,1628905,1629122,1629374-1629375,1629379,1629541,1629994,1630188,1630535,1630623,1630671,1630812,1630885,1631039,1631162,1631164,1631252,1632013,1632289,1632844,1633108,1633193,1633202,1633348,1633364,1634145,1634148,1634155,1634264,1634373,1634530,1635438,1635809,1636146,1636180,1636207,1636232,1636334,1636519,1636570,1636684,1636940,1637011,1639593,1639600,1640018,1640101,1640199,1640314,1640319,1640749,1640772,1640925,1640941,1641222,1641557,1641559,1641724,1641911,1
 642163,1642255,1642318,1644197,1644399,1646317,1646397,1646403,1646640,1647574,1647608,1650351,1651921,1655377,1655411,1657346,1658004,1658036

Modified: manifoldcf/branches/release-1.8-branch/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfacePostgreSQL.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfacePostgreSQL.java?rev=1660043&r1=1660042&r2=1660043&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfacePostgreSQL.java
(original)
+++ manifoldcf/branches/release-1.8-branch/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfacePostgreSQL.java
Mon Feb 16 08:09:37 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-1.8-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobNotificationThread.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobNotificationThread.java?rev=1660043&r1=1660042&r2=1660043&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobNotificationThread.java
(original)
+++ manifoldcf/branches/release-1.8-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobNotificationThread.java
Mon Feb 16 08:09:37 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-1.8-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/SeedingThread.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/SeedingThread.java?rev=1660043&r1=1660042&r2=1660043&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/SeedingThread.java
(original)
+++ manifoldcf/branches/release-1.8-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/SeedingThread.java
Mon Feb 16 08:09:37 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-1.8-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StartDeleteThread.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StartDeleteThread.java?rev=1660043&r1=1660042&r2=1660043&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StartDeleteThread.java
(original)
+++ manifoldcf/branches/release-1.8-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StartDeleteThread.java
Mon Feb 16 08:09:37 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-1.8-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StartupThread.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.8-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StartupThread.java?rev=1660043&r1=1660042&r2=1660043&view=diff
==============================================================================
--- manifoldcf/branches/release-1.8-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StartupThread.java
(original)
+++ manifoldcf/branches/release-1.8-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StartupThread.java
Mon Feb 16 08:09:37 2015
@@ -239,6 +239,8 @@ public class StartupThread extends Threa
                 }
                 catch (ManifoldCFException e)
                 {
+                  if (e.getErrorCode() == ManifoldCFException.INTERRUPTED)
+                    throw e;
                   exception = e;
                 }
               }



Mime
View raw message