You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ch...@apache.org on 2014/07/29 09:00:58 UTC
svn commit: r1614266 - in /jackrabbit/oak/branches/1.0: ./
oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/VisibleEditor.java
oak-doc/
Author: chetanm
Date: Tue Jul 29 07:00:57 2014
New Revision: 1614266
URL: http://svn.apache.org/r1614266
Log:
OAK-1973 - IndexUpdate traverses the data nodes under index nodes
Merge 1614265
Modified:
jackrabbit/oak/branches/1.0/ (props changed)
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/VisibleEditor.java
jackrabbit/oak/branches/1.0/oak-doc/ (props changed)
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk:r1614265
Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/VisibleEditor.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/VisibleEditor.java?rev=1614266&r1=1614265&r2=1614266&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/VisibleEditor.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/VisibleEditor.java Tue Jul 29 07:00:57 2014
@@ -37,9 +37,8 @@ public class VisibleEditor implements Ed
public static Editor wrap(@CheckForNull Editor editor) {
if (editor != null && !(editor instanceof VisibleEditor)) {
return new VisibleEditor(editor);
- } else {
- return null;
}
+ return editor;
}
private final Editor editor;
Propchange: jackrabbit/oak/branches/1.0/oak-doc/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk/oak-doc:r1614265