From 2b03e2bbf0ba0f96df2b755c3f16c25b0d8b5e4f Mon Sep 17 00:00:00 2001 From: Ancuta Morarasu Date: Fri, 5 Mar 2021 12:32:10 +0200 Subject: [PATCH] ACS-1201: Model integrity violation saving properties (#332) - Fix the name property persistence in ContentModelFormProcessor to only save when the property value is actually changed. This prevents the FilenameFilteringInterceptor to be called when there are no changes to the file name. --- .../node/ContentModelFormProcessor.java | 59 ++++++++++--------- 1 file changed, 31 insertions(+), 28 deletions(-) diff --git a/repository/src/main/java/org/alfresco/repo/forms/processor/node/ContentModelFormProcessor.java b/repository/src/main/java/org/alfresco/repo/forms/processor/node/ContentModelFormProcessor.java index 97d351a9f9..df27ed9159 100644 --- a/repository/src/main/java/org/alfresco/repo/forms/processor/node/ContentModelFormProcessor.java +++ b/repository/src/main/java/org/alfresco/repo/forms/processor/node/ContentModelFormProcessor.java @@ -1,28 +1,28 @@ -/* - * #%L - * Alfresco Repository - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Repository + * %% + * Copyright (C) 2005 - 2021 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.forms.processor.node; import static org.alfresco.repo.forms.processor.node.FormFieldConstants.ASSOC_DATA_ADDED_SUFFIX; @@ -634,9 +634,12 @@ public abstract class ContentModelFormProcessor extends { try { - // if the name property changes the rename method of the file folder - // service should be called rather than updating the property directly - this.fileFolderService.rename(nodeRef, (String) fieldData.getValue()); + if (!fileInfo.getName().equals(fieldData.getValue())) + { + // if the name property changes, the rename method of the file folder + // service should be called rather than updating the property directly + this.fileFolderService.rename(nodeRef, (String) fieldData.getValue()); + } } catch (FileExistsException fee) {