inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

MNT-17001: Handle overflow condition; improve test to cover

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133189 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2016-11-28 13:26:14 +00:00
parent 972a52c4f0
commit 41dbd4564b
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/java/org/alfresco/opencmis/CMISConnector.java
View File

@@ -471,6 +471,10 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
{ {
throw new IllegalArgumentException("The default maximum number of content changes to retrieve must be greater than zero."); throw new IllegalArgumentException("The default maximum number of content changes to retrieve must be greater than zero.");
} }
else if (contentChangesDefaultMaxItems == Integer.MAX_VALUE)
{
throw new IllegalArgumentException("The server cannot return " + Integer.MAX_VALUE + " content changes in a request!");
}
this.contentChangesDefaultMaxItems = contentChangesDefaultMaxItems; this.contentChangesDefaultMaxItems = contentChangesDefaultMaxItems;
} }
@@ -3697,9 +3701,12 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
params.setApplicationName(CMIS_CHANGELOG_AUDIT_APPLICATION); params.setApplicationName(CMIS_CHANGELOG_AUDIT_APPLICATION);
params.setForward(true); params.setForward(true);
params.setFromId(from); params.setFromId(from);
// So we have a BigInteger. We need to ensure that we cut it down to an integer smaller than Integer.MAX_VALUE
int maxResults = (maxItems == null ? contentChangesDefaultMaxItems : maxItems.intValue()); int maxResults = (maxItems == null ? contentChangesDefaultMaxItems : maxItems.intValue());
maxResults = maxResults < 1 ? contentChangesDefaultMaxItems : maxResults; // Just a double check of the unbundled contents maxResults = maxResults < 1 ? contentChangesDefaultMaxItems : maxResults; // Just a double check of the unbundled contents
maxResults = maxResults > contentChangesDefaultMaxItems ? contentChangesDefaultMaxItems : maxResults; // cut it down
int queryFor = maxResults + 1; // Query for 1 more so that we know if there are more results int queryFor = maxResults + 1; // Query for 1 more so that we know if there are more results
auditService.auditQuery(changeLogCollectingCallback, params, queryFor); auditService.auditQuery(changeLogCollectingCallback, params, queryFor);

4
source/test-java/org/alfresco/opencmis/CMISTest.java
View File

@@ -2600,6 +2600,10 @@ public class CMISTest
// and one // and one
changes = cmisService.getContentChanges(repositoryId, new Holder<String>(changeToken), Boolean.TRUE, null, Boolean.FALSE, Boolean.FALSE, BigInteger.valueOf(1), null); changes = cmisService.getContentChanges(repositoryId, new Holder<String>(changeToken), Boolean.TRUE, null, Boolean.FALSE, Boolean.FALSE, BigInteger.valueOf(1), null);
assertEquals("Expected to still get changes", changes.getObjects().size(), 1); assertEquals("Expected to still get changes", changes.getObjects().size(), 1);
// Integery.MAX_VALUE must be handled
// This will limit the number to a sane value
changes = cmisService.getContentChanges(repositoryId, new Holder<String>(changeToken), Boolean.TRUE, null, Boolean.FALSE, Boolean.FALSE, BigInteger.valueOf(Integer.MAX_VALUE), null);
assertTrue("Expected to still get changes", changes.getObjects().size() >= expectAtLeast);
// but not negative // but not negative
try try
{ {