Author: zavizionov Date: 2011-11-04 05:48:37 -0400 (Fri, 04 Nov 2011) New Revision: 5159 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/TestMixin.java Log: EXOJCR-1568 Can't remove mixin from node and add mixin again. Fixed formatter. Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java 2011-11-04 08:37:26 UTC (rev 5158) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java 2011-11-04 09:48:37 UTC (rev 5159) @@ -1930,7 +1930,8 @@ for (PropertyDefinitionData pd : ntmanager.getAllPropertyDefinitions(removedName)) { // to skip remove propertyDefinition with existed another nodeType property definition - if (ntmanager.getPropertyDefinitions(pd.getName(), nodeData().getPrimaryTypeName(), newMixin.toArray(new InternalQName[]{})) == null) { + if (ntmanager.getPropertyDefinitions(pd.getName(), nodeData().getPrimaryTypeName(), newMixin.toArray(new InternalQName[]{})) == null) + { ItemData p = dataManager.getItemData(nodeData(), new QPathEntry(pd.getName(), 1), ItemType.PROPERTY, false); if (p != null && !p.isNode()) { Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/TestMixin.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/TestMixin.java 2011-11-04 08:37:26 UTC (rev 5158) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/TestMixin.java 2011-11-04 09:48:37 UTC (rev 5159) @@ -88,10 +88,14 @@ folder.addMixin("test:my"); session.save(); folder.removeMixin("test:my"); - try { + try + { session.save(); - } catch (Exception e) { - fail("Shouldn't be removed a property definition, there is existed another node type (primary or mixin) which has the property definition. \n" + e.getMessage()); } + catch (Exception e) + { + fail("Shouldn't be removed a property definition, there is existed another node type (primary or mixin) which has the property definition. \n" + + e.getMessage()); + } } }