Author: chetanm
Date: Thu Nov 24 14:36:51 2016
New Revision: 1771155
URL: http://svn.apache.org/viewvc?rev=1771155&view=rev
Log:
OAK-4898 - Allow for external changes to have a CommitInfo attached
Switch to @Nonull for CommitInfo
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java?rev=1771155&r1=1771154&r2=1771155&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java
Thu Nov 24 14:36:51 2016
@@ -383,7 +383,7 @@ public class AsyncIndexUpdateTest {
@Nonnull
@Override
public NodeState merge(@Nonnull NodeBuilder builder,
- @Nonnull CommitHook commitHook, @Nullable CommitInfo info)
+ @Nonnull CommitHook commitHook, @Nonnull CommitInfo info)
throws CommitFailedException {
Semaphore s = locks.get(Thread.currentThread());
if (s != null) {
