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 md...@apache.org on 2012/06/18 18:53:42 UTC
svn commit: r1351415 -
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/ContentSession.java
Author: mduerig
Date: Mon Jun 18 16:53:42 2012
New Revision: 1351415
URL: http://svn.apache.org/viewvc?rev=1351415&view=rev
Log:
Fix broken link in Javadoc
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/ContentSession.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/ContentSession.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/ContentSession.java?rev=1351415&r1=1351414&r2=1351415&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/ContentSession.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/ContentSession.java Mon Jun 18 16:53:42 2012
@@ -16,9 +16,10 @@
*/
package org.apache.jackrabbit.oak.api;
+import java.io.Closeable;
+
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
-import java.io.Closeable;
/**
* Authentication session for accessing (TODO: a workspace inside) a content
@@ -67,8 +68,9 @@ public interface ContentSession extends
String getWorkspaceName();
/**
- * The current root as seen by this content session. Use {@link Root#commit()} to
- * atomically apply the changes made in that subtree the underlying Microkernel.
+ * The current root as seen by this content session. Use
+ * {@link Root#commit(ConflictHandler)} to atomically apply the changes made in that
+ * subtree the underlying Microkernel.
*
* @return the current root
*/