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 an...@apache.org on 2013/01/22 10:08:55 UTC

svn commit: r1436811 - /jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/store/RevisionStore.java

Author: angela
Date: Tue Jan 22 09:08:54 2013
New Revision: 1436811

URL: http://svn.apache.org/viewvc?rev=1436811&view=rev
Log:
javadoc (duplicate @return)

Modified:
    jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/store/RevisionStore.java

Modified: jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/store/RevisionStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/store/RevisionStore.java?rev=1436811&r1=1436810&r2=1436811&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/store/RevisionStore.java (original)
+++ jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/store/RevisionStore.java Tue Jan 22 09:08:54 2013
@@ -55,7 +55,7 @@ public interface RevisionStore extends R
     
     /**
      * Put a new head commit. Must be called while holding a lock on the head.
-     * 
+     *
      * @param token
      *            put token
      * @param commit
@@ -63,7 +63,7 @@ public interface RevisionStore extends R
      * @param branchRootId
      *            former branch root id, if this is a merge; otherwise
      *            {@code null}
-     * @return branchRevId
+     * @param branchRevId
      *            current branch head, i.e. last commit on this branch, 
      *            if this is a merge; otherwise {@code null}
      * @return head commit id