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 2012/04/13 12:03:41 UTC
svn commit: r1325699 - in /jackrabbit/oak/trunk:
oak-core/src/main/java/org/apache/jackrabbit/mk/client/
oak-core/src/main/java/org/apache/jackrabbit/mk/index/
oak-core/src/main/java/org/apache/jackrabbit/mk/simple/
oak-core/src/main/java/org/apache/ja...
Author: angela
Date: Fri Apr 13 10:03:40 2012
New Revision: 1325699
URL: http://svn.apache.org/viewvc?rev=1325699&view=rev
Log:
MicroKernel#waitForCommit : fix javadoc and rename oldHeadRevision param to oldHeadRevisionId
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/client/Client.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/IndexWrapper.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/SimpleKernelImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/LogWrapper.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/MicroKernelWrapperBase.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/SecurityWrapper.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapper.java
jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/api/MicroKernel.java
jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/core/MicroKernelImpl.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/client/Client.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/client/Client.java?rev=1325699&r1=1325698&r2=1325699&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/client/Client.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/client/Client.java Fri Apr 13 10:03:40 2012
@@ -132,14 +132,14 @@ public class Client implements MicroKern
}
}
- public synchronized String waitForCommit(String oldHeadRevision, long maxWaitMillis)
+ public synchronized String waitForCommit(String oldHeadRevisionId, long maxWaitMillis)
throws MicroKernelException, InterruptedException {
Request request = null;
try {
request = createRequest("waitForCommit");
- request.addParameter("revision_id", oldHeadRevision);
+ request.addParameter("revision_id", oldHeadRevisionId);
request.addParameter("max_wait_millis", maxWaitMillis);
return request.getString();
} catch (IOException e) {
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/IndexWrapper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/IndexWrapper.java?rev=1325699&r1=1325698&r2=1325699&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/IndexWrapper.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/IndexWrapper.java Fri Apr 13 10:03:40 2012
@@ -72,8 +72,8 @@ public class IndexWrapper extends MicroK
return mk.read(blobId, pos, buff, off, length);
}
- public String waitForCommit(String oldHeadRevision, long maxWaitMillis) throws MicroKernelException, InterruptedException {
- return mk.waitForCommit(oldHeadRevision, maxWaitMillis);
+ public String waitForCommit(String oldHeadRevisionId, long maxWaitMillis) throws MicroKernelException, InterruptedException {
+ return mk.waitForCommit(oldHeadRevisionId, maxWaitMillis);
}
public String write(InputStream in) {
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/SimpleKernelImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/SimpleKernelImpl.java?rev=1325699&r1=1325698&r2=1325699&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/SimpleKernelImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/SimpleKernelImpl.java Fri Apr 13 10:03:40 2012
@@ -374,8 +374,8 @@ public class SimpleKernelImpl extends Mi
return buff.endArray();
}
- public String waitForCommit(String oldHeadRevision, long maxWaitMillis) throws InterruptedException {
- return gate.waitForCommit(oldHeadRevision, maxWaitMillis);
+ public String waitForCommit(String oldHeadRevisionId, long maxWaitMillis) throws InterruptedException {
+ return gate.waitForCommit(oldHeadRevisionId, maxWaitMillis);
}
public JsopReader getJournalStream(String fromRevisionId, String toRevisionId, String filter) {
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/LogWrapper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/LogWrapper.java?rev=1325699&r1=1325698&r2=1325699&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/LogWrapper.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/LogWrapper.java Fri Apr 13 10:03:40 2012
@@ -180,10 +180,10 @@ public class LogWrapper implements Micro
}
}
- public String waitForCommit(String oldHeadRevision, long maxWaitMillis) throws InterruptedException {
+ public String waitForCommit(String oldHeadRevisionId, long maxWaitMillis) throws InterruptedException {
try {
- logMethod("waitForCommit", oldHeadRevision, maxWaitMillis);
- String result = mk.waitForCommit(oldHeadRevision, maxWaitMillis);
+ logMethod("waitForCommit", oldHeadRevisionId, maxWaitMillis);
+ String result = mk.waitForCommit(oldHeadRevisionId, maxWaitMillis);
logResult(result);
return result;
} catch (InterruptedException e) {
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/MicroKernelWrapperBase.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/MicroKernelWrapperBase.java?rev=1325699&r1=1325698&r2=1325699&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/MicroKernelWrapperBase.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/MicroKernelWrapperBase.java Fri Apr 13 10:03:40 2012
@@ -139,8 +139,8 @@ public abstract class MicroKernelWrapper
return wrapped.read(blobId, pos, buff, off, length);
}
- public String waitForCommit(String oldHeadRevision, long maxWaitMillis) throws InterruptedException {
- return wrapped.waitForCommit(oldHeadRevision, maxWaitMillis);
+ public String waitForCommit(String oldHeadRevisionId, long maxWaitMillis) throws InterruptedException {
+ return wrapped.waitForCommit(oldHeadRevisionId, maxWaitMillis);
}
public String write(InputStream in) {
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/SecurityWrapper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/SecurityWrapper.java?rev=1325699&r1=1325698&r2=1325699&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/SecurityWrapper.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/SecurityWrapper.java Fri Apr 13 10:03:40 2012
@@ -342,8 +342,8 @@ public class SecurityWrapper extends Mic
return mk.read(blobId, pos, buff, off, length);
}
- public String waitForCommit(String oldHeadRevision, long maxWaitMillis) throws InterruptedException {
- return mk.waitForCommit(oldHeadRevision, maxWaitMillis);
+ public String waitForCommit(String oldHeadRevisionId, long maxWaitMillis) throws InterruptedException {
+ return mk.waitForCommit(oldHeadRevisionId, maxWaitMillis);
}
public String write(InputStream in) {
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapper.java?rev=1325699&r1=1325698&r2=1325699&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapper.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapper.java Fri Apr 13 10:03:40 2012
@@ -315,8 +315,8 @@ public class VirtualRepositoryWrapper ex
return mk.read(blobId, pos, buff, off, length);
}
- public String waitForCommit(String oldHeadRevision, long maxWaitMillis) throws InterruptedException {
- return mk.waitForCommit(oldHeadRevision, maxWaitMillis);
+ public String waitForCommit(String oldHeadRevisionId, long maxWaitMillis) throws InterruptedException {
+ return mk.waitForCommit(oldHeadRevisionId, maxWaitMillis);
}
public String write(InputStream in) {
Modified: jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/api/MicroKernel.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/api/MicroKernel.java?rev=1325699&r1=1325698&r2=1325699&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/api/MicroKernel.java (original)
+++ jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/api/MicroKernel.java Fri Apr 13 10:03:40 2012
@@ -83,16 +83,17 @@ public interface MicroKernel {
* Wait for a commit to occur that is newer than the given revision number.
* <p/>
* This method is useful efficient polling. The method will return the current head revision
- * if it is newer than the given old revision number, or wait until the given number of
+ * if it is newer than the given revision ID, or wait until the given number of
* milliseconds passed or a new head revision is available.
*
+ * @param oldHeadRevisionId A revision Id
* @param maxWaitMillis the maximum number of milliseconds to wait (0 if the
* method should not wait).
- * @return the current head revision
+ * @return the current head revision Id
* @throws MicroKernelException if an error occurs
* @throws InterruptedException if the thread was interrupted
*/
- String waitForCommit(String oldHeadRevision, long maxWaitMillis) throws MicroKernelException, InterruptedException;
+ String waitForCommit(String oldHeadRevisionId, long maxWaitMillis) throws MicroKernelException, InterruptedException;
/**
* Returns a revision journal, starting with <code>fromRevisionId</code>
Modified: jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/core/MicroKernelImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/core/MicroKernelImpl.java?rev=1325699&r1=1325698&r2=1325699&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/core/MicroKernelImpl.java (original)
+++ jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/core/MicroKernelImpl.java Fri Apr 13 10:03:40 2012
@@ -146,8 +146,8 @@ public class MicroKernelImpl implements
return buff.endArray().toString();
}
- public String waitForCommit(String oldHeadRevision, long maxWaitMillis) throws MicroKernelException, InterruptedException {
- return gate.waitForCommit(oldHeadRevision, maxWaitMillis);
+ public String waitForCommit(String oldHeadRevisionId, long maxWaitMillis) throws MicroKernelException, InterruptedException {
+ return gate.waitForCommit(oldHeadRevisionId, maxWaitMillis);
}
public String getJournal(String fromRevision, String toRevision, String filter) throws MicroKernelException {