You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2008/04/01 16:56:19 UTC
svn commit: r643423 - in
/jackrabbit/branches/1.3/jackrabbit-core/src/main/java/org/apache/jackrabbit/core:
NodeImpl.java version/NodeStateEx.java
Author: jukka
Date: Tue Apr 1 07:56:11 2008
New Revision: 643423
URL: http://svn.apache.org/viewvc?rev=643423&view=rev
Log:
1.3: Merged revision 628282 (JCR-1227)
Modified:
jackrabbit/branches/1.3/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/NodeImpl.java
jackrabbit/branches/1.3/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/NodeStateEx.java
Modified: jackrabbit/branches/1.3/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/NodeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.3/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/NodeImpl.java?rev=643423&r1=643422&r2=643423&view=diff
==============================================================================
--- jackrabbit/branches/1.3/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/NodeImpl.java (original)
+++ jackrabbit/branches/1.3/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/NodeImpl.java Tue Apr 1 07:56:11 2008
@@ -3940,7 +3940,8 @@
PropertyState prop = props[i];
propNames.add(prop.getName());
if (prop.isMultiValued()) {
- internalSetProperty(props[i].getName(), prop.getValues());
+ internalSetProperty(
+ props[i].getName(), prop.getValues(), prop.getType());
} else {
internalSetProperty(props[i].getName(), prop.getValues()[0]);
}
Modified: jackrabbit/branches/1.3/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/NodeStateEx.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.3/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/NodeStateEx.java?rev=643423&r1=643422&r2=643423&view=diff
==============================================================================
--- jackrabbit/branches/1.3/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/NodeStateEx.java (original)
+++ jackrabbit/branches/1.3/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/NodeStateEx.java Tue Apr 1 07:56:11 2008
@@ -591,17 +591,11 @@
public void copyFrom(PropertyImpl prop) throws RepositoryException {
if (prop.getDefinition().isMultiple()) {
InternalValue[] values = prop.internalGetValues();
- int type;
- if (values.length > 0) {
- type = values[0].getType();
- } else {
- type = prop.getDefinition().getRequiredType();
- }
InternalValue[] copiedValues = new InternalValue[values.length];
for (int i = 0; i < values.length; i++) {
copiedValues[i] = values[i].createCopy();
}
- setPropertyValues(prop.getQName(), type, copiedValues);
+ setPropertyValues(prop.getQName(), prop.getType(), copiedValues);
} else {
setPropertyValue(prop.getQName(), prop.internalGetValue().createCopy());
}