Author: kwright
Date: Wed Sep 17 01:02:36 2014
New Revision: 1625444
URL: http://svn.apache.org/r1625444
Log:
Pull up fixes for CONNECTORS-1016 from dev_1x branch
Modified:
manifoldcf/branches/release-1.7-branch/ (props changed)
manifoldcf/branches/release-1.7-branch/CHANGES.txt
manifoldcf/branches/release-1.7-branch/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java
Propchange: manifoldcf/branches/release-1.7-branch/
------------------------------------------------------------------------------
Merged /manifoldcf/branches/dev_1x:r1620735
Merged /manifoldcf/trunk:r1620703
Modified: manifoldcf/branches/release-1.7-branch/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.7-branch/CHANGES.txt?rev=1625444&r1=1625443&r2=1625444&view=diff
==============================================================================
--- manifoldcf/branches/release-1.7-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-1.7-branch/CHANGES.txt Wed Sep 17 01:02:36 2014
@@ -8,6 +8,9 @@ CONNECTORS-1031: Fix Zookeeper synchroni
against short tick time settings.
(Karl Wright)
+CONNECTORS-1016: Recognize non-existent user.
+(David Morana, Karl Wright)
+
CONNECTORS-949: Upgrade OpenCMIS to latest version to see if it
fixes join queries.
(Karl Wright)
Modified:
manifoldcf/branches/release-1.7-branch/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.7-branch/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java?rev=1625444&r1=1625443&r2=1625444&view=diff
==============================================================================
---
manifoldcf/branches/release-1.7-branch/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java
(original)
+++
manifoldcf/branches/release-1.7-branch/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java
Wed Sep 17 01:02:36 2014
@@ -6243,8 +6243,8 @@ public class LivelinkConnector extends o
Logging.connectors.debug("Livelink: User status retrieved for
"+Integer.toString(user)+": status="+Integer.toString(status));
}
- // Treat both 103101 and 103102 as 'object not found'.
- if (status == 103101 || status == 103102)
+ // Treat both 103101 and 103102 as 'object not found'. 401101 is 'user
not found'.
+ if (status == 103101 || status == 103102 || status == 401101)
return;
// This error means we don't have permission to get the object's
status, apparently
