### Eclipse Workspace Patch 1.0 #P oak-core Index: src/main/java/org/apache/jackrabbit/oak/core/RootImpl.java =================================================================== --- src/main/java/org/apache/jackrabbit/oak/core/RootImpl.java (revision 1466776) +++ src/main/java/org/apache/jackrabbit/oak/core/RootImpl.java (working copy) @@ -32,6 +32,7 @@ import org.apache.jackrabbit.oak.api.Blob; import org.apache.jackrabbit.oak.api.BlobFactory; import org.apache.jackrabbit.oak.api.CommitFailedException; +import org.apache.jackrabbit.oak.api.ContentSession; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.QueryEngine; import org.apache.jackrabbit.oak.api.Root; @@ -584,4 +585,9 @@ return '>' + source + ':' + PathUtils.concat(destParent.getPathInternal(), destName); } } + + @Override + public ContentSession getContentSession() { + throw new UnsupportedOperationException(); + } } Index: src/main/java/org/apache/jackrabbit/oak/core/ImmutableRoot.java =================================================================== --- src/main/java/org/apache/jackrabbit/oak/core/ImmutableRoot.java (revision 1466776) +++ src/main/java/org/apache/jackrabbit/oak/core/ImmutableRoot.java (working copy) @@ -23,6 +23,7 @@ import javax.annotation.Nullable; import org.apache.jackrabbit.oak.api.BlobFactory; +import org.apache.jackrabbit.oak.api.ContentSession; import org.apache.jackrabbit.oak.api.QueryEngine; import org.apache.jackrabbit.oak.api.Root; import org.apache.jackrabbit.oak.api.TreeLocation; @@ -131,4 +132,10 @@ public BlobFactory getBlobFactory() { throw new UnsupportedOperationException(); } + + @Override + public ContentSession getContentSession() { + throw new UnsupportedOperationException(); + } + } Index: src/main/java/org/apache/jackrabbit/oak/api/Root.java =================================================================== --- src/main/java/org/apache/jackrabbit/oak/api/Root.java (revision 1466481) +++ src/main/java/org/apache/jackrabbit/oak/api/Root.java (working copy) @@ -144,4 +144,16 @@ */ @Nonnull BlobFactory getBlobFactory(); + + + /** + * + * Get the ContentSession associated with a given Root + * + * @return the associated ContentSession + * + * @throws UnsupportedOperationException + */ + @Nonnull + ContentSession getContentSession(); } Index: src/main/java/org/apache/jackrabbit/oak/core/ContentSessionImpl.java =================================================================== --- src/main/java/org/apache/jackrabbit/oak/core/ContentSessionImpl.java (revision 1466776) +++ src/main/java/org/apache/jackrabbit/oak/core/ContentSessionImpl.java (working copy) @@ -97,7 +97,12 @@ @Override protected void checkLive() { ContentSessionImpl.this.checkLive(); - } + } + + @Override + public ContentSession getContentSession() { + return ContentSessionImpl.this; + } }; return root; }