manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From piergior...@apache.org
Subject svn commit: r1810010 - in /manifoldcf/branches/CONNECTORS-1356-2.7.1/connectors/cmis/connector/src: main/java/org/apache/manifoldcf/agents/output/cmisoutput/ test/java/org/apache/manifoldcf/agents/output/cmisoutput/tests/
Date Thu, 28 Sep 2017 15:35:40 GMT
Author: piergiorgio
Date: Thu Sep 28 15:35:40 2017
New Revision: 1810010

URL: http://svn.apache.org/viewvc?rev=1810010&view=rev
Log:
- fixed the update of existing contents (CONNECTORS-1356)
- we need to solve the last issue on the integration test about the removeDocument

Modified:
    manifoldcf/branches/CONNECTORS-1356-2.7.1/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/agents/output/cmisoutput/CmisOutputConnector.java
    manifoldcf/branches/CONNECTORS-1356-2.7.1/connectors/cmis/connector/src/test/java/org/apache/manifoldcf/agents/output/cmisoutput/tests/APISanityHSQLDBIT.java

Modified: manifoldcf/branches/CONNECTORS-1356-2.7.1/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/agents/output/cmisoutput/CmisOutputConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1356-2.7.1/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/agents/output/cmisoutput/CmisOutputConnector.java?rev=1810010&r1=1810009&r2=1810010&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1356-2.7.1/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/agents/output/cmisoutput/CmisOutputConnector.java
(original)
+++ manifoldcf/branches/CONNECTORS-1356-2.7.1/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/agents/output/cmisoutput/CmisOutputConnector.java
Thu Sep 28 15:35:40 2017
@@ -960,7 +960,7 @@ public class CmisOutputConnector extends
 				return DOCUMENT_STATUS_REJECTED;
 			}
 
-		} catch (CmisContentAlreadyExistsException e) {
+		} catch (CmisContentAlreadyExistsException | CmisNameConstraintViolationException e) {
 			
 			//updating the existing content
 			if(leafParent != null) {
@@ -979,10 +979,6 @@ public class CmisOutputConnector extends
 			resultDescription = DOCUMENT_STATUS_ACCEPTED_DESC;
 			return DOCUMENT_STATUS_ACCEPTED;
 			
-		} catch (CmisNameConstraintViolationException e) {
-			resultDescription = DOCUMENT_STATUS_REJECTED_DESC;
-			throw new ManifoldCFException(e.getMessage(), e);
-			
 		} catch (Exception e) {
 			resultDescription = DOCUMENT_STATUS_REJECTED_DESC;
 			throw new ManifoldCFException(e.getMessage(), e);

Modified: manifoldcf/branches/CONNECTORS-1356-2.7.1/connectors/cmis/connector/src/test/java/org/apache/manifoldcf/agents/output/cmisoutput/tests/APISanityHSQLDBIT.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1356-2.7.1/connectors/cmis/connector/src/test/java/org/apache/manifoldcf/agents/output/cmisoutput/tests/APISanityHSQLDBIT.java?rev=1810010&r1=1810009&r2=1810010&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1356-2.7.1/connectors/cmis/connector/src/test/java/org/apache/manifoldcf/agents/output/cmisoutput/tests/APISanityHSQLDBIT.java
(original)
+++ manifoldcf/branches/CONNECTORS-1356-2.7.1/connectors/cmis/connector/src/test/java/org/apache/manifoldcf/agents/output/cmisoutput/tests/APISanityHSQLDBIT.java
Thu Sep 28 15:35:40 2017
@@ -242,7 +242,7 @@ public class APISanityHSQLDBIT extends B
       connectionObject.addChild(connectionObject.getChildCount(),child);
 
       child = new ConfigurationNode("max_connections");
-      child.setValue("1");
+      child.setValue("10");
       connectionObject.addChild(connectionObject.getChildCount(),child);
       
       child = new ConfigurationNode("configuration");
@@ -322,7 +322,7 @@ public class APISanityHSQLDBIT extends B
       connectionObject.addChild(connectionObject.getChildCount(),child);
 
       child = new ConfigurationNode("max_connections");
-      child.setValue("1");
+      child.setValue("10");
       connectionObject.addChild(connectionObject.getChildCount(),child);
 
       child = new ConfigurationNode("configuration");



Mime
View raw message