From b9833537e43c13c97732d7f443180e10c0e27807 Mon Sep 17 00:00:00 2001 From: David Caruana Date: Thu, 18 Mar 2010 11:51:44 +0000 Subject: [PATCH] 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 --- .../java/org/alfresco/repo/cmis/ws/DMDiscoveryServicePort.java | 3 ++- source/java/org/alfresco/repo/cmis/ws/DMPolicyServicePort.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/source/java/org/alfresco/repo/cmis/ws/DMDiscoveryServicePort.java b/source/java/org/alfresco/repo/cmis/ws/DMDiscoveryServicePort.java index 183f1311b6..6593e07f2c 100644 --- a/source/java/org/alfresco/repo/cmis/ws/DMDiscoveryServicePort.java +++ b/source/java/org/alfresco/repo/cmis/ws/DMDiscoveryServicePort.java @@ -83,7 +83,8 @@ public class DMDiscoveryServicePort extends DMAbstractServicePort implements Dis { 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; // execute query diff --git a/source/java/org/alfresco/repo/cmis/ws/DMPolicyServicePort.java b/source/java/org/alfresco/repo/cmis/ws/DMPolicyServicePort.java index e88978f0dc..c9580c7535 100644 --- a/source/java/org/alfresco/repo/cmis/ws/DMPolicyServicePort.java +++ b/source/java/org/alfresco/repo/cmis/ws/DMPolicyServicePort.java @@ -26,7 +26,7 @@ import javax.xml.ws.Holder; import org.alfresco.cmis.CMISServiceException; 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 { /**