Author: mreutegg
Date: Tue Nov 29 14:02:23 2016
New Revision: 1771908
URL: http://svn.apache.org/viewvc?rev=1771908&view=rev
Log:
OAK-5184: Inconsistent nullability annotation for CommitInfo in
DocumentNodeStore.done()
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranch.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java?rev=1771908&r1=1771907&r2=1771908&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
Tue Nov 29 14:02:23 2016
@@ -1471,7 +1471,7 @@ public final class DocumentNodeStore
@Nonnull
RevisionVector merge(@Nonnull RevisionVector branchHead,
- @Nullable CommitInfo info)
+ @Nonnull CommitInfo info)
throws CommitFailedException {
Branch b = getBranches().getBranch(branchHead);
RevisionVector base = branchHead;
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranch.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranch.java?rev=1771908&r1=1771907&r2=1771908&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranch.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranch.java
Tue Nov 29 14:02:23 2016
@@ -259,12 +259,12 @@ class DocumentNodeStoreBranch implements
*
* @param toPersist the state with the changes on top of {@code base}.
* @param base the base state.
- * @param info the commit info or {@code null} if there is none.
+ * @param info the commit info.
* @return the state with the persisted changes.
*/
- private DocumentNodeState persist(final NodeState toPersist,
- final DocumentNodeState base,
- final CommitInfo info) {
+ private DocumentNodeState persist(final @Nonnull NodeState toPersist,
+ final @Nonnull DocumentNodeState base,
+ final @Nonnull CommitInfo info) {
return persist(new Changes() {
@Override
public void with(Commit c) {
@@ -282,9 +282,9 @@ class DocumentNodeStoreBranch implements
* @param info the commit info.
* @return the result state.
*/
- private DocumentNodeState persist(Changes op,
- DocumentNodeState base,
- CommitInfo info) {
+ private DocumentNodeState persist(@Nonnull Changes op,
+ @Nonnull DocumentNodeState base,
+ @Nonnull CommitInfo info) {
boolean success = false;
Commit c = store.newCommit(base.getRootRevision(), this);
RevisionVector rev;
@@ -627,7 +627,7 @@ class DocumentNodeStoreBranch implements
}
private void persistTransientHead(NodeState newHead) {
- head = DocumentNodeStoreBranch.this.persist(newHead, head, null);
+ head = DocumentNodeStoreBranch.this.persist(newHead, head,
CommitInfo.EMPTY);
}
private void resetBranch(DocumentNodeState branchHead,
DocumentNodeState ancestor) {
