Author: reschke
Date: Wed Jan 27 12:55:37 2016
New Revision: 1727026
URL: http://svn.apache.org/viewvc?rev=1727026&view=rev
Log:
OAK-3932: DocumentStore.getIfCached() must not return NodeDocument.NULL
(small optimization for RDBDocumentStore)
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java?rev=1727026&r1=1727025&r2=1727026&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
Wed Jan 27 12:55:37 2016
@@ -644,10 +644,7 @@ public class RDBDocumentStore implements
if (collection != Collection.NODES) {
return null;
} else {
- NodeDocument doc = nodesCache.getIfPresent(id);
- if (doc == NodeDocument.NULL) {
- doc = null;
- }
+ NodeDocument doc = unwrap(nodesCache.getIfPresent(id));
return castAsT(doc);
}
}