jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r1509113 - in /jackrabbit/branches/2.6: ./ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/ jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/
Date Thu, 01 Aug 2013 08:32:26 GMT
Author: jukka
Date: Thu Aug  1 08:32:25 2013
New Revision: 1509113

URL: http://svn.apache.org/r1509113
Log:
2.6: Merged revision 1509101 (JCR-3635)

Added:
    jackrabbit/branches/2.6/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/CopyFrozenUuidTest.java
      - copied unchanged from r1509101, jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/CopyFrozenUuidTest.java
Modified:
    jackrabbit/branches/2.6/   (props changed)
    jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenNodeImpl.java
    jackrabbit/branches/2.6/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/TestAll.java

Propchange: jackrabbit/branches/2.6/
------------------------------------------------------------------------------
  Merged /jackrabbit/trunk:r1509101

Modified: jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenNodeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenNodeImpl.java?rev=1509113&r1=1509112&r2=1509113&view=diff
==============================================================================
--- jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenNodeImpl.java
(original)
+++ jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenNodeImpl.java
Thu Aug  1 08:32:25 2013
@@ -265,7 +265,11 @@ class InternalFrozenNodeImpl extends Int
                 // ignore frozen properties
                 if (!propName.equals(NameConstants.JCR_PRIMARYTYPE)
                         && !propName.equals(NameConstants.JCR_MIXINTYPES)
-                        && !propName.equals(NameConstants.JCR_UUID)) {
+                        && !propName.equals(NameConstants.JCR_UUID)
+                        // JCR-3635: should never occur in normal content...
+                        && !propName.equals(NameConstants.JCR_FROZENPRIMARYTYPE)
+                        && !propName.equals(NameConstants.JCR_FROZENMIXINTYPES)
+                        && !propName.equals(NameConstants.JCR_FROZENUUID)) {
                     node.copyFrom(prop);
                 }
             }

Modified: jackrabbit/branches/2.6/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/TestAll.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.6/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/TestAll.java?rev=1509113&r1=1509112&r2=1509113&view=diff
==============================================================================
--- jackrabbit/branches/2.6/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/TestAll.java
(original)
+++ jackrabbit/branches/2.6/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/TestAll.java
Thu Aug  1 08:32:25 2013
@@ -33,6 +33,7 @@ public class TestAll extends TestCase {
     public static Test suite() {
         TestSuite suite = new TestSuite("Version tests");
         suite.addTestSuite(CheckinRemoveVersionTest.class);
+        suite.addTestSuite(CopyFrozenUuidTest.class);
         suite.addTestSuite(InternalVersionHistoryImplTest.class);
         suite.addTestSuite(RemoveVersionLabelTest.class);
         suite.addTestSuite(RestoreTest.class);



Mime
View raw message