jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r480323 - in /jackrabbit/branches/1.1/jackrabbit/src: main/java/org/apache/jackrabbit/core/version/InternalFrozenNodeImpl.java test/java/org/apache/jackrabbit/test/api/version/FrozenNodeTest.java
Date Wed, 29 Nov 2006 01:37:19 GMT
Author: jukka
Date: Tue Nov 28 17:37:18 2006
New Revision: 480323

URL: http://svn.apache.org/viewvc?view=rev&rev=480323
Log:
branches/1.1: Merged revisions 449262 and 449773 (JCR-568)

Added:
    jackrabbit/branches/1.1/jackrabbit/src/test/java/org/apache/jackrabbit/test/api/version/FrozenNodeTest.java
      - copied unchanged from r449262, jackrabbit/trunk/jackrabbit/src/test/java/org/apache/jackrabbit/test/api/version/FrozenNodeTest.java
Modified:
    jackrabbit/branches/1.1/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenNodeImpl.java

Modified: jackrabbit/branches/1.1/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenNodeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.1/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenNodeImpl.java?view=diff&rev=480323&r1=480322&r2=480323
==============================================================================
--- jackrabbit/branches/1.1/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenNodeImpl.java
(original)
+++ jackrabbit/branches/1.1/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenNodeImpl.java
Tue Nov 28 17:37:18 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