Author: mreutegg
Date: Mon Nov 25 11:35:48 2013
New Revision: 1545230
URL: http://svn.apache.org/r1545230
Log:
OAK-1219: VersionEditor must ignore hidden items
- added test and implemented fix
Added:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/HiddenNodeTest.java
(with props)
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionableState.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionableState.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionableState.java?rev=1545230&r1=1545229&r2=1545230&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionableState.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionableState.java
Mon Nov 25 11:35:48 2013
@@ -539,6 +539,10 @@ class VersionableState {
private int getOPV(NodeBuilder parent, NodeBuilder child, String childName)
throws RepositoryException {
+ // ignore hidden tree
+ if (childName.startsWith(":")) {
+ return IGNORE;
+ }
ImmutableTree parentTree = new ImmutableTree(parent.getNodeState());
NodeState childState;
if (NT_FROZENNODE.equals(child.getName(JCR_PRIMARYTYPE))) {
Added:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/HiddenNodeTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/HiddenNodeTest.java?rev=1545230&view=auto
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/HiddenNodeTest.java
(added)
+++
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/HiddenNodeTest.java
Mon Nov 25 11:35:48 2013
@@ -0,0 +1,95 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.oak.jcr.version;
+
+import javax.jcr.Node;
+import javax.jcr.Repository;
+import javax.jcr.Session;
+import javax.jcr.SimpleCredentials;
+import javax.jcr.version.Version;
+import javax.jcr.version.VersionManager;
+
+import org.apache.jackrabbit.oak.commons.PathUtils;
+import org.apache.jackrabbit.oak.jcr.Jcr;
+import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore;
+import org.apache.jackrabbit.oak.plugins.segment.memory.MemoryStore;
+import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
+import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
+import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.apache.jackrabbit.oak.spi.state.NodeStore;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Checks if hidden nodes are properly handled on checkin and restore
(OAK-1219).
+ */
+public class HiddenNodeTest {
+
+ private NodeStore store;
+ private Repository repo;
+ private Session session;
+ private VersionManager vMgr;
+
+ @Before
+ public void before() throws Exception {
+ store = new SegmentNodeStore(new MemoryStore());
+ repo = new Jcr(store).createRepository();
+ session = repo.login(new SimpleCredentials("admin",
"admin".toCharArray()));
+ vMgr = session.getWorkspace().getVersionManager();
+ }
+
+ @After
+ public void after() {
+ if (session != null) {
+ session.logout();
+ session = null;
+ }
+ }
+
+ @Test
+ public void hiddenTree() throws Exception {
+ Node test = session.getRootNode().addNode("test", "nt:unstructured");
+ test.addMixin("mix:versionable");
+ session.save();
+
+ NodeBuilder builder = store.getRoot().builder();
+ builder.child("test").child(":hidden").setProperty("property",
"value");
+ store.merge(builder, EmptyHook.INSTANCE, null);
+
+ session.refresh(false);
+ Version v1 = vMgr.checkpoint("/test");
+ Version v2 = vMgr.checkpoint("/test");
+
+ NodeState state = store.getRoot();
+ for (String name : PathUtils.elements(v2.getPath())) {
+ state = state.getChildNode(name);
+ }
+ state = state.getChildNode("jcr:frozenNode");
+ assertTrue(state.exists());
+ assertFalse(state.hasChildNode(":hidden"));
+
+ vMgr.restore(v1, true);
+
+ state = store.getRoot().getChildNode("test");
+ assertTrue(state.hasChildNode(":hidden"));
+ }
+}
Propchange:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/HiddenNodeTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/HiddenNodeTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
