You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by tr...@apache.org on 2006/09/25 20:51:43 UTC
svn commit: r449773 -
/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenNodeImpl.java
Author: tripod
Date: Mon Sep 25 11:51:42 2006
New Revision: 449773
URL: http://svn.apache.org/viewvc?view=rev&rev=449773
Log:
JCR-568 incorrect jcr:uuid on frozen subnode
Modified:
jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenNodeImpl.java
Modified: jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenNodeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenNodeImpl.java?view=diff&rev=449773&r1=449772&r2=449773
==============================================================================
--- jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenNodeImpl.java (original)
+++ jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenNodeImpl.java Mon Sep 25 11:51:42 2006
@@ -302,7 +302,12 @@
break;
case OnParentVersionAction.VERSION:
case OnParentVersionAction.COPY:
- node.copyFrom(prop);
+ // ignore frozen properties
+ if (!prop.getQName().equals(QName.JCR_PRIMARYTYPE)
+ && !prop.getQName().equals(QName.JCR_MIXINTYPES)
+ && !prop.getQName().equals(QName.JCR_UUID)) {
+ node.copyFrom(prop);
+ }
break;
}
}