Merged BRANCHES/DEV/BELARUS/HEAD-2010_03_17 to HEAD:

19338: CMIS-WS: Several fixes and updates for CMIS WS implementation.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19357 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Caruana
2010-03-18 11:51:44 +00:00
parent c372826b7b
commit b9833537e4
2 changed files with 3 additions and 2 deletions

View File

@@ -83,7 +83,8 @@ public class DMDiscoveryServicePort extends DMAbstractServicePort implements Dis
{ {
options.setMaxItems(parameters.getMaxItems().getValue().intValue()); options.setMaxItems(parameters.getMaxItems().getValue().intValue());
} }
boolean includeAllowableActions = (null != parameters.getIncludeAllowableActions()) ? (parameters.getIncludeAllowableActions().getValue()) : (false); boolean includeAllowableActions = ((null != parameters.getIncludeAllowableActions()) && (null != parameters.getIncludeAllowableActions().getValue())) ? (parameters
.getIncludeAllowableActions().getValue()) : (false);
String renditionFilter = (null != parameters.getRenditionFilter()) ? (parameters.getRenditionFilter().getValue()) : null; String renditionFilter = (null != parameters.getRenditionFilter()) ? (parameters.getRenditionFilter().getValue()) : null;
// execute query // execute query

View File

@@ -26,7 +26,7 @@ import javax.xml.ws.Holder;
import org.alfresco.cmis.CMISServiceException; import org.alfresco.cmis.CMISServiceException;
import org.alfresco.repo.cmis.ws.utils.ExceptionUtil; import org.alfresco.repo.cmis.ws.utils.ExceptionUtil;
@javax.jws.WebService(name = "PolicyServicePort", serviceName = "PolicyServicePort", portName = "PolicyServicePort", targetNamespace = "http://docs.oasis-open.org/ns/cmis/ws/200908/", endpointInterface = "org.alfresco.repo.cmis.ws.PolicyServicePort") @javax.jws.WebService(name = "PolicyServicePort", serviceName = "PolicyService", portName = "PolicyServicePort", targetNamespace = "http://docs.oasis-open.org/ns/cmis/ws/200908/", endpointInterface = "org.alfresco.repo.cmis.ws.PolicyServicePort")
public class DMPolicyServicePort extends DMAbstractServicePort implements PolicyServicePort public class DMPolicyServicePort extends DMAbstractServicePort implements PolicyServicePort
{ {
/** /**