Author: mduerig
Date: Thu Apr 18 16:34:47 2013
New Revision: 1469414
URL: http://svn.apache.org/r1469414
Log:
OAK-709: Consider moving permission evaluation to the node state level
Fix MutableNodeState use of the now @Nonnull getChildNode() method
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java?rev=1469414&r1=1469413&r2=1469414&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java
Thu Apr 18 16:34:47 2013
@@ -592,7 +592,7 @@ public class MemoryNodeBuilder implement
MutableNodeState node = entry.getValue();
NodeState before = base.getChildNode(name);
if (node == null) {
- if (before != null) {
+ if (before.exists()) {
nodes.put(name, null);
}
} else {
