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 2013/08/01 11:12:51 UTC
svn commit: r1509135 - in /jackrabbit/branches/2.2: ./
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/
jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/
Author: jukka
Date: Thu Aug 1 09:12:51 2013
New Revision: 1509135
URL: http://svn.apache.org/r1509135
Log:
2.2: Merged revision 1509101 (JCR-3635)
Added:
jackrabbit/branches/2.2/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.2/ (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenNodeImpl.java
jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/TestAll.java
Propchange: jackrabbit/branches/2.2/
------------------------------------------------------------------------------
Merged /jackrabbit/trunk:r1509101
Modified: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenNodeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenNodeImpl.java?rev=1509135&r1=1509134&r2=1509135&view=diff
==============================================================================
--- jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenNodeImpl.java (original)
+++ jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenNodeImpl.java Thu Aug 1 09:12:51 2013
@@ -267,7 +267,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.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/TestAll.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/TestAll.java?rev=1509135&r1=1509134&r2=1509135&view=diff
==============================================================================
--- jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/TestAll.java (original)
+++ jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/TestAll.java Thu Aug 1 09:12:51 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);