jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tri...@apache.org
Subject svn commit: r449773 - /jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenNodeImpl.java
Date Mon, 25 Sep 2006 18:51:43 GMT
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;
             }
         }



Mime
View raw message