Author: mreutegg
Date: Mon Jan 29 10:55:30 2018
New Revision: 1822497
URL: http://svn.apache.org/viewvc?rev=1822497&view=rev
Log:
OAK-7195: Node.getMixinNodeTypes() may check for child node named jcr:mixinTypes
Apply most recent patch and enable test
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/document/GetMixinNodeTypesTest.java
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java?rev=1822497&r1=1822496&r2=1822497&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java
Mon Jan 29 10:55:30 2018
@@ -1286,9 +1286,9 @@ public class NodeImpl<T extends NodeDele
}
@Nonnull
- private Iterator<String> getMixinTypeNames(@Nonnull Tree tree) throws
RepositoryException {
+ private Iterator<String> getMixinTypeNames(@Nonnull Tree tree) {
Iterator<String> mixinNames = Collections.emptyIterator();
- if (tree.hasProperty(JcrConstants.JCR_MIXINTYPES) ||
canReadProperty(tree, JcrConstants.JCR_MIXINTYPES)) {
+ if (tree.hasProperty(JcrConstants.JCR_MIXINTYPES)) {
mixinNames = TreeUtil.getNames(tree,
JcrConstants.JCR_MIXINTYPES).iterator();
} else if (tree.getStatus() != Status.NEW) {
// OAK-2441: for backwards compatibility with Jackrabbit 2.x try to
@@ -1300,12 +1300,6 @@ public class NodeImpl<T extends NodeDele
return mixinNames;
}
- private boolean canReadProperty(@Nonnull Tree tree, @Nonnull String
propName) throws RepositoryException {
- String propPath = PathUtils.concat(tree.getPath(), propName);
- String permName =
Permissions.PERMISSION_NAMES.get(Permissions.READ_PROPERTY);
- return sessionContext.getAccessManager().hasPermissions(propPath,
permName);
- }
-
private EffectiveNodeType getEffectiveNodeType() throws
RepositoryException {
return getNodeTypeManager().getEffectiveNodeType(dlg.getTree());
}
Modified:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/document/GetMixinNodeTypesTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/document/GetMixinNodeTypesTest.java?rev=1822497&r1=1822496&r2=1822497&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/document/GetMixinNodeTypesTest.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/document/GetMixinNodeTypesTest.java
Mon Jan 29 10:55:30 2018
@@ -28,7 +28,6 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore;
import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
@@ -41,7 +40,6 @@ import static org.junit.Assert.assertEqu
* that check the existence of a jcr:mixinTypes child node when
* getMixinNodeTypes() is called.
*/
-@Ignore
public class GetMixinNodeTypesTest {
@Rule
