[exo-jcr-commits] exo-jcr SVN: r991 - in jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl: core/value and 1 other directories.

Author: tolusha Date: 2009-12-10 11:24:35 -0500 (Thu, 10 Dec 2009) New Revision: 991 Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/value/ValueConstraintsMatcher.java jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/SessionChangesLog.java Log: EXOJCR-300: fix ClassCastException Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java =================================================================== --- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java 2009-12-10 16:23:39 UTC (rev 990) +++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java 2009-12-10 16:24:35 UTC (rev 991) @@ -577,9 +577,8 @@ newMixin.add(type.getName()); values.add(new TransientValueData(type.getName())); - TransientPropertyData prop = - (TransientPropertyData)dataManager.getItemData(((NodeData)getData()), new QPathEntry(Constants.JCR_MIXINTYPES, - 0)); + PropertyData prop = + (PropertyData)dataManager.getItemData(((NodeData)getData()), new QPathEntry(Constants.JCR_MIXINTYPES, 0)); ItemState state; if (prop != null) @@ -1655,8 +1654,8 @@ session.getActionHandler().preRemoveMixin(this, name); - TransientPropertyData propData = - (TransientPropertyData)dataManager.getItemData(nodeData(), new QPathEntry(Constants.JCR_MIXINTYPES, 0)); + PropertyData propData = + (PropertyData)dataManager.getItemData(nodeData(), new QPathEntry(Constants.JCR_MIXINTYPES, 0)); // create new property data with new values TransientPropertyData prop = @@ -2918,8 +2917,8 @@ permValues.add(vd); } - TransientPropertyData permProp = - (TransientPropertyData)dataManager.getItemData(nodeData(), new QPathEntry(Constants.EXO_PERMISSIONS, 0)); + PropertyData permProp = + (PropertyData)dataManager.getItemData(nodeData(), new QPathEntry(Constants.EXO_PERMISSIONS, 0)); permProp = new TransientPropertyData(permProp.getQPath(), permProp.getIdentifier(), permProp.getPersistedVersion(), Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/value/ValueConstraintsMatcher.java =================================================================== --- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/value/ValueConstraintsMatcher.java 2009-12-10 16:23:39 UTC (rev 990) +++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/value/ValueConstraintsMatcher.java 2009-12-10 16:24:35 UTC (rev 991) @@ -85,7 +85,7 @@ boolean invalid = true; // do not use getString because of string consuming - TransientValueData valueData = (TransientValueData)value; + ValueData valueData = (ValueData)value; if (type == PropertyType.STRING) { try Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/SessionChangesLog.java =================================================================== --- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/SessionChangesLog.java 2009-12-10 16:23:39 UTC (rev 990) +++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/SessionChangesLog.java 2009-12-10 16:24:35 UTC (rev 991) @@ -406,7 +406,7 @@ for (int i = 0; i < items.size(); i++) { - TransientItemData item = (TransientItemData)items.get(i).getData(); + ItemData item = items.get(i).getData(); if (item.getIdentifier().equals(rootData.getIdentifier())) { // the node