Author: tomekr
Date: Tue Jul 25 16:16:59 2017
New Revision: 1802975
URL: http://svn.apache.org/viewvc?rev=1802975&view=rev
Log:
OAK-6486: NPE in CompositeNodeStore
Don't use lazy loading for the CompositeNodeBuilder#getBaseState()
Modified:
jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeBuilder.java
Modified:
jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeBuilder.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeBuilder.java?rev=1802975&r1=1802974&r2=1802975&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeBuilder.java
(original)
+++
jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeBuilder.java
Tue Jul 25 16:16:59 2017
@@ -106,12 +106,12 @@ class CompositeNodeBuilder implements No
}
private static Map<MountedNodeStore, NodeState>
buildersToBaseStates(Map<MountedNodeStore, NodeBuilder> builders) {
- return transformValues(builders, new Function<NodeBuilder,
NodeState>() {
+ return new IdentityHashMap<>(transformValues(builders, new
Function<NodeBuilder, NodeState>() {
@Override
public NodeState apply(NodeBuilder input) {
return input.getBaseState();
}
- });
+ }));
}
// node or property-related methods ; directly delegate to wrapped builder
