diff --git a/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeFolderSizeRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeFolderSizeRelation.java index 04c927029c..744e7402f4 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeFolderSizeRelation.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeFolderSizeRelation.java @@ -256,7 +256,10 @@ public class NodeFolderSizeRelation implements CalculateSize if(folderSizeAction!=null) { String errorInAction = (String) folderSizeAction.getParameterValue(NodeSizeActionExecuter.ERROR); - throw new InvalidNodeTypeException(errorInAction); + if(errorInAction.length()>1) + { + throw new InvalidNodeTypeException(errorInAction); + } } } diff --git a/repository/src/main/java/org/alfresco/model/FolderSizeModel.java b/repository/src/main/java/org/alfresco/model/FolderSizeModel.java index e5e187fb20..2a3d0bcb7e 100644 --- a/repository/src/main/java/org/alfresco/model/FolderSizeModel.java +++ b/repository/src/main/java/org/alfresco/model/FolderSizeModel.java @@ -33,7 +33,5 @@ public class FolderSizeModel { /** Folder Model URI */ private static final String SIZE_MODEL_1_0_URI = "http://www.alfresco.org/model/size/1.0"; - public static final QName PROP_STATUS = QName.createQName(SIZE_MODEL_1_0_URI, "status"); public static final QName PROP_OUTPUT = QName.createQName(SIZE_MODEL_1_0_URI, "result"); - public static final QName PROP_ERROR = QName.createQName(SIZE_MODEL_1_0_URI, "error"); } diff --git a/repository/src/test/java/org/alfresco/repo/action/executer/NodeSizeActionExecuterTest.java b/repository/src/test/java/org/alfresco/repo/action/executer/NodeSizeActionExecuterTest.java index 9048e3a861..c15f16878c 100644 --- a/repository/src/test/java/org/alfresco/repo/action/executer/NodeSizeActionExecuterTest.java +++ b/repository/src/test/java/org/alfresco/repo/action/executer/NodeSizeActionExecuterTest.java @@ -104,7 +104,8 @@ public class NodeSizeActionExecuterTest extends BaseSpringTest ActionImpl action = new ActionImpl(null, ID, NodeSizeActionExecuter.NAME, null); action.setParameterValue(NodeSizeActionExecuter.PAGE_SIZE, maxItems); this.executer.executeImpl(action, this.nodeRef); - Map mapResult = (Map)this.nodeService.getProperty(this.nodeRef, FolderSizeModel.PROP_OUTPUT); + Object resultAction = action.getParameterValue(NodeSizeActionExecuter.RESULT); + Map mapResult = (Map)resultAction; assertTrue(mapResult != null); } }